3794 files changed, 67883 insertions, 32415 deletions

diff --git a/.gitmodules b/.gitmodules
index bdec8fcac..934def7fa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
 	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index 60f084676..2174f27bc 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,12 +9,15 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 2.8 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
 
 
 ##### include our cmake modules #################
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEL10n )
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51dfa2cfe..a8321e9be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,12 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 2.8 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
 
 
 ##### general package setup #####################
@@ -18,7 +23,6 @@ cmake_minimum_required( VERSION 2.8 )
 project( tdebase )
 
 set( PACKAGE tdebase )
-set( VERSION R14.1.0 )
 
 
 ##### include essential cmake modules ###########
@@ -38,7 +42,6 @@ include( CheckTypeSize )
 
 ##### include our cmake modules #################
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEMacros )
 
 
@@ -50,13 +53,36 @@ tde_setup_paths( )
 
 ##### add apidox targets ############
 
-add_custom_target(apidox
-  COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/qt3/doc/html"
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+add_custom_target( apidox
+  COMMAND ${CMAKE_COMMAND} -E env
+    "TQTDOCDIR=/usr/share/tqt3/doc/html"
+    "DOXDATA=${HTML_INSTALL_DIR}/en/common"
+    ${CMAKE_SOURCE_DIR}/admin/doxygen.sh
+    --no-modulename
+    ${CMAKE_SOURCE_DIR}
+  COMMAND
+    find ${CMAKE_BINARY_DIR}/apidocs -name '*.html' |
+    xargs -r sed -i 's|${CMAKE_BINARY_DIR}/apidocs|${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs|g'
+  COMMAND
+    find ${CMAKE_BINARY_DIR}/apidocs -name '*.tag' |
+    xargs -r sed -i 's|${CMAKE_SOURCE_DIR}/|${PROJECT_NAME}/|g'
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+
+add_custom_target( install-apidox
+  COMMAND ${CMAKE_COMMAND} -E echo Apidox installed in ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs
+)
 
-add_custom_target(install-apidox
-  COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}"
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+install( CODE "
+  if( EXISTS ${CMAKE_BINARY_DIR}/apidocs )
+    file(
+      INSTALL ${CMAKE_BINARY_DIR}/apidocs/
+      DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs
+      PATTERN doxygen_sqlite3.db EXCLUDE
+      PATTERN installdox-slow EXCLUDE
+    )
+  endif()"
+)
 
 
 ##### optional stuff ############################
@@ -65,6 +91,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} )
@@ -88,17 +115,18 @@ option( WITH_XINERAMA "Enable xinerama extension support" ${WITH_ALL_OPTIONS} )
 option( WITH_ARTS "Enable aRts support" ${WITH_ALL_OPTIONS} )
 option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} )
 option( WITH_SENSORS "Enable lm_sensors support (ksysguard)" ${WITH_ALL_OPTIONS} )
-option( WITH_HAL "Enable HAL support" OFF )
 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
@@ -119,8 +147,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 # WITH_ARTS         affects libkonq khotkeys
 # WITH_I8K          affects ksysguard
 # WITH_SENSORS      affects ksysguard
-# WITH_HAL          affects tdeioslaves(media) ksmserver kicker
-# WITH_TDEHWLIB     affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
+# WITH_TDEHWLIB     affects tdeioslaves(media)
 # WITH_LIBRAW1394   affects kcontrol(view1394)
 # WITH_PAM          affects tdm kdesktop kcheckpass
 # WITH_SHADOW       affects tdm kcheckpass
@@ -129,6 +156,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 # WITH_PCRE         affects twin/compot-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
@@ -165,6 +193,7 @@ option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} )
 option( BUILD_KREADCONFIG "Build kreadconfig" ${BUILD_ALL} )
 option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} )
 option( BUILD_TDM "Build tdm" ${BUILD_ALL} )
+option( BUILD_TDM_SYSTEMD_UNIT_FILE "Build tdm service file for systemd" OFF )
 option( BUILD_KSMSERVER "Build ksmserver" ${BUILD_ALL} )
 option( BUILD_KSPLASHML "Build ksplashml" ${BUILD_ALL} )
 option( BUILD_STARTTDE "Build starttde" ${BUILD_ALL} )
@@ -224,7 +253,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_subdirectory( BUILD_DOC doc )
+tde_conditional_add_project_docs( BUILD_DOC )
 tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq )
 tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
 tde_conditional_add_subdirectory( BUILD_TWIN twin )
@@ -271,7 +300,7 @@ tde_conditional_add_subdirectory( BUILD_TQT3INTEGRATION tqt3integration )
 ##### install starttde & related stuff ##########
 
 if( BUILD_STARTTDE )
-  install( PROGRAMS starttde migratekde3 r14-xdg-update tde_release_notes
+  install( PROGRAMS starttde migratekde3 r14-xdg-update tde_release_notes tde_show_license_info
            DESTINATION ${BIN_INSTALL_DIR} )
 endif()
 
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index fb3f4c3f2..b72d866df 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -23,6 +23,32 @@ tde_setup_largefiles( )
 find_package( TQt )
 find_package( TDE )
 
+# strlcat and strlcpy check
+check_function_exists( strlcat HAVE_STRLCAT )
+check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO )
+check_function_exists( strlcpy HAVE_STRLCPY )
+check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO )
+
+##### look for the usb.ids file, Its location can be set EG: -DWITH_USBIDS="/opt/share/misc/usb.ids"
+
+if( WITH_USBIDS )
+    set( USBIDS_FILE "${WITH_USBIDS}" )
+    message( STATUS "Using specified usb.ids file: ${USBIDS_FILE}" )
+ else()
+    find_file( PATH_USBIDS usb.ids
+               HINTS /usr/share/misc
+                     /var/lib/usbutils
+                     /usr/share/hwdata
+    )
+    if( PATH_USBIDS )
+        set( USBIDS_FILE "${PATH_USBIDS}" )
+        message( STATUS "Using system usb.ids file: ${PATH_USBIDS}" )
+      else()
+        set( USE_BUILTIN_USBIDS 1 )
+        message( STATUS "File usb.ids (hwdata) was not found on the system, using builtin" )
+    endif()
+endif( WITH_USBIDS )
+
 
 ##### check for libdl ###########################
 
@@ -68,22 +94,36 @@ endif( )
 
 
 # sys/time.h (tdeioslave/sftp, ksmserver, ksplashml)
-if( BUILD_KSMSERVER OR BUILD_KSPLASHML OR BUILD_TDEIOSLAVES)
+if( BUILD_KSMSERVER OR BUILD_KSPLASHML OR BUILD_TDEIOSLAVES )
   check_include_file( sys/time.h HAVE_SYS_TIME_H )
   check_include_files( "sys/time.h;time.h" TIME_WITH_SYS_TIME )
 endif( )
 
-
-# pam
-if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_TDM) )
-  check_library_exists( pam pam_start "" HAVE_PAM )
-  if( HAVE_PAM )
-    check_include_file( "security/pam_appl.h" SECURITY_PAM_APPL_H )
+# libssh (tdeioslave/sftp)
+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" )
   endif( )
-  if( HAVE_PAM AND SECURITY_PAM_APPL_H )
-    set( PAM_LIBRARY pam ${DL_LIBRARIES} )
-  else( )
-    tde_message_fatal( "pam are requested, but not found on your system" )
+endif( )
+
+
+# pam and shadow
+if( BUILD_KCHECKPASS OR BUILD_TDM )
+  if ( WITH_PAM )
+    check_library_exists( pam pam_start "" HAVE_PAM )
+    if( HAVE_PAM )
+      set( USE_PAM 1 CACHE INTERNAL "" FORCE )
+      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} )
+    else( )
+      tde_message_fatal( "pam are requested, but not found on your system" )
+    endif( )
+  elseif( WITH_SHADOW )
+    set( HAVE_SHADOW 1 CACHE INTERNAL "" FORCE )
+    set( USESHADOW 1 CACHE INTERNAL "" FORCE )
   endif( )
 endif( )
 
@@ -100,15 +140,6 @@ if( NOT HAVE_CRYPT )
 endif( NOT HAVE_CRYPT )
 
 
-# hal (ksmserver, tdeioslaves)
-if( WITH_HAL )
-  pkg_search_module( HAL hal )
-  if( NOT HAL_FOUND )
-    tde_message_fatal( "hal is required, but was not found on your system" )
-  endif( )
-endif( )
-
-
 # tdehwlib (drkonqi, kcontrol, kicker, ksmserver, tdeioslaves, tdm)
 if( WITH_TDEHWLIB )
   tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${TDE_INCLUDE_DIR}" )
@@ -124,6 +155,7 @@ if( WITH_TDEHWLIB )
   if( NOT HAVE_TDEHWLIB )
     tde_message_fatal( "tdehwlib is required, but not built in tdecore" )
   endif( NOT HAVE_TDEHWLIB )
+  set( TDEHW_LIBRARIES "tdehw-shared" )
 endif( )
 
 
@@ -296,10 +328,10 @@ if( WITH_XSCREENSAVER )
   # where xscreensaver stores its executables. So give the user the possibility
   # to define XSCREENSAVER_DIR and speficy the location manually.
   include( FindXscreensaver.cmake ) # not really good practise
-  if( NOT XSCREENSAVER_DIR )
+  if( NOT XSCREENSAVER_DIRS )
     tde_message_fatal(
-      "xscreensaver is requested, but cmake can not determine the location of XSCREENSAVER_DIR
- You have to either specify it manually with e.g. -DXSCREENSAVER_DIR=/usr/lib/misc/xscreensaver/
+      "xscreensaver is requested, but cmake can not determine the location of XSCREENSAVER_DIRS
+ You have to either specify it manually with e.g. -DXSCREENSAVER_DIRS=/usr/lib/misc/xscreensaver/
  or make sure that xscreensaver installed properly" )
   endif( )
 
@@ -436,27 +468,6 @@ if( BUILD_KDESKTOP )
 endif( )
 
 
-# dbus-tqt (ksmserver, kicker, tdeioslaves(media))
-if( WITH_HAL AND (BUILD_KSMSERVER OR BUILD_KICKER OR BUILD_TDEIOSLAVES) )
-
-  # check for dbus-tqt
-  # dbus-tqt need Qt flags
-  pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
-  tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-  set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS})
-  set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} )
-  check_cxx_source_compiles("
-    #include <tqt.h>
-    #include <dbus/connection.h>
-    int main(int, char**) { return 0; } "
-    HAVE_DBUS_QT3_07 )
-  tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
-  if( NOT HAVE_DBUS_QT3_07 )
-    tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
-  endif( )
-
-endif( )
-
 # check for krb5
 if( WITH_KRB5 )
   pkg_search_module( KRB5 krb5 )
@@ -467,7 +478,6 @@ if( WITH_KRB5 )
     endif( NOT HAVE_KRB_KADM_H )
   endif( NOT KRB5_FOUND )
   set( HAVE_KRB5 1 )
-  set( LIBTDELDAP_LIBRARIES "tdeldap" )
 endif( )
 
 # check for libr
@@ -476,9 +486,9 @@ if( WITH_ELFICON )
   if( NOT LIBR_FOUND )
       message(FATAL_ERROR "\nelficon support was requested, but libr was not found on your system" )
   endif( NOT LIBR_FOUND )
-  if( NOT "${LIBR_VERSION}" STREQUAL "0.6.0" )
+  if( "${LIBR_VERSION}" VERSION_LESS "0.6" )
       message(FATAL_ERROR "\nelficon support was requested, but the libr version on your system may not be compatible with TDE" )
-  endif( NOT "${LIBR_VERSION}" STREQUAL "0.6.0" )
+  endif( "${LIBR_VERSION}" VERSION_LESS "0.6" )
   set( HAVE_ELFICON 1 )
 endif( )
 
@@ -497,30 +507,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( )
 
@@ -542,16 +538,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
@@ -575,4 +563,119 @@ 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 )
+  # SunOS kstat
+  check_library_exists( kstat kstat_open "" HAVE_KSTAT )
+  if( HAVE_KSTAT )
+    set( KSTAT_LIBRARIES kstat )
+  else()
+    if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+      tde_message_fatal( "libkstat not found on SunOS platform!" )
+    endif()
+    set( KSTAT_LIBRARIES "" )
+  endif( )
+
+  if( NOT DEFINED REBOOT_BINARY )
+    message( STATUS "Looking for reboot" )
+    find_program( REBOOT_BINARY reboot
+                  HINTS /sbin
+                        /usr/sbin
+    )
+    if( REBOOT_BINARY )
+      message( STATUS "Looking for reboot - ${REBOOT_BINARY}" )
+    endif( REBOOT_BINARY )
+  endif( NOT DEFINED REBOOT_BINARY )
+
+  if( NOT DEFINED POWEROFF_BINARY )
+    message( STATUS "Looking for poweroff" )
+    find_program( POWEROFF_BINARY poweroff
+                  HINTS /sbin
+                        /usr/sbin
+    )
+    if( POWEROFF_BINARY )
+      message( STATUS "Looking for poweroff - ${POWEROFF_BINARY}" )
+    endif( POWEROFF_BINARY )
+  endif( NOT DEFINED POWEROFF_BINARY )
+
+  if( NOT DEFINED HALT_BINARY )
+    message( STATUS "Looking for halt" )
+    find_program( HALT_BINARY halt
+                  HINTS /sbin
+                        /usr/sbin
+    )
+    if( HALT_BINARY )
+      message( STATUS "Looking for halt - ${HALT_BINARY}" )
+    endif( HALT_BINARY )
+  endif( NOT DEFINED HALT_BINARY )
+
+  if( NOT DEFINED SHUTDOWN_BINARY )
+    message( STATUS "Looking for shutdown" )
+    find_program( SHUTDOWN_BINARY shutdown
+                  HINTS /sbin
+                        /usr/sbin
+    )
+    if( SHUTDOWN_BINARY )
+      message( STATUS "Looking for shutdown - ${SHUTDOWN_BINARY}" )
+    endif( SHUTDOWN_BINARY )
+  endif( NOT DEFINED SHUTDOWN_BINARY )
+
+  if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+    # SunOS based systems
+    if( NOT REBOOT_BINARY AND SHUTDOWN_BINARY )
+      # emulate reboot
+      set( REBOOT_BINARY "${SHUTDOWN_BINARY} -y -i 6")
+    endif( NOT REBOOT_BINARY AND SHUTDOWN_BINARY )
+
+    if( NOT POWEROFF_BINARY AND SHUTDOWN_BINARY )
+      # emulate poweroff
+      set( POWEROFF_BINARY "${SHUTDOWN_BINARY} -y -i 5")
+    endif( NOT POWEROFF_BINARY AND SHUTDOWN_BINARY )
+
+  else( ) # default condition
+    if( NOT REBOOT_BINARY AND SHUTDOWN_BINARY )
+      # emulate reboot
+      set( REBOOT_BINARY "${SHUTDOWN_BINARY} -r now")
+    endif( NOT REBOOT_BINARY AND SHUTDOWN_BINARY )
+
+    if( NOT POWEROFF_BINARY AND SHUTDOWN_BINARY )
+      # emulate poweroff
+      set( POWEROFF_BINARY "${SHUTDOWN_BINARY} -h now")
+    endif( NOT POWEROFF_BINARY AND SHUTDOWN_BINARY )
+
+    if( NOT POWEROFF_BINARY AND HALT_BINARY )
+      # emulate poweroff
+      set( POWEROFF_BINARY "${HALT_BINARY} -p")
+    endif( NOT POWEROFF_BINARY AND HALT_BINARY )
+
+  endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+
+  if( NOT REBOOT_BINARY )
+    tde_message_fatal( "reboot command is not defined" )
+  endif( NOT REBOOT_BINARY )
+
+  if( NOT POWEROFF_BINARY )
+    tde_message_fatal( "poweroff command is not defined" )
+  endif( NOT POWEROFF_BINARY )
+
+  message( STATUS "poweroff - ${POWEROFF_BINARY}" )
+  message( STATUS "reboot - ${REBOOT_BINARY}" )
+
+endif( BUILD_KCONTROL OR BUILD_TDM )
+
+check_include_files( "sys/time.h;sys/loadavg.h" HAVE_SYS_LOADAVG_H )
diff --git a/FindXscreensaver.cmake b/FindXscreensaver.cmake
index 72ee19eda..93ca210ef 100644
--- a/FindXscreensaver.cmake
+++ b/FindXscreensaver.cmake
@@ -8,29 +8,7 @@
 
 if (NOT XSCREENSAVER_FOUND)
   set(xscreensaver_alldirs)
-  set(xscreensaver_checkdirs ${TDE_INCLUDE_DIR}
-   	/usr/
-	/usr/local/
-   	/opt/local/
-   	/usr/X11R6/
-   	/opt/kde/
-   	/opt/kde3/
-   	/usr/kde/
-   	/usr/local/kde/
-   	/usr/local/xscreensaver/
-   	/usr/openwin/lib/xscreensaver/
-   	/etc/ )
-  foreach(suffix lib${LIB_SUFFIX}/xscreensaver lib${LIB_SUFFIX}/misc/xscreensaver lib/xscreensaver lib64/xscreensaver libexec/xscreensaver 
-bin/xscreensaver-hacks hacks)
-     foreach(xscreensaver_path ${xscreensaver_checkdirs} )
-        set(xscreensaver_alldirs ${xscreensaver_alldirs} ${xscreensaver_path}/${suffix})
-     endforeach(xscreensaver_path ${xscreensaver_checkdirs} )
-  endforeach(suffix lib${LIB_SUFFIX}/xscreensaver lib/xscreensaver lib64/xscreensaver libexec/xscreensaver bin/xscreensaver-hacks hacks)
-  FIND_PATH(XSCREENSAVER_DIR deco ${xscreensaver_alldirs})
-
-  set(XSCREENSAVER_CONFIG_DIR)
-  FIND_PATH(XSCREENSAVER_CONFIG_DECO config/deco.xml
-    ${TDE_INCLUDE_DIR}
+  set(xscreensaver_checkdirs
     /usr/
     /usr/local/
     /opt/local/
@@ -45,33 +23,58 @@ bin/xscreensaver-hacks hacks)
     /usr/openwin/lib/xscreensaver/
     /etc/
   )
-  #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+  foreach(suffix lib${LIB_SUFFIX}/xscreensaver lib${LIB_SUFFIX}/misc/xscreensaver
+                 lib/xscreensaver lib64/xscreensaver libexec/xscreensaver
+                 bin/xscreensaver-hacks hacks)
+     foreach(xscreensaver_path ${xscreensaver_checkdirs} )
+        set(xscreensaver_alldirs ${xscreensaver_alldirs} ${xscreensaver_path}/${suffix})
+     endforeach(xscreensaver_path ${xscreensaver_checkdirs} )
+  endforeach()
+
+  set(XSCREENSAVER_DIRS)
+  FIND_PATH(XSCREENSAVER_DIR_DECO deco ${xscreensaver_alldirs})
+  FIND_PATH(XSCREENSAVER_DIR_FLUX flux ${xscreensaver_alldirs})
+  if(XSCREENSAVER_DIR_DECO)
+    list(APPEND XSCREENSAVER_DIRS ${XSCREENSAVER_DIR_DECO})
+  endif(XSCREENSAVER_DIR_DECO)
+  if(XSCREENSAVER_DIR_FLUX)
+    list(APPEND XSCREENSAVER_DIRS ${XSCREENSAVER_DIR_FLUX})
+  endif(XSCREENSAVER_DIR_FLUX)
+  list( REMOVE_DUPLICATES XSCREENSAVER_DIRS )
+  string( REPLACE ";" ":" XSCREENSAVER_DIRS "${XSCREENSAVER_DIRS}" )
 
+  set(XSCREENSAVER_CONFIG_DIRS)
+  FIND_PATH(XSCREENSAVER_CONFIG_DECO config/deco.xml ${xscreensaver_checkdirs} )
+  FIND_PATH(XSCREENSAVER_CONFIG_FLUX config/flux.xml ${xscreensaver_checkdirs} )
   if(XSCREENSAVER_CONFIG_DECO)
-	set(XSCREENSAVER_CONFIG_DIR "${XSCREENSAVER_CONFIG_DECO}/config/")
-	#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+    list(APPEND XSCREENSAVER_CONFIG_DIRS "${XSCREENSAVER_CONFIG_DECO}/config/")
   endif(XSCREENSAVER_CONFIG_DECO)
-
+  if(XSCREENSAVER_CONFIG_FLUX)
+    list(APPEND XSCREENSAVER_CONFIG_DIRS "${XSCREENSAVER_CONFIG_FLUX}/config/")
+  endif(XSCREENSAVER_CONFIG_FLUX)
 
   # Try and locate XScreenSaver config when path doesn't include config
-  if(NOT XSCREENSAVER_CONFIG_DIR)
-    FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
+  if(NOT XSCREENSAVER_CONFIG_DIRS)
+    FIND_PATH(XSCREENSAVER_CONFIG_DIRS deco.xml
       /etc/xscreensaver
       )
-  endif(NOT XSCREENSAVER_CONFIG_DIR)
+  endif(NOT XSCREENSAVER_CONFIG_DIRS)
+
+  list( REMOVE_DUPLICATES XSCREENSAVER_CONFIG_DIRS )
+  string( REPLACE ";" ":" XSCREENSAVER_CONFIG_DIRS "${XSCREENSAVER_CONFIG_DIRS}" )
 endif(NOT XSCREENSAVER_FOUND)
 
 #MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
 #MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
 
 # Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+if(XSCREENSAVER_DIRS AND XSCREENSAVER_CONFIG_DIRS)
 	set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+endif(XSCREENSAVER_DIRS AND XSCREENSAVER_CONFIG_DIRS)
 
 if (XSCREENSAVER_FOUND)
   if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found SCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+    message(STATUS "Found SCREENSAVER_CONFIG_DIRS <${XSCREENSAVER_CONFIG_DIRS}>")
   endif (NOT Xscreensaver_FIND_QUIETLY)
 else (XSCREENSAVER_FOUND)
   if (Xscreensaver_FIND_REQUIRED)
@@ -79,5 +82,4 @@ else (XSCREENSAVER_FOUND)
   endif (Xscreensaver_FIND_REQUIRED)
 endif (XSCREENSAVER_FOUND)
 
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
+MARK_AS_ADVANCED(XSCREENSAVER_DIRS XSCREENSAVER_CONFIG_DIRS)
diff --git a/Makefile.am.in b/Makefile.am.in
index 793c08688..ece4e7f2c 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -9,7 +9,7 @@ COMPILE_AFTER_kcontrol = tdm kdesktop
 
 AUTOMAKE_OPTIONS = foreign 1.6.1
 
-bin_SCRIPTS = starttde migratekde3 r14-xdg-update tde_release_notes
+bin_SCRIPTS = starttde migratekde3 r14-xdg-update tde_release_notes tde_show_license_info
 
 EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv
 
diff --git a/README b/README
index fb40fb1ec..e2353bb6b 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ libraries. Here is an overview of the directories:
 
 * kappfinder
     Searches for non-TDE applications, e.g. Acrobat Reader (tm) and installs
-    those apps under the K start button.
+    those apps under the T start button.
 
 * kate
     A fast and advanced text editor, extensible with nice plugins.
@@ -42,7 +42,7 @@ libraries. Here is an overview of the directories:
     programs.
 
 * kcontrol
-    The Trinity Control Center allows you to tweak the KDE settings.
+    The Trinity Control Center allows you to tweak the TDE settings.
 
 * kdcop
     GUI app to browse for DCOP interfaces, can also execute them.
@@ -69,14 +69,14 @@ libraries. Here is an overview of the directories:
     File find utility (standalone and in Konqueror's file manager).
 
 * khelpcenter
-    Used to to read all great documentation about KDE, unix man pages,
+    Used to to read all great documentation about TDE, unix man pages,
     info pages etc.
 
 * khotkeys
     Intercepts keys and can call applications.
 
 * kicker
-    The panel at the botton with the K start button and the taskbar etc.
+    The panel at the botton with the T start button and the taskbar etc.
 
 * tdeioslave
     Infrastructure that helps make every application internet enabled
@@ -86,7 +86,7 @@ libraries. Here is an overview of the directories:
     Taskbar applet that enhances and extenses the X clipboard.
 
 * kmenuedit
-    Edit for the menu below the K start button.
+    Edit for the menu below the T start button.
 
 * konqueror
     The file manager and web browser you get easily used to.
@@ -118,7 +118,7 @@ libraries. Here is an overview of the directories:
     A KDE frontend for passwd. Also contains the "Password & User Information" KCM.
 
 * ksplashml
-    The screen displayed while KDE starts.
+    The screen displayed while TDE starts.
 
 * kstart
     Launches applications with special window properties such as iconified,
@@ -131,10 +131,10 @@ libraries. Here is an overview of the directories:
     Allows to run any application in the system tray.
 
 * ktip
-    Gives you tips how to use KDE.
+    Gives you tips how to use TDE.
 
 * twin
-    The KDE window manager (moves, resizes and decorates windows).
+    The TDE window manager (moves, resizes and decorates windows).
 
 * kxkb
     A keyboard map tool.
@@ -268,17 +268,17 @@ they do.
 Debugging
 ---------
 You can use --enable-debug with the configure script, if you want to have
-debug code in your KDE apps and libs. If you experience problems and want to
-report problems to the KDE Bugs database, it is recommended to recompile
-with this switch enabled to make the backtraces more verbose (and thus
-giving the developer more information about the cause of the bug).
+debug code in your TDE apps and libs. If you experience problems and want to
+report problems, it is recommended to recompile with this switch enabled to 
+make the backtraces more verbose (and thus giving the developer more 
+information about the cause of the bug).
 
 
 Removal/Uninstallation
 ----------------------
-You can use 'make uninstall' if you want to remove the kde from the dirs.
+You can use 'make uninstall' if you want to remove the tde from the dirs.
 This feature has not been tested completely, and is depreciated. On a system
-where TDEDIR is specific to KDE (i.e. not /usr), rm -rf $TDEDIR does it as
+where TDEDIR is specific to TDE (i.e. not /usr), rm -rf $TDEDIR does it as
 well.
 
 
@@ -295,18 +295,19 @@ Will Andrews <will@FreeBSD.org> and Arun Sharma <adsharma@sharmas.dhs.org>
 for identifying what needed to be done, and how to do it, and such.
 
 If your system supports PAM (Plugable Authentication Modules), please see
-the README.pam file in this directory for more information about using KDE
+the README.pam file in this directory for more information about using TDE
 with PAM.
 
 Have a look at the individual subdirectories, if you would like to find out
 more about a specific application included in tdebase.
 
-More FAQs on http://www.kde.org/info/faq.html
+More FAQs on https://trinitydesktop.org/faq/index.php
 
 If you have problems compiling and installing this package, please check the
-kde-devel@kde.org mailing list archive (see http://lists.kde.org) to see if
-somebody had a similiar problem already. If not, try posting a message to
-the list with detailed information about the compile problem.
+devels@trinitydesktop.org mailing list archive (see 
+https://trinitydesktop.org/mailinglist.php) to see if somebody had a similiar 
+problem already. If not, try posting a message to the list with detailed
+information about the compile problem.
 
-General KDE discussions should go to the KDE mailing list (kde@kde.org).
+General TDE discussions should go to the TDE-users mailing list (users@trinitydesktop.org).
 
diff --git a/admin b/admin
-Subproject ae96f3ea4882e243513827da7c2ab889af3b160
+Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject 63b5532a298ccf95e310ae853ff53ade506daf7
diff --git a/config.h.cmake b/config.h.cmake
index 9c2fe0797..fcee849e3 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -7,6 +7,9 @@
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
 
+/* Define the path for the usb.ids file */
+#define USBIDS_FILE "@USBIDS_FILE@"
+
 // Defined if compiler supports long long type.
 #cmakedefine HAVE_LONG_LONG 1
 
@@ -16,6 +19,8 @@
 // kdesktop, konsole, kcontrol, kicker
 #cmakedefine HAVE_XRENDER 1
 
+#cmakedefine HAVE_SYS_LOADAVG_H 1
+
 // taskmanager, klipper
 #cmakedefine HAVE_XFIXES 1
 
@@ -32,7 +37,7 @@
 #cmakedefine HAVE_XSCREENSAVER 1
 
 /* Defines where xscreensaver stores its graphic hacks */
-#define XSCREENSAVER_HACKS_DIR "@XSCREENSAVER_DIR@"
+#define XSCREENSAVER_HACKS_DIRS "@XSCREENSAVER_DIRS@"
 
 // libart
 #cmakedefine HAVE_LIBART 1
@@ -62,17 +67,8 @@
 #cmakedefine HAVE_SYS_TYPES_H 1
 
 // tdeioslave/media
-#cmakedefine WITH_HAL 1
-#ifdef WITH_HAL
-#define COMPILE_HALBACKEND
-#define COMPILE_LINUXCDPOLLING
-#endif
-
-// tdeioslave/media
 #cmakedefine WITH_TDEHWLIB 1
 #ifdef WITH_TDEHWLIB
-// forcibly deactivate HAL support and substitute TDE hardware library support
-#undef COMPILE_HALBACKEND
 #define COMPILE_TDEHARDWAREBACKEND
 #endif
 
@@ -136,6 +132,33 @@
 // kcontrol/input
 #cmakedefine HAVE_LIBUSB 1
 
+// ksysguard, kcheckpass
+#cmakedefine HAVE_STRLCAT 1
+#cmakedefine HAVE_STRLCAT_PROTO 1
+#cmakedefine HAVE_STRLCPY 1
+#cmakedefine HAVE_STRLCPY_PROTO 1
+
+#if !defined(HAVE_STRLCAT_PROTO)
+#ifdef __cplusplus
+extern "C" {
+#endif
+unsigned long strlcat(char*, const char*, unsigned long);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#if !defined(HAVE_STRLCPY_PROTO)
+#ifdef __cplusplus
+extern "C" {
+#endif
+unsigned long strlcpy(char*, const char*, unsigned long);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+
 // tdeprint
 #cmakedefine HAVE_SIGACTION 1
 #cmakedefine HAVE_SIGSET 1
@@ -143,6 +166,7 @@
 // tdesu
 #cmakedefine HAVE_STRUCT_UCRED 1
 #cmakedefine HAVE_GETPEEREID 1
+#cmakedefine HAVE_GETPEERUCRED 1
 #cmakedefine HAVE_SYS_SELECT_H 1
 #cmakedefine HAVE_SYS_WAIT_H 1
 #cmakedefine DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@"
@@ -152,6 +176,7 @@
 
 // kcheckpass
 #cmakedefine KCHECKPASS_PAM_SERVICE "@KCHECKPASS_PAM_SERVICE@"
+#cmakedefine HAVE_PW_ENCRYPT 1
 
 // kdesktop
 #cmakedefine TDESCREENSAVER_PAM_SERVICE "@TDESCREENSAVER_PAM_SERVICE@"
@@ -168,6 +193,7 @@
 #cmakedefine HAVE_INITGROUPS 1
 #cmakedefine HAVE_MKSTEMP 1
 #cmakedefine HAVE_SETPROCTITLE 1
+#cmakedefine HAVE_PTHREAD_SETNAME_NP 1
 #cmakedefine HAVE_SYSINFO 1
 #cmakedefine HAVE_STRNLEN 1
 #cmakedefine HAVE_CRYPT 1
@@ -219,7 +245,9 @@
 #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@"
@@ -236,3 +264,10 @@
 
 // TDE compositor binary name
 #define TDE_COMPOSITOR_BINARY "compton-tde"
+
+// TDE man installation folder
+#define TDE_MANDIR "@MAN_INSTALL_DIR@"
+
+// System control binaries used in kcontrol/tdm
+#define POWEROFF_BINARY "@POWEROFF_BINARY@"
+#define REBOOT_BINARY "@REBOOT_BINARY@"
diff --git a/doc/kappfinder/CMakeLists.txt b/doc/kappfinder/CMakeLists.txt
new file mode 100644
index 000000000..54e4d7175
--- /dev/null
+++ b/doc/kappfinder/CMakeLists.txt
@@ -0,0 +1,6 @@
+#################################################
+#
+#  Empty CMake rules to avoid unwanted automatic
+#  installation of man-kappfinder.1.docbook
+#
+#################################################
diff --git a/doc/kate/highlighting.docbook b/doc/kate/highlighting.docbook
index 6c12a110f..f5ce8e8cb 100644
--- a/doc/kate/highlighting.docbook
+++ b/doc/kate/highlighting.docbook
@@ -250,7 +250,7 @@ Available attributes are:</term>
 <para><userinput>kateversion</userinput> specifies the latest supported &kate; version.</para>
 <para><userinput>casesensitive</userinput> defines, whether the keywords are casesensitiv or not.</para>
 <para><userinput>priority</userinput> is necessary if another highlight definition file uses the same extensions. The higher priority will win.</para>
-<para><userinput>author</userinput> contains the name of the author and his email-address.</para>
+<para><userinput>author</userinput> contains the name of the author and their email-address.</para>
 <para><userinput>license</userinput> contains the license, usually LGPL, Artistic, GPL and others.</para>
 <para><userinput>hidden</userinput> defines, whether the name should appear in &kate;'s menus.</para>
 <para>So the next line may look like this:</para>
@@ -465,7 +465,7 @@ do not need to set it, as it defaults to <emphasis>false</emphasis>.</para>
 <userinput>general</userinput> defines which indenter will be used, however we strongly
 recommend to omit this element, as the indenter usually will be set by either defining
 a File Type or by adding a mode line to the text file. If you specify an indenter though,
-you will force a specific indentation on the user, which he might not like at all.
+you will force a specific indentation on the user, which they might not like at all.
 Available attributes are:</term>
 
 <listitem>
diff --git a/doc/kate/index.docbook b/doc/kate/index.docbook
index 01835025f..b1f98b275 100644
--- a/doc/kate/index.docbook
+++ b/doc/kate/index.docbook
@@ -279,14 +279,3 @@ configure / settings / preferences
 -->
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-namecase-general: t
-sgml-namecase-entity: nil
-sgml-general-insert-case: lower
-sgml-minimize-attributes: nil
-sgml-omittag: nil
-End:
--->
diff --git a/doc/kate/regular-expressions.docbook b/doc/kate/regular-expressions.docbook
index c15685d75..51a9cf4e6 100644
--- a/doc/kate/regular-expressions.docbook
+++ b/doc/kate/regular-expressions.docbook
@@ -640,8 +640,8 @@ acknowledged if the following part of the searched string does match
 its <emphasis>PATTERN</emphasis>.</para>
 <para>The expression <userinput>const \w+\b(?!\s*&amp;)</userinput>
 will match at <quote>const char</quote> in the string <quote>const
-char* foo</quote> while it can not match <quote>const QString</quote>
-in <quote>const QString&amp; bar</quote> because the
+char* foo</quote> while it can not match <quote>const TQString</quote>
+in <quote>const TQString&amp; bar</quote> because the
 <quote>&amp;</quote> matches the negative lookahead assertion
 pattern.</para>
 </listitem>
diff --git a/doc/kcontrol/index.docbook b/doc/kcontrol/index.docbook
index f55b3e8e4..7bf88c286 100644
--- a/doc/kcontrol/index.docbook
+++ b/doc/kcontrol/index.docbook
@@ -628,10 +628,3 @@ class="username">root</systemitem> permissions.
 </chapter>
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-End:
--->
-
diff --git a/doc/kcontrol/samba/index.docbook b/doc/kcontrol/samba/index.docbook
index 69d7b91b9..dcf058947 100644
--- a/doc/kcontrol/samba/index.docbook
+++ b/doc/kcontrol/samba/index.docbook
@@ -70,12 +70,12 @@ process (<command>smbd</command>), the next column shows the process
 <abbrev>ID</abbrev> (<acronym>pid</acronym>) of this
 <command>smbd</command>. If you kill this process the connected user
 will be disconnected. If the remote user works from &Windows;, as soon
-as this process is killed a new one will be created, so he will almost
+as this process is killed a new one will be created, so they will almost
 not notice it.</para>
 
 <para>The last column shows how many files this user has currently open.
-Here you see only, how many files he has <emphasis>open</emphasis> just
-now, you don't see how many he copied or formerly opened &etc;</para>
+Here you see only how many files they have <emphasis>open</emphasis> just
+now, you don't see how many they copied or formerly opened &etc;</para>
 
 </sect2>
 
@@ -204,4 +204,4 @@ fixed:</para>
 </sect2>
 </sect1>
 
-</article>
\ No newline at end of file
+</article>
diff --git a/doc/kcontrol/windowbehavior/index.docbook b/doc/kcontrol/windowbehavior/index.docbook
index 356e3ce0f..310c6b021 100644
--- a/doc/kcontrol/windowbehavior/index.docbook
+++ b/doc/kcontrol/windowbehavior/index.docbook
@@ -616,6 +616,13 @@ to allow moving or resizing maximized windows.</para>
 </varlistentry>
 
 <varlistentry>
+<term><guilabel>Restore size of maximized/tiled windows when moving</guilabel></term>
+<listitem>
+<para>When enabled, this feature restores the original size of a maximized or <link linkend="active-borders">tiled</link> window when the window is dragged.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term><guilabel>Placement</guilabel></term>
 <listitem>
 <para>This feature determines where new windows are placed on the desktop.</para>
@@ -707,6 +714,52 @@ less.</para>
 
 </sect2>
 
+<sect2 id="active-borders">
+<title>Active Borders</title>
+
+<para><guilabel>Active Borders</guilabel> is a feature which allows you to quickly perform window management actions by moving your mouse into a desktop border.</para>
+
+<para>The corresponding section allows you to configure the function that will be performed when pushing your mouse cursor against a border or moving a window into it:</para>
+
+<variablelist>
+<varlistentry>
+<term><guilabel>Disabled</guilabel></term>
+<listitem>
+<para>This option disables the Active Borders feature.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Switch desktop</guilabel></term>
+<listitem>
+<para>Moving your mouse pointer against the side of the screen will switch to another desktop.</para>
+<para>By default the switch occurs both when moving your mouse pointer into a border and dragging a window into it. The <guilabel>Switch desktop only when moving a window</guilabel> checkbox disables the former behaviour and only switches to another desktop when a window is being dragged into a desktop border.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term><guilabel>Tile window</guilabel></term>
+<listitem>
+<para>Dragging a window into a desktop border will tile that window at that side or corner of the screen. This feature is also known as <quote>Aerosnap</quote> or <quote>Quick Tile</quote>.</para>
+<para><guilabel>Maximize windows by dragging them to the top of the screen</guilabel> changes the behaviour of the top border of the desktop. If this option is enabled, dragging a window into the top border will not result in tiling, but the window will become maximized instead.</para>
+<para>By default dragging a tiled window does not reset its original size. This behaviour is controlled by an option in the <link linkend="moving">Moving</link> tab of this control module.</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+<para>
+<guilabel>Border activation delay</guilabel>.
+This option controls the delay before the designated active border function is performed. A higher value can prevent accidental activations of this feature.
+</para>
+
+<para>
+<guilabel>Border activation distance</guilabel>.
+This option controls how far from a desktop edge the mouse cursor should be in order to be able to activate the corresponding function. The default value is low,
+meaning that you have to be very close to the border or corner to trigger it, preventing accidental activations. A higher value means easier activation without
+having to actually push against the borders and corners.
+</para>
+</sect2>
+
 <sect2 id="advanced">
 <title>Advanced</title>
 
@@ -739,35 +792,8 @@ Use the slider widget to configure the delay.
 
 </variablelist>
 
-<variablelist>
-<title>Active Desktop Borders</title>
-
-<varlistentry>
-<term><guilabel>Disabled</guilabel></term>
-<listitem>
-<para>When this option is enabled, moving the mouse pointer to a screen
-border will change your desktop. This is useful when you want to drag
-windows from one desktop to another.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Only when moving windows</guilabel></term>
-<listitem>
-<para>Moving your mouse pointer against the side of the screen will
-switch to a new desktop only while moving a window.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><guilabel>Always enabled</guilabel></term>
-<listitem>
-<para>Moving your mouse pointer against the side of the screen will
-always switch to a new desktop.</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
+<sect3>
+<title>Other</title>
 
 <para>
 <guilabel>Hide utility windows for inactive applications</guilabel>. When
@@ -776,6 +802,7 @@ 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.
 </para>
+</sect3>
 
 </sect2>
 
diff --git a/doc/keditbookmarks/bookmarks.docbook b/doc/keditbookmarks/bookmarks.docbook
index 0e19b3258..d13d9b170 100644
--- a/doc/keditbookmarks/bookmarks.docbook
+++ b/doc/keditbookmarks/bookmarks.docbook
@@ -75,13 +75,3 @@ the <guilabel>Bookmark Editor</guilabel>.
 
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/keditbookmarks/index.docbook b/doc/keditbookmarks/index.docbook
index e530a228a..ca3f7c63a 100644
--- a/doc/keditbookmarks/index.docbook
+++ b/doc/keditbookmarks/index.docbook
@@ -48,14 +48,3 @@
 &documentation.index; 
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/doc/kfind/index.docbook b/doc/kfind/index.docbook
index 3e123be7c..2bb5376a7 100644
--- a/doc/kfind/index.docbook
+++ b/doc/kfind/index.docbook
@@ -349,15 +349,3 @@ In order to successfully use &kfind;, you need &tde; 3.x.
 &documentation.index;
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=0:sw=2:tw=78:noet
--->
diff --git a/ksplashml/pics/CMakeL10n.txt b/doc/khelpcenter/CMakeL10n.txt
index b585ce4af..6d5e285d8 100644
--- a/ksplashml/pics/CMakeL10n.txt
+++ b/doc/khelpcenter/CMakeL10n.txt
@@ -1,3 +1,3 @@
 ##### create translation templates ##############
 
-tde_l10n_auto_add_subdirectories( )
+tde_l10n_auto_add_subdirectories()
diff --git a/doc/khelpcenter/CMakeLists.txt b/doc/khelpcenter/CMakeLists.txt
index 279f09d4d..83c417b7a 100644
--- a/doc/khelpcenter/CMakeLists.txt
+++ b/doc/khelpcenter/CMakeLists.txt
@@ -10,3 +10,5 @@
 #################################################
 
 tde_create_handbook( DESTINATION khelpcenter )
+
+tde_auto_add_subdirectories()
diff --git a/doc/adminguide/CMakeLists.txt b/doc/khelpcenter/adminguide/CMakeLists.txt
index ec8d87dac..ec8d87dac 100644
--- a/doc/adminguide/CMakeLists.txt
+++ b/doc/khelpcenter/adminguide/CMakeLists.txt
diff --git a/doc/adminguide/Makefile.am b/doc/khelpcenter/adminguide/Makefile.am
index 86108a74b..86108a74b 100644
--- a/doc/adminguide/Makefile.am
+++ b/doc/khelpcenter/adminguide/Makefile.am
diff --git a/doc/adminguide/groupware-kontact.docbook b/doc/khelpcenter/adminguide/groupware-kontact.docbook
index 273ba4f54..e1a8db623 100644
--- a/doc/adminguide/groupware-kontact.docbook
+++ b/doc/khelpcenter/adminguide/groupware-kontact.docbook
@@ -594,21 +594,3 @@ in #cyrus channel:</para>
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/adminguide/index.docbook b/doc/khelpcenter/adminguide/index.docbook
index dd24a1cdc..c5052185a 100644
--- a/doc/adminguide/index.docbook
+++ b/doc/khelpcenter/adminguide/index.docbook
@@ -36,7 +36,7 @@
 </para>
 
 <para>Please report problems with this document to
-<email>trinity-devel@lists.pearsoncomputing.net</email>.
+<email>devels@trinitydesktop.org</email>.
 </para>
 </abstract>
 
@@ -2216,7 +2216,7 @@ indicate the users home directory and the &tde; temporary directory of the
 user, &eg; <filename class="directory">/tmp/tde-bastian</filename></para>
 
 <para>The following rules makes that the user can no longer open local files
-that are outside his $<envar>HOME</envar> directory:</para>
+that are outside their $<envar>HOME</envar> directory:</para>
 
 <screenco><areaspec>
 <area id="local_rule1" coords="3"/>
@@ -2519,11 +2519,11 @@ session-4
 QCStringList interfaces()
 QCStringList functions()
 int sessionCount()
-QString currentSession()
-QString newSession()
-QString newSession(QString type)
-QString sessionId(int position)
-void activateSession(QString sessionId)
+TQString currentSession()
+TQString newSession()
+TQString newSession(TQString type)
+TQString sessionId(int position)
+void activateSession(TQString sessionId)
 void nextSession()
 void prevSession()
 void moveSessionLeft()
@@ -2541,15 +2541,15 @@ QCStringList functions()
 bool closeSession()
 bool sendSignal(int signal)
 void clearHistory()
-void renameSession(QString name)
-QString sessionName()
+void renameSession(TQString name)
+TQString sessionName()
 int sessionPID()
-QString schema()
-void setSchema(QString schema)
-QString encoding()
-void setEncoding(QString encoding)
-QString keytab()
-void setKeytab(QString keyboard)
+TQString schema()
+void setSchema(TQString schema)
+TQString encoding()
+void setEncoding(TQString encoding)
+TQString keytab()
+void setKeytab(TQString keyboard)
 QSize size()
 void setSize(QSize size)
 </screen>
diff --git a/doc/khelpcenter/contact.docbook b/doc/khelpcenter/contact.docbook
index 9b9f7d076..5f06860d6 100644
--- a/doc/khelpcenter/contact.docbook
+++ b/doc/khelpcenter/contact.docbook
@@ -70,14 +70,3 @@ found in the documentation of their individual application.</para>
 </sect2>
 </sect1>
 </chapter>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:nil
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-always-quote-attributes:t
-sgml-parent-document:index.docbook
-End:
--->
diff --git a/doc/faq/CMakeLists.txt b/doc/khelpcenter/faq/CMakeLists.txt
index 606220074..606220074 100644
--- a/doc/faq/CMakeLists.txt
+++ b/doc/khelpcenter/faq/CMakeLists.txt
diff --git a/doc/faq/Makefile.am b/doc/khelpcenter/faq/Makefile.am
index 9c7a6607a..9c7a6607a 100644
--- a/doc/faq/Makefile.am
+++ b/doc/khelpcenter/faq/Makefile.am
diff --git a/doc/faq/TODO b/doc/khelpcenter/faq/TODO
index a91707552..a91707552 100644
--- a/doc/faq/TODO
+++ b/doc/khelpcenter/faq/TODO
diff --git a/doc/faq/about.docbook b/doc/khelpcenter/faq/about.docbook
index d1055df2e..9b5e0841e 100644
--- a/doc/faq/about.docbook
+++ b/doc/khelpcenter/faq/about.docbook
@@ -39,28 +39,9 @@ relevant documentation) well before asking questions on the various
 <answer>
 <para>Becoming an <acronym>FAQ</acronym> maintainer is easy
 and we are always grateful for help. :-) Send
-us an email at <email>trinity-devel@lists.pearsoncomputing.net</email>.
+us an email at <email>devels@trinitydesktop.org</email>.
 </para>
 </answer>
 </qandaentry>
 </qandaset>
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
diff --git a/doc/faq/configtde.docbook b/doc/khelpcenter/faq/configtde.docbook
index dd5c45686..dd5c45686 100644
--- a/doc/faq/configtde.docbook
+++ b/doc/khelpcenter/faq/configtde.docbook
diff --git a/doc/faq/contrib.docbook b/doc/khelpcenter/faq/contrib.docbook
index 6bb716f62..d1f4a85f0 100644
--- a/doc/faq/contrib.docbook
+++ b/doc/khelpcenter/faq/contrib.docbook
@@ -29,7 +29,7 @@ report?</link>.</para></listitem>
 <listitem><para>Draw icons, wallpaper, or compose sound effects.</para></listitem>
 <listitem><para>Write articles and books about &tde;. If you want to
 help spread the word about &tde;, send an email to
-<email>trinity-devel@lists.pearsoncomputing.net</email>. This will get you in touch
+<email>devels@trinitydesktop.org</email>. This will get you in touch
 with the &tde; developers and packagers.</para></listitem>
 <listitem><para>Program new &tde; applications. Please refer to <xref
 linkend="programming"/> for more information.</para></listitem>
@@ -98,7 +98,7 @@ directory.</para>
 programming for &tde; should do: please <emphasis>subscribe to the developers
 mailing list</emphasis>. To subscribe, you have to send an email to
 <ulink
-url="mailto:trinity-devel-subscribe@lists.pearsoncomputing.net">trinity-devel-subscribe@lists.pearsoncomputing.net</ulink>
+url="mailto:devels-join@trinitydesktop.org">devels-join@trinitydesktop.org</ulink>
 with an empty email.
 <important><para>Please read<ulink url="http://www.trinitydesktop.org/mailinglist.php">
 http://www.trinitydesktop.org/mailinglist.php</ulink>. Everything
@@ -118,8 +118,8 @@ way is to create a patch against a current snapshot and send this
 patch to the developer/maintainer of the respective program.</para>
 <para>If you are doing this more or less regularly, then contact the developers
 to obtain write access to the <acronym>GIT</acronym> repository:
-<ulink url="trinity-devel@lists.pearsoncomputing.net">
-trinity-devel@lists.pearsoncomputing.net</ulink>.</para>
+<ulink url="devels@trinitydesktop.org">
+devels@trinitydesktop.org</ulink>.</para>
 </answer>
 </qandaentry>
 
diff --git a/doc/faq/desktop.docbook b/doc/khelpcenter/faq/desktop.docbook
index cd5e8c1c5..cd5e8c1c5 100644
--- a/doc/faq/desktop.docbook
+++ b/doc/khelpcenter/faq/desktop.docbook
diff --git a/doc/faq/filemng.docbook b/doc/khelpcenter/faq/filemng.docbook
index f91275f21..76007bcb6 100644
--- a/doc/faq/filemng.docbook
+++ b/doc/khelpcenter/faq/filemng.docbook
@@ -152,7 +152,7 @@ Foo" are properties defined in the <filename>.desktop</filename> file. If
 the icons are not defined, they simply default to the executable name
 <replaceable>foo</replaceable>.</para>
 
-<para>This way a user can change these things in &kmenuedit; for his or her
+<para>This way a user can change these things in &kmenuedit; for their
 applications. The <option>-caption</option> option is important, because no
 user will accept that the menu item <guimenuitem>Editor</guimenuitem> starts
 something called <guilabel>kedit-0.9pl4-build47</guilabel>. Instead, users
@@ -184,20 +184,3 @@ MenuBar=Disabled
 
 </qandaset>
 </chapter>
-
-<!--Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/faq/gettde.docbook b/doc/khelpcenter/faq/gettde.docbook
index 73911e92d..73911e92d 100644
--- a/doc/faq/gettde.docbook
+++ b/doc/khelpcenter/faq/gettde.docbook
diff --git a/doc/faq/index.docbook b/doc/khelpcenter/faq/index.docbook
index 275a2055e..70cf03539 100644
--- a/doc/faq/index.docbook
+++ b/doc/khelpcenter/faq/index.docbook
@@ -54,7 +54,7 @@
 <abstract> <para>This is a collection of frequently asked
 questions about the Trinity Desktop Environment.  Please report any bugs,
 inconsistencies, or omissions you find in this &FAQ; to
-<email>trinity-devel@lists.pearsoncomputing.net</email>.  Please post
+<email>devels@trinitydesktop.org</email>.  Please post
 questions to the &tde; mailing lists. Questions are monitored to help
 maintain this &FAQ;.</para> </abstract>
 
@@ -113,18 +113,3 @@ maintainers, Rainer Endres, Mr. Lee Wee Tiong, and J. Hall.</para>
 
 &documentation.index;
 </book>
-
-<!--
-Local Variables:
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-omittag:t
-sgml-shorttag:t
-sgml-namecase-general:t
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:nil
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-End:
--->
diff --git a/doc/faq/install.docbook b/doc/khelpcenter/faq/install.docbook
index 91ebbbb5c..91ebbbb5c 100644
--- a/doc/faq/install.docbook
+++ b/doc/khelpcenter/faq/install.docbook
diff --git a/doc/faq/intro.docbook b/doc/khelpcenter/faq/intro.docbook
index 720b2bc61..720b2bc61 100644
--- a/doc/faq/intro.docbook
+++ b/doc/khelpcenter/faq/intro.docbook
diff --git a/doc/faq/misc.docbook b/doc/khelpcenter/faq/misc.docbook
index 0dd2c4556..c22a11138 100644
--- a/doc/faq/misc.docbook
+++ b/doc/khelpcenter/faq/misc.docbook
@@ -196,7 +196,7 @@ artwork at <ulink url="http://kde-look.org">http://kde-look.org</ulink>.
 <para>You might want to subscribe to the
 <ulink url="http://www.trinitydesktop.org/mailinglist.php">
 &tde; developer's mail list</ulink>.
-Refer to <ulink url="http://trinity-devel.pearsoncomputing.net/">http://trinity-devel.pearsoncomputing.net/</ulink>
+Refer to <ulink url="http://mail.trinitydesktop.org/mailman3/hyperkitty/list/devels@trinitydesktop.org">http://mail.trinitydesktop.org/mailman3/hyperkitty/list/devels@trinitydesktop.org</ulink>
 if you want to read without subscribing.</para>
 </answer>
 </qandaentry>
@@ -228,16 +228,5 @@ if you want to read without subscribing.</para>
 </answer>
 </qandaentry>
 
-<qandaentry>
-<question>
-<para>How do the developers propose to transition away from HAL (hardware abstraction layer)?</para>
-</question>
-<answer>
-<para>The Trinity team developed a new native hardware support layer that is under testing.
-That new system will be enabled by default in a future release, but is available now
-in the development sources.</para>
-</answer>
-</qandaentry>
-
 </qandaset>
 </chapter>
diff --git a/doc/faq/moreinfo.docbook b/doc/khelpcenter/faq/moreinfo.docbook
index f9d619456..df0aac208 100644
--- a/doc/faq/moreinfo.docbook
+++ b/doc/khelpcenter/faq/moreinfo.docbook
@@ -73,17 +73,17 @@ already answered in this &FAQ;.</para>
 
 <variablelist>
 <varlistentry>
-<term><ulink url="http://trinity-users.pearsoncomputing.net/">tde-users</ulink></term>
+<term><ulink url="http://mail.trinitydesktop.org/mailman3/hyperkitty/list/users@trinitydesktop.org">tde-users</ulink></term>
 <listitem><para>General discussion archives.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><ulink url="http://trinity-announce.pearsoncomputing.net/">tde-announce</ulink></term>
+<term><ulink url="http://mail.trinitydesktop.org/mailman3/hyperkitty/list/announcements@trinitydesktop.org">tde-announce</ulink></term>
 <listitem><para>Announcement archives.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><ulink url="http://trinity-devel.pearsoncomputing.net/">tde-devel</ulink></term>
+<term><ulink url="http://mail.trinitydesktop.org/mailman3/hyperkitty/list/devels@trinitydesktop.org">tde-devel</ulink></term>
 <listitem><para>Developers, artists, documentation writer archives.</para></listitem>
 </varlistentry>
 </variablelist>
diff --git a/doc/faq/nontdeapps.docbook b/doc/khelpcenter/faq/nontdeapps.docbook
index ec04e11b6..9fc3d70ad 100644
--- a/doc/faq/nontdeapps.docbook
+++ b/doc/khelpcenter/faq/nontdeapps.docbook
@@ -82,21 +82,3 @@ be found <ulink url="http://www.mozilla.org/build">here</ulink>.
 
 </qandaset>
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
\ No newline at end of file
diff --git a/doc/faq/notrelated.docbook b/doc/khelpcenter/faq/notrelated.docbook
index 5440341c1..5440341c1 100644
--- a/doc/faq/notrelated.docbook
+++ b/doc/khelpcenter/faq/notrelated.docbook
diff --git a/doc/faq/panel.docbook b/doc/khelpcenter/faq/panel.docbook
index ab571ccc7..68330ac9a 100644
--- a/doc/faq/panel.docbook
+++ b/doc/khelpcenter/faq/panel.docbook
@@ -153,21 +153,3 @@ change should now be applied every time you start &tde;.</para>
 
 </qandaset>
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/faq/qt.docbook b/doc/khelpcenter/faq/qt.docbook
index 1254ec77e..1254ec77e 100644
--- a/doc/faq/qt.docbook
+++ b/doc/khelpcenter/faq/qt.docbook
diff --git a/doc/faq/questions.docbook b/doc/khelpcenter/faq/questions.docbook
index 9fac3c2b2..bc0be3b32 100644
--- a/doc/faq/questions.docbook
+++ b/doc/khelpcenter/faq/questions.docbook
@@ -132,24 +132,6 @@ people who do this for free with your politeness and appreciation. :-)</para>
 
 <para>If you think the answer to your question should be included in the
 &tde; &FAQ; please feel free to submit any patches or suggestions to the
-&tde; &FAQ; Maintainer, at <email>trinity-devel@lists.pearsoncomputing.net</email></para>
+&tde; &FAQ; Maintainer, at <email>devels@trinitydesktop.org</email></para>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/faq/sound.docbook b/doc/khelpcenter/faq/sound.docbook
index feaaf6651..feaaf6651 100644
--- a/doc/faq/sound.docbook
+++ b/doc/khelpcenter/faq/sound.docbook
diff --git a/doc/faq/tdeapps.docbook b/doc/khelpcenter/faq/tdeapps.docbook
index 441759054..441759054 100644
--- a/doc/faq/tdeapps.docbook
+++ b/doc/khelpcenter/faq/tdeapps.docbook
diff --git a/doc/faq/tips.docbook b/doc/khelpcenter/faq/tips.docbook
index 89c324be3..89c324be3 100644
--- a/doc/faq/tips.docbook
+++ b/doc/khelpcenter/faq/tips.docbook
diff --git a/doc/faq/webbrowse.docbook b/doc/khelpcenter/faq/webbrowse.docbook
index b466eb0d8..b466eb0d8 100644
--- a/doc/faq/webbrowse.docbook
+++ b/doc/khelpcenter/faq/webbrowse.docbook
diff --git a/doc/faq/winmng.docbook b/doc/khelpcenter/faq/winmng.docbook
index dd79018bc..dd79018bc 100644
--- a/doc/faq/winmng.docbook
+++ b/doc/khelpcenter/faq/winmng.docbook
diff --git a/doc/glossary/CMakeLists.txt b/doc/khelpcenter/glossary/CMakeLists.txt
index 73a84f204..73a84f204 100644
--- a/doc/glossary/CMakeLists.txt
+++ b/doc/khelpcenter/glossary/CMakeLists.txt
diff --git a/doc/glossary/Makefile.am b/doc/khelpcenter/glossary/Makefile.am
index e79a46842..e79a46842 100644
--- a/doc/glossary/Makefile.am
+++ b/doc/khelpcenter/glossary/Makefile.am
diff --git a/doc/glossary/checkxrefs b/doc/khelpcenter/glossary/checkxrefs
index 6da64c184..6da64c184 100755
--- a/doc/glossary/checkxrefs
+++ b/doc/khelpcenter/glossary/checkxrefs
diff --git a/doc/glossary/index.docbook b/doc/khelpcenter/glossary/index.docbook
index a812b50f4..a812b50f4 100644
--- a/doc/glossary/index.docbook
+++ b/doc/khelpcenter/glossary/index.docbook
diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/khelpcenter/glossary/tdeprintingglossary.docbook
index cec585741..cec585741 100644
--- a/doc/glossary/tdeprintingglossary.docbook
+++ b/doc/khelpcenter/glossary/tdeprintingglossary.docbook
diff --git a/doc/khelpcenter/help.docbook b/doc/khelpcenter/help.docbook
index fd6e68d34..6d787c99f 100644
--- a/doc/khelpcenter/help.docbook
+++ b/doc/khelpcenter/help.docbook
@@ -18,14 +18,14 @@ documentation (&XML;).
 <para> All base &tde; applications come fully documented, thanks to
 the efforts of many people. If you would like to help,
 please contact members of the Trinity development team at
-<email>trinity-devel@lists.pearsoncomputing.net</email> for information.
+<email>devels@trinitydesktop.org</email> for information.
 Experience is not required, just enthusiasm and patience.
 </para>
 
 <para>
 If you would like to help translate &tde; documentation to your native
 language,please contact members of the Trinity development team at
-<email>trinity-devel@lists.pearsoncomputing.net</email> for information.</para>
+<email>devels@trinitydesktop.org</email> for information.</para>
 
 <sect2 id="installation">
 <title>Installation</title>
diff --git a/doc/helpnotfound/CMakeLists.txt b/doc/khelpcenter/helpnotfound/CMakeLists.txt
index 856ae3155..856ae3155 100644
--- a/doc/helpnotfound/CMakeLists.txt
+++ b/doc/khelpcenter/helpnotfound/CMakeLists.txt
diff --git a/doc/helpnotfound/index.docbook b/doc/khelpcenter/helpnotfound/index.docbook
index bcc0ca9ad..bcc0ca9ad 100644
--- a/doc/helpnotfound/index.docbook
+++ b/doc/khelpcenter/helpnotfound/index.docbook
diff --git a/doc/khelpcenter/index.docbook b/doc/khelpcenter/index.docbook
index efd05100a..e2321c568 100644
--- a/doc/khelpcenter/index.docbook
+++ b/doc/khelpcenter/index.docbook
@@ -69,15 +69,3 @@ professional graphical design along with the technical advantages of
 &support;
 
 </book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:nil
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-always-quote-attributes:t
-End:
--->
-
diff --git a/doc/khelpcenter/license/CMakeL10n.txt b/doc/khelpcenter/license/CMakeL10n.txt
new file mode 100644
index 000000000..6fc757869
--- /dev/null
+++ b/doc/khelpcenter/license/CMakeL10n.txt
@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_create_template( "tdelicense" )
diff --git a/doc/khelpcenter/license/CMakeLists.txt b/doc/khelpcenter/license/CMakeLists.txt
new file mode 100644
index 000000000..ee0dfb94b
--- /dev/null
+++ b/doc/khelpcenter/license/CMakeLists.txt
@@ -0,0 +1,31 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES tde_license_info.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
+
+
+##### tde_license_info (executable) #########################
+
+tde_add_executable( tde_license_info AUTOMOC
+  SOURCES mainWindow.cpp TDELicenseDlg.cpp
+  LINK tdeui-shared
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/doc/khelpcenter/license/TDELicenseDlg.cpp b/doc/khelpcenter/license/TDELicenseDlg.cpp
new file mode 100644
index 000000000..a572389db
--- /dev/null
+++ b/doc/khelpcenter/license/TDELicenseDlg.cpp
@@ -0,0 +1,122 @@
+#include <tqfile.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+
+#include <kiconloader.h>
+#include <kpushbutton.h>
+#include <kseparator.h>
+#include <kstddirs.h>
+#include <ktabwidget.h>
+#include <ktextbrowser.h>
+#include <tdelocale.h>
+
+#include "TDELicenseDlg.h"
+
+TDELicenseDlg::TDELicenseDlg(TQWidget *parent, const char *name)
+        : KDialog(parent, name)
+{
+  setCaption(i18n("TDE License"));
+  setIcon(TDEGlobal::iconLoader()->loadIcon("about_kde", TDEIcon::NoGroup, TDEIcon::SizeSmall));
+  setMinimumSize(600, 600);
+
+  TQVBoxLayout *vbox = new TQVBoxLayout(this, marginHint(), spacingHint());
+
+  // Top label
+  TQLabel *topLabel = new TQLabel(this);
+  topLabel->setText(i18n(
+          "The Trinity Desktop Environment (TDE) project is a computer desktop\n"
+          "environment for Unix-like operating systems with a primary goal of\n"
+          "retaining the function and form of traditional desktop computers.\n\n"
+          "Its components are provided under the following licenses, as applicable.\n\n"
+          "Thanks for using TDE!"));
+  vbox->addWidget(topLabel);
+
+  TQSpacerItem *spacerV = new TQSpacerItem(10, 10, TQSizePolicy::Minimum,
+          TQSizePolicy::Minimum);
+  vbox->addItem(spacerV);
+
+  // License tab widget
+  KTabWidget *twLicense = new KTabWidget(this);
+  twLicense->setTabReorderingEnabled(false);
+  twLicense->setAutomaticResizeTabs(true);
+  twLicense->setTabCloseActivatePrevious(true);
+  twLicense->setMouseWheelScroll(true);
+  twLicense->setTabPosition(TQTabWidget::Top);
+
+  KTextBrowser *tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("GPL_V2"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("GPL v2"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("GPL_V3"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("GPL v3"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("LGPL_V2"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("LGPL v2"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("LGPL_V3"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("LGPL v3"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("BSD"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("BSD"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("ARTISTIC"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("Artistic"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("QPL_V1.0"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("QPL v1.0"));
+
+  tbLicense = new KTextBrowser(twLicense);
+  tbLicense->setText(readLicenseFile("MIT"));
+  tbLicense->moveCursor(TQTextEdit::MoveHome, false);
+  twLicense->addTab(tbLicense, i18n("MIT"));
+
+  twLicense->setCurrentPage(0);
+  vbox->addWidget(twLicense);
+
+  KSeparator *sep = new KSeparator(KSeparator::HLine, this);
+  vbox->addWidget(sep);
+
+  // Close button
+  TQHBoxLayout *hboxBottom = new TQHBoxLayout(vbox, 4);
+  TQSpacerItem *spacerHBottom = new TQSpacerItem(10, 10, TQSizePolicy::Expanding,
+          TQSizePolicy::Minimum);
+  hboxBottom->addItem(spacerHBottom);
+  KPushButton *okButton = new KPushButton(KStdGuiItem::ok(), this);
+  connect(okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+  okButton->setDefault(true);
+  okButton->setFocus();
+  hboxBottom->addWidget(okButton);
+}
+
+TQString TDELicenseDlg::readLicenseFile(const TQString &licenseName)
+{
+  TQString licensePath = locate("data", TQString("LICENSES/%1").arg(licenseName));
+  if (licensePath.isEmpty())
+  {
+    return i18n("License file not found!");
+  }
+
+  TQFile licenseFile(licensePath);
+  if (licenseFile.open(IO_ReadOnly))
+  {
+    TQTextStream txtstr(&licenseFile);
+    return txtstr.read();
+  }
+
+  return i18n("Unable to open license file!");
+}
+
+#include "TDELicenseDlg.moc"
diff --git a/doc/khelpcenter/license/TDELicenseDlg.h b/doc/khelpcenter/license/TDELicenseDlg.h
new file mode 100644
index 000000000..40e05a7a4
--- /dev/null
+++ b/doc/khelpcenter/license/TDELicenseDlg.h
@@ -0,0 +1,17 @@
+#ifndef __TDELICENSE_DLG_H__
+#define __TDELICENSE_DLG_H__
+
+#include <kdialog.h>
+
+class TDELicenseDlg : public KDialog
+{
+  TQ_OBJECT
+
+public:
+  TDELicenseDlg(TQWidget *parent = 0, const char *name = 0);
+
+protected:
+  static TQString readLicenseFile(const TQString &licenseName);
+};
+
+#endif
diff --git a/doc/khelpcenter/license/mainWindow.cpp b/doc/khelpcenter/license/mainWindow.cpp
new file mode 100644
index 000000000..78b50f576
--- /dev/null
+++ b/doc/khelpcenter/license/mainWindow.cpp
@@ -0,0 +1,40 @@
+/*
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of version 2 of the GNU General Public
+    License as published by the Free Software Foundation
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
+
+#include "TDELicenseDlg.h"
+
+int main(int argc, char *argv[])
+{
+  TDELocale::setMainCatalogue("tdelicense");
+  TDEAboutData aboutData("TDELicense", I18N_NOOP("TDE License"),
+          "0.1", I18N_NOOP("TDE License"), TDEAboutData::License_GPL,
+          "(c) 2023, TDE Developers");
+  TDECmdLineArgs::init(argc,argv, &aboutData);
+  TDEApplication::addCmdLineOptions();
+  TDEApplication app;
+  TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit()));
+
+  TDELicenseDlg *licenseDlg = new TDELicenseDlg();
+  app.setMainWidget(licenseDlg);
+  licenseDlg->show();
+
+  return app.exec();
+}
diff --git a/doc/khelpcenter/license/tde_license_info.desktop b/doc/khelpcenter/license/tde_license_info.desktop
new file mode 100644
index 000000000..3cabcfad0
--- /dev/null
+++ b/doc/khelpcenter/license/tde_license_info.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=tde_show_license_info
+Exec=tde_show_license_info
+Type=Application
+X-TDE-autostart-phase=2
+X-TDE-StartupNotify=false
+X-TDE-UniqueApplet=true
+Categories=System;
diff --git a/doc/quickstart/CMakeLists.txt b/doc/khelpcenter/quickstart/CMakeLists.txt
index ba7a81cfd..ba7a81cfd 100644
--- a/doc/quickstart/CMakeLists.txt
+++ b/doc/khelpcenter/quickstart/CMakeLists.txt
diff --git a/doc/quickstart/Makefile.am b/doc/khelpcenter/quickstart/Makefile.am
index 7e42282c4..7e42282c4 100644
--- a/doc/quickstart/Makefile.am
+++ b/doc/khelpcenter/quickstart/Makefile.am
diff --git a/doc/quickstart/index.docbook b/doc/khelpcenter/quickstart/index.docbook
index 4f083fadf..a70ab467c 100644
--- a/doc/quickstart/index.docbook
+++ b/doc/khelpcenter/quickstart/index.docbook
@@ -1333,12 +1333,3 @@ Editor</para></listitem>
 </sect1>
 </chapter>
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/releasenotes/CMakeL10n.txt b/doc/khelpcenter/releasenotes/CMakeL10n.txt
index 7d0692737..7d0692737 100644
--- a/doc/releasenotes/CMakeL10n.txt
+++ b/doc/khelpcenter/releasenotes/CMakeL10n.txt
diff --git a/doc/releasenotes/CMakeLists.txt b/doc/khelpcenter/releasenotes/CMakeLists.txt
index 4392e53e4..39014a623 100644
--- a/doc/releasenotes/CMakeLists.txt
+++ b/doc/khelpcenter/releasenotes/CMakeLists.txt
@@ -6,6 +6,8 @@
 #
 #################################################
 
+tde_auto_add_subdirectories()
+
 tde_create_handbook( DESTINATION khelpcenter/releasenotes )
 
 install( FILES tde_release_notes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
diff --git a/doc/releasenotes/Makefile.am b/doc/khelpcenter/releasenotes/Makefile.am
index b6849ee28..b6849ee28 100644
--- a/doc/releasenotes/Makefile.am
+++ b/doc/khelpcenter/releasenotes/Makefile.am
diff --git a/doc/khelpcenter/releasenotes/index.docbook b/doc/khelpcenter/releasenotes/index.docbook
new file mode 100644
index 000000000..607fdff4f
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/index.docbook
@@ -0,0 +1,48 @@
+<?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 id="release-notes" lang="&language;">
+<title>&tde-release-version; Release Notes</title>
+
+<articleinfo>
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<abstract>
+<para>&tde-release-version; Release Notes</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>release notes</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="release-notes-introduction">
+<title></title>
+
+<para><ulink url="help:/khelpcenter/releasenotes/r14.2.x">Release Notes for R14.2.x series</ulink></para>
+<para><ulink url="help:/khelpcenter/releasenotes/r14.1.x">Release Notes for R14.1.x series</ulink></para>
+<para><ulink url="help:/khelpcenter/releasenotes/r14.0.x">Release Notes for R14.0.x series</ulink></para>
+
+</sect1>
+
+</article>
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/CMakeLists.txt b/doc/khelpcenter/releasenotes/r14.0.x/CMakeLists.txt
new file mode 100644
index 000000000..95bb8e0e6
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION khelpcenter/releasenotes/r14.0.x )
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/index.docbook b/doc/khelpcenter/releasenotes/r14.0.x/index.docbook
new file mode 100644
index 000000000..c4fb2a617
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/index.docbook
@@ -0,0 +1,72 @@
+<?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 -->
+
+  <!ENTITY r14.0.00 SYSTEM "r14.0.00.docbook">
+  <!ENTITY r14.0.01 SYSTEM "r14.0.01.docbook">
+  <!ENTITY r14.0.02 SYSTEM "r14.0.02.docbook">
+  <!ENTITY r14.0.03 SYSTEM "r14.0.03.docbook">
+  <!ENTITY r14.0.04 SYSTEM "r14.0.04.docbook">
+  <!ENTITY r14.0.05 SYSTEM "r14.0.05.docbook">
+  <!ENTITY r14.0.06 SYSTEM "r14.0.06.docbook">
+  <!ENTITY r14.0.07 SYSTEM "r14.0.07.docbook">
+  <!ENTITY r14.0.08 SYSTEM "r14.0.08.docbook">
+  <!ENTITY r14.0.09 SYSTEM "r14.0.09.docbook">
+  <!ENTITY r14.0.10 SYSTEM "r14.0.10.docbook">
+  <!ENTITY r14.0.11 SYSTEM "r14.0.11.docbook">
+  <!ENTITY r14.0.12 SYSTEM "r14.0.12.docbook">
+  <!ENTITY r14.0.13 SYSTEM "r14.0.13.docbook">
+
+]>
+
+<article id="release-notes-14-0-x" lang="&language;">
+<title>Release Notes for R14.0.x series</title>
+
+<articleinfo>
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>release notes</keyword>
+<keyword>R14.0.x</keyword>
+</keywordset>
+
+</articleinfo>
+
+<!-- empty section to avoid the first docbook to be shown
+     as part of the index page, instead of just a link-->
+<sect1 id="release-notes-r14-0-x-introduction">
+<title></title>
+<para></para>
+</sect1>
+
+&r14.0.13;
+&r14.0.12;
+&r14.0.11;
+&r14.0.10;
+&r14.0.09;
+&r14.0.08;
+&r14.0.07;
+&r14.0.06;
+&r14.0.05;
+&r14.0.04;
+&r14.0.03;
+&r14.0.02;
+&r14.0.01;
+&r14.0.00;
+
+</article>
diff --git a/doc/releasenotes/r14.0.0.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.00.docbook
index 9cd295e1b..9cd295e1b 100644
--- a/doc/releasenotes/r14.0.0.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.00.docbook
diff --git a/doc/releasenotes/r14.0.1.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.01.docbook
index 022fe7fcf..022fe7fcf 100644
--- a/doc/releasenotes/r14.0.1.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.01.docbook
diff --git a/doc/releasenotes/r14.0.2.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.02.docbook
index 84281cf3b..84281cf3b 100644
--- a/doc/releasenotes/r14.0.2.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.02.docbook
diff --git a/doc/releasenotes/r14.0.3.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.03.docbook
index 92f18b3e4..92f18b3e4 100644
--- a/doc/releasenotes/r14.0.3.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.03.docbook
diff --git a/doc/releasenotes/r14.0.4.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.04.docbook
index 971dbc3d1..971dbc3d1 100644
--- a/doc/releasenotes/r14.0.4.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.04.docbook
diff --git a/doc/releasenotes/r14.0.5.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.05.docbook
index 12353c5c2..12353c5c2 100644
--- a/doc/releasenotes/r14.0.5.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.05.docbook
diff --git a/doc/releasenotes/r14.0.6.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.06.docbook
index 2396174b3..2396174b3 100644
--- a/doc/releasenotes/r14.0.6.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.06.docbook
diff --git a/doc/releasenotes/r14.0.7.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.07.docbook
index d902655d0..d902655d0 100644
--- a/doc/releasenotes/r14.0.7.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.07.docbook
diff --git a/doc/releasenotes/r14.0.8.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.08.docbook
index 3d1d7e28d..3d1d7e28d 100644
--- a/doc/releasenotes/r14.0.8.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.08.docbook
diff --git a/doc/releasenotes/r14.0.9.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.09.docbook
index bf2f4924a..91373133d 100644
--- a/doc/releasenotes/r14.0.9.docbook
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.09.docbook
@@ -1,5 +1,5 @@
 <sect1 id="release-notes-r14.0.9">
-<title>R14.0.9 Release Notes (Draft)</title>
+<title>R14.0.9 Release Notes</title>
 
 <para>R14.0.9 is the ninth maintenance release of the R14.0 series,
 and is built on and improves the previous R14.0.8 version.</para>
@@ -17,13 +17,19 @@ release.</para>
 <listitem>
   <para>New applications</para>
   <itemizedlist>
-  <listitem><para>Domino TDE style - a smooth style with a soft look.</para></listitem>
+  <listitem><para>Codeine - a video player with a simple, uncluttered interface.</para></listitem>
   <listitem><para>KEximDB plugin for converting MS Access MDB databases.</para></listitem>
   <listitem><para>KoolDock - a cool application launcher.</para></listitem>
   <listitem><para>KXMLEditor - an editor for XML files.</para></listitem>
+  <listitem><para>Mathemagics - a RPN scientific calculator.</para></listitem>
+  <listitem><para>Qalculate - a small, simple to use, yet powerful calculator.</para></listitem>
   <listitem><para>TastyMenu - an alternative TDE menu.</para></listitem>
+  <listitem><para>TDE style Baghira - Apple's MacOS X's style for TDE.</para></listitem>
+  <listitem><para>TDE style Domino - a smooth style with a soft look.</para></listitem>
+  <listitem><para>TDE style Ia Ora - Mandriva Ia Ora theme for TDE.</para></listitem>
+  <listitem><para>TDEDocker - dock any application to the system tray.</para></listitem>
+  <listitem><para>TDEpacman - a pacman game clone.</para></listitem>
   <listitem><para>Transcode added to dependency repository for Debian-like distros.</para></listitem>
-  <listitem><para></para></listitem>
   </itemizedlist>
 </listitem>
 <listitem>
@@ -34,7 +40,6 @@ release.</para>
   <listitem><para>Autostart TCC module no longer crashes when non-service entries are used.</para></listitem>
   <listitem><para>Fixed Konqueror's kdiff3 preview plugin functionality.</para></listitem>
   <listitem><para>Various fixes related to compiling and linking.</para></listitem>
-  <listitem><para></para></listitem>
   </itemizedlist>
 </listitem>
 <listitem>
@@ -48,13 +53,13 @@ release.</para>
   <listitem><para>Added brightness control in kmilo generic monitor.</para></listitem>
   <listitem><para>Improved support for bluray discs.</para></listitem>
   <listitem><para>Added support for xine 1.2.10.</para></listitem>
-  <listitem><para></para></listitem>
+  <listitem><para>Changed CDDB database from freedb.org (no longer working) to gnudb.org.</para></listitem>
   </itemizedlist>
 </listitem>
 <listitem>
   <para>Security</para>
   <itemizedlist>
-  <listitem><para></para></listitem>
+  <listitem><para>CVE-2020-17507: Fix buffer overflow in XBM parser.</para></listitem>
   </itemizedlist>
 </listitem>
 </itemizedlist>
@@ -64,6 +69,7 @@ release.</para>
   <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/29">TGW issue list.</ulink></para></listitem>
   <listitem><para><ulink url="https://bugs.trinitydesktop.org/showdependencytree.cgi?id=3085&amp;hide_resolved=0">Bugzilla bug list.</ulink></para></listitem>
   <listitem><para><ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.0.9">Detailed commit change log.</ulink></para></listitem>
+  <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.0.9">Full release notes on TDE wiki.</ulink></para></listitem>
 </itemizedlist>
 </sect2>
 
@@ -94,7 +100,6 @@ potential problems.</para>
   </listitem>
 </itemizedlist>
 </para>
-
 </sect3>
 
 <sect3 id="release-notes-r14.0.9-hints-knotes-global-shortcuts">
@@ -119,7 +124,14 @@ and then assign the following key combinations.
   </listitem>
 </itemizedlist>
 </para>
+</sect3>
 
+<sect3 id="release-notes-r14.0.9-hints-arch-support">
+<title>Restriction of supported distros/architectures</title>
+<para>Starting from this TDE release, apt sources for i386 architecture are no longer provided for Ubuntu 20.04 onwards.</para>
+<para>If you have a multi-arch system that includes i386 as well, you need to either remove i386 from the list of known architectures or
+remove that architecture from your apt sources.</para>
+<para>For example, if you have both i386 and amd64, you need to add [arch=amd64] in your apt sources.list file to make sure i386 is not used.</para>
 </sect3>
 
 </sect2>
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/r14.0.10.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.10.docbook
new file mode 100644
index 000000000..a075dcbe7
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.10.docbook
@@ -0,0 +1,71 @@
+<sect1 id="release-notes-r14.0.10">
+<title>R14.0.10 Release Notes</title>
+
+<para>R14.0.10 is the tenth maintenance release of the R14.0 series,
+and is built on and improves the previous R14.0.9 version.</para>
+<para>Maintenance releases are intended to promptly bring bug fixes
+to users, while preserving overall stability through the avoidance
+of both major API or feature changes and major codebase re-factoring.</para>
+
+<sect2 id="release-notes-r14.0.10-notes">
+<title>Important fixes</title>
+
+<para>This section highlights some of the most important changes introduced by this
+release.</para>
+
+<itemizedlist>
+<listitem>
+  <para>New applications</para>
+  <itemizedlist>
+  <listitem><para>KlamAV - an anti-virus front end for ClamAV</para></listitem>
+  <listitem><para>Komposé - provides a fullscreen view of all your tasks and/or virtual desktops</para></listitem>
+  <listitem><para>TDEFifteen game - a simple Fifteen game</para></listitem>
+  <listitem><para>pinentry-tqt - TQt-based PIN or pass-phrase entry dialog for GnuPG (build from official upstream)</para></listitem>
+  </itemizedlist>
+</listitem>
+<listitem>
+  <para>Enhancements</para>
+  <itemizedlist>
+  <listitem><para>Added option to display cover page in KPDF when using two page display</para></listitem>
+  <listitem><para>Major enhancements to the on screen virtual keyboard (kvkbd)</para></listitem>
+  <listitem><para>Added adjustable icon spacing functionality in KDesktop</para></listitem>
+  <listitem><para>1%-step display brightness fine tuning is now possible, if supported by the monitor</para></listitem>
+  <listitem><para>Improved unicode support in TQt3</para></listitem>
+  <listitem><para>Add support for RISC-V 32bit and 64bit</para></listitem>
+  <listitem><para>Improved support for kweather stations</para></listitem>
+  <listitem><para>Added additional foreigner screensaver desktop files</para></listitem>
+  <listitem><para>Translation updates (thanks to all translators)</para></listitem>
+  <listitem><para>Several packages have been migrated to CMake build system</para></listitem>
+  <listitem><para>Dropped automake build system for various packages</para></listitem>
+  <listitem><para>Continued overall look polishing</para></listitem>
+  <listitem><para>DEB: initial work on reproducible builds</para></listitem>
+  <listitem><para>DEB: added support for Ubuntu 21.04 (Hirsute)</para></listitem>
+  <listitem><para>RPM: added support for Mageia 8 and Fedora 13</para></listitem>
+  <listitem><para>BSD: added support for FreeBSD 13</para></listitem>
+  </itemizedlist>
+</listitem>
+<listitem>
+  <para>Bug fixes</para>
+  <itemizedlist>
+  <listitem><para>Fixed Konqueror random crash on cut-n-paste</para></listitem>
+  <listitem><para>Fixed handling of files containing # in their name</para></listitem>
+  <listitem><para>Fixed visualization of icons for executable files with libmagick >= 5.33</para></listitem>
+  <listitem><para>Fixed warning message spew on dbus access denial</para></listitem>
+  <listitem><para>Fixed TDevelop crash on bash files</para></listitem>
+  <listitem><para>Fixed detection of mountable optical disks with incomplete partition table</para></listitem>
+  <listitem><para>KSplash theme information is now displayed in the TDE Control Center</para></listitem>
+  <listitem><para>DEB trinity-keyring no longer depends on gnupg package</para></listitem>
+  </itemizedlist>
+</listitem>
+</itemizedlist>
+
+<para>The full list of changes is available at these links:</para>
+<itemizedlist>
+  <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/36">TGW issue list</ulink></para></listitem>
+  <listitem><para><ulink url="https://bugs.trinitydesktop.org/showdependencytree.cgi?id=3161&amp;hide_resolved=0">Bugzilla bug list</ulink></para></listitem>
+  <listitem><para><ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.0.10">Detailed commit change log</ulink></para></listitem>
+  <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.0.10">Full release notes on TDE wiki</ulink></para></listitem>
+</itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/r14.0.11.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.11.docbook
new file mode 100644
index 000000000..da6a62cdc
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.11.docbook
@@ -0,0 +1,105 @@
+<sect1 id="release-notes-r14.0.11">
+<title>R14.0.11 Release Notes</title>
+
+<para>R14.0.11 is the eleventh maintenance release of the R14.0 series,
+and is built on and improves the previous maintenance versions.</para>
+<para>Maintenance releases are intended to promptly bring bug fixes and new
+features to users, while preserving overall stability through the avoidance
+of both major API or feature changes and major codebase re-factoring.
+</para>
+
+<sect2 id="release-notes-r14.0.11-notes">
+<title>Important fixes</title>
+
+<para>This section highlights some of the most important changes introduced by this
+release.</para>
+
+<itemizedlist>
+<listitem>
+  <para>New applications</para>
+  <itemizedlist>
+    <listitem><para>Twin style SUSE2 - Twin decoration theme from SUSE 9.3/10.0/10.1.</para></listitem>
+    <listitem><para>Twin style DeKorator - a pixmap-based theme engine and styles for Twin.</para></listitem>
+    <listitem><para>TDEAsciiquarium - an ASCII art aquarium screensaver.</para></listitem>
+    <listitem><para>tdeio-gopher - tdeio slave for gopher protocol.</para></listitem>
+    <listitem><para>tdesshaskpass - a TDE version of ssh-askpass with TDEWallet support.</para></listitem>
+  </itemizedlist>
+</listitem>
+
+<listitem>
+  <para>Enhancements</para>
+  <itemizedlist>
+    <listitem><para>Added support for variable font DPI (range 64-512) in user session. This helps usability on high resolution screens.</para></listitem>
+    <listitem><para>Updated Akode's FFmpeg decoder to FFmpeg 4.x API.</para></listitem>
+    <listitem><para>Revamped Konqueror's KWeather sidebar look and functionality.</para></listitem>
+    <listitem><para>Extended KXkb's flags and label setup options.</para></listitem>
+    <listitem><para>Added "reverse wheel direction" checkbox to TCC --> Window Behavior --> Titlebar/Window actions, to allow to customize the direction of the wheel event selected.</para></listitem>
+    <listitem><para>Keyboard shortcuts for classic TDE Menu search function is now customizable.</para></listitem>
+    <listitem><para>KNemo now uses the "sys" backend by default and is usable again.</para></listitem>
+    <listitem><para>Translation updates (thanks to all translators).</para></listitem>
+    <listitem><para>Several packages have been migrated to CMake build system.</para></listitem>
+    <listitem><para>Dropped automake build system for various packages.</para></listitem>
+    <listitem><para>Continued overall look polishing.</para></listitem>
+  </itemizedlist>
+</listitem>
+
+<listitem>
+  <para>Bug fixes</para>
+  <itemizedlist>
+    <listitem><para>Fixed building of several packages without tdehw lib.</para></listitem>
+    <listitem><para>Fixed hanging of programs caused by non conforming SVG files.</para></listitem>
+    <listitem><para>Fixed video (V4L2) support in Kopete, camera can now be used.</para></listitem>
+    <listitem><para>Fixed detection of modern gdb in KDbg.</para></listitem>
+    <listitem><para>Fixed "Print to PDF" for GhostScript >= 9.51.</para></listitem>
+    <listitem><para>Fixed OpenDesktop support in TDE Get New Stuff.</para></listitem>
+    <listitem><para>Fixed building tdesdk with glibc >= 2.34.</para></listitem>
+    <listitem><para>Added support for poppler 21.08.0.</para></listitem>
+    <listitem><para>Fixed k3b SEGV caused by AAC processing of specific files.</para></listitem>
+    <listitem><para>Added new IRC network Libera.chat.</para></listitem>
+  </itemizedlist>
+</listitem>
+
+<listitem>
+  <para>Security</para>
+  <itemizedlist>
+    <listitem><para>KOrganizer no longer displays reminders on top of a locked screen (which could have revealed personal information).</para></listitem>
+  </itemizedlist>
+</listitem>
+
+<listitem>
+  <para>Renamings</para>
+  <itemizedlist>
+    <listitem><para>kbookreader: installation files have been renamed from "bookreader" to "kbookreader".</para></listitem>
+    <listitem><para>mplayerthumbs: installation files have been renamed from "mplayerthumbs" to "mplayer-thumbnailer".</para></listitem>
+  </itemizedlist>
+</listitem>
+
+<listitem>
+  <para>Distro support</para>
+  <itemizedlist>
+    <listitem><para>Added Fedora 34 and 35.</para></listitem>
+    <listitem><para>Dropped Debian Wheezy, Raspbian Jessie, Ubuntu Disco and Eoan.</para></listitem>
+    <listitem><para>Added Debian Bullseye, Ubuntu Impish.</para></listitem>
+    <listitem><para>Added Arch.</para></listitem>
+  </itemizedlist>
+</listitem>
+</itemizedlist>
+
+<para>The full list of changes is available at these links:</para>
+<itemizedlist>
+  <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/50">TGW issue list</ulink></para></listitem>
+  <listitem><para><ulink url="https://bugs.trinitydesktop.org/showdependencytree.cgi?id=3180&amp;hide_resolved=0">Bugzilla bug list</ulink></para></listitem>
+  <listitem><para><ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.0.11">Detailed commit change log</ulink></para></listitem>
+  <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.0.11">Full release notes on TDE wiki</ulink></para></listitem>
+</itemizedlist>
+
+<para>Additional info for developers/packagers</para>
+<itemizedlist>
+  <listitem><para>The CMake module was moved to a standalone package (cmake-trinity) and is no longer a submodule. The stand alone package is now used as a build dependency.</para></listitem>
+  <listitem><para>The "applications" folder has been rearranged in sub categories.</para></listitem>
+  <listitem><para>tqca-tls is now part of the tqca package.</para></listitem>
+  <listitem><para>Deb-like distros: switched build to ninja by default.</para></listitem>
+</itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/r14.0.12.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.12.docbook
new file mode 100644
index 000000000..69ec96ad5
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.12.docbook
@@ -0,0 +1,87 @@
+<sect1 id="release-notes-r14.0.12">
+<title>R14.0.12 Release Notes</title>
+
+<para>R14.0.12 is the twelfth maintenance release of the R14.0 series,
+and is built on and improves the previous maintenance versions.</para>
+<para>Maintenance releases are intended to promptly bring bug fixes and new
+features to users, while preserving overall stability through the avoidance
+of both major API or feature changes and major codebase re-factoring.
+</para>
+
+<sect2 id="release-notes-r14.0.12-notes">
+<title>Important fixes</title>
+
+<para>This section highlights some of the most important changes introduced by this
+release.</para>
+
+<itemizedlist>
+<listitem>
+  <para>New applications</para>
+  <itemizedlist>
+    <listitem><para>Polkit-agent-tde - a D-Bus service that provides a TDE based polkit authentication agent</para></listitem>
+    <listitem><para>Polkit-tqt - a library that lets developers use the PolicyKit API through a nice TQt-styled interface</para></listitem>
+    <listitem><para>tdemarkdown part - an embeddable lightweight markdown document viewer</para></listitem>
+  </itemizedlist>
+</listitem>
+
+<listitem>
+  <para>Enhancements</para>
+  <itemizedlist>
+    <listitem><para>Some improvements on Konsole terminal emulation</para></listitem>
+    <listitem><para>Quanta: improved support for complex characters/dead keys in VPL editor</para></listitem>
+    <listitem><para>KSSL: added Let's Encrypt certificates support</para></listitem>
+    <listitem><para>Kxkb: systray label can now have a transparent background</para></listitem>
+    <listitem><para>Konsole: added real transparency checkbox option</para></listitem>
+    <listitem><para>Quanta: added support for HTML 5</para></listitem>
+    <listitem><para>Sip4-tqt: initial support for python 3</para></listitem>
+    <listitem><para>Tdebase: added dispwin (Argyll) support to set the ICC profile</para></listitem>
+    <listitem><para>Translation updates (thanks to all translators)</para></listitem>
+    <listitem><para>Several packages have been migrated to CMake build system</para></listitem>
+    <listitem><para>Dropped automake build system for various packages</para></listitem>
+    <listitem><para>Continued overall look polishing</para></listitem>
+  </itemizedlist>
+</listitem>
+
+<listitem>
+  <para>Bug fixes</para>
+  <itemizedlist>
+    <listitem><para>Fixed timeout on dbus' service startup response on first call</para></listitem>
+    <listitem><para>Fixed hanging of system on shutdown caused by conflicts between tdm and plymouth</para></listitem>
+    <listitem><para>Added support for Poppler >= 21.11</para></listitem>
+    <listitem><para>TCC: make sure correct encoding is used for editing bashrc (affects gtk-qt-engine)</para></listitem>
+    <listitem><para>Fixed issue with ICEAuthority ownership stealing when programs were run using tdesu in a user session</para></listitem>
+    <listitem><para>KMail: redirecting messages now uses the default account</para></listitem>
+    <listitem><para>Amarok: fixed default scoring script error caused by using a feature deprecated in latest Ruby version</para></listitem>
+    <listitem><para>Kaffeine: fixed detection of libdvdcss</para></listitem>
+    <listitem><para>Kexi: added support for postgresql 12 and later</para></listitem>
+  </itemizedlist>
+</listitem>
+
+<listitem>
+  <para>Distro support</para>
+  <itemizedlist>
+    <listitem><para>Gentoo: several improvements and addition to supported ebuilds</para></listitem>
+    <listitem><para>Debian: dropped Jessie</para></listitem>
+    <listitem><para>Ubuntu: dropped Trusty (14.04), added Jammy (22.04).</para></listitem>
+  </itemizedlist>
+</listitem>
+</itemizedlist>
+
+<para>The full list of changes is available at these links:</para>
+<itemizedlist>
+  <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/65">TGW issue list</ulink></para></listitem>
+  <listitem><para><ulink url="https://bugs.trinitydesktop.org/showdependencytree.cgi?id=3189&amp;hide_resolved=0">Bugzilla bug list</ulink></para></listitem>
+  <listitem><para><ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.0.12">Detailed commit change log</ulink></para></listitem>
+  <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.0.12">Full release notes on TDE wiki</ulink></para></listitem>
+</itemizedlist>
+
+<para>Additional info for developers/packagers</para>
+<itemizedlist>
+    <listitem><para>Minimum required version of CMake raised to 3.1</para></listitem>
+    <listitem><para>c++11 features are now allowed in the code base</para></listitem>
+    <listitem><para>cmake-trinity: added TQT_CMAKE_DIR variable, for installing and importing exported CMake targets for TQt dependent libraries</para></listitem>
+    <listitem><para>cmake-trinity: added ability to specify necessary CXX features</para></listitem>
+</itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.0.x/r14.0.13.docbook b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.13.docbook
new file mode 100644
index 000000000..5f3c2a9ed
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.0.x/r14.0.13.docbook
@@ -0,0 +1,127 @@
+<sect1 id="release-notes-r14.0.13">
+<title>R14.0.13 Release Notes</title>
+
+<para>R14.0.13 is the thirteenth maintenance release of the R14.0 series,
+and is built on and improves the previous maintenance versions.</para>
+<para>Maintenance releases are intended to promptly bring bug fixes and new
+features to users, while preserving overall stability through the avoidance
+of both major API or feature changes and major codebase re-factoring. </para>
+<para>Below is a summary of some of the most important changes introduced by
+this release.</para>
+
+
+<sect2 id="release-notes-r14.0.13-new-applications">
+<title>New applications</title>
+<itemizedlist>
+  <listitem><para>tdeio-appinfo: a TDEIO slave (appinfo:/) that combines an application's configuration, data, manual and temp files and folders into a single view (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeio-appinfo">TDE/tdeio-appinfo</ulink>)</para></listitem>
+  <listitem><para>twin-style-machbunt: a KDE window decoration theme from SuSE 9.1/9.2 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/twin-style-machbunt">TDE/twin-style-machbunt</ulink>)</para></listitem>
+</itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-enhancements">
+<title>Enhancements</title>
+  <itemizedlist>
+    <listitem><para>Ctrl + mouse wheel can now be used to increase/decrease the font size in the following applications:</para>
+      <itemizedlist>
+        <listitem><para>Konsole (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/297">TDE/tdebase#297</ulink>)</para></listitem>
+        <listitem><para>Kate, KWrite, TDevelop and other applications using the Kate part editor (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/180">TDE/tdelibs#180</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem><para>Kate: added syntax highlighting for Markdown files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/170">TDE/tdelibs#170</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/174">TDE/tdelibs#174</ulink>)</para></listitem>
+    <listitem><para>Improved user experience when setting a wallpaper (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/280">TDE/tdebase#280</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/285">TDE/tdebase#285</ulink>)</para></listitem>
+    <listitem><para>Offer all available options to set an image as background from Konqueror's action menu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/281">TDE/tdebase#281</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/285">TDE/tdebase#285</ulink>)</para></listitem>
+    <listitem><para>Taskbar: <interface>Move Task</interface> and drag-n-drop are now available also for grouped task buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/295">TDE/tdebase#295</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/98">TDE/tde#98</ulink>)</para></listitem>
+    <listitem><para>Improvements to khotkeys <interface>Input Actions</interface>:</para>
+      <itemizedlist>
+        <listitem><para>New <interface>move up</interface>/<interface>move down</interface> buttons (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/5e4ca4df9bb34e10a897e32e7e0ca8645b97f293">commit 5e4ca4df</ulink>)</para></listitem>
+        <listitem><para>Fixes to GUI for creating/editing actions (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/0c22a14875913dc185e029d0078a8d15c9ffe102">commit 0c22a148</ulink>)</para></listitem>
+        <listitem><para>New `waiting` action component to introduce a delay between steps (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/267">TDE/tdebase#267</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem><para>New SFTP tdeioslave based on libssh (KDE backport) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/279">TDE/tdebase#279</ulink>)</para></listitem>
+    <listitem><para>Added support for ffmpeg 5.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/9">TDE/akode#9</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/akode/pulls/10">TDE/akode#10</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/14">TDE/k3b#14</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/16">TDE/k3b#16</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/5">TDE/k9copy#5</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/6">TDE/k9copy#6</ulink>)</para></listitem>
+    <listitem><para>Added support for Jasper 3.x (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/162">TDE/tdelibs#162</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/digikam/pulls/5">TDE/digikam#5</ulink>)</para></listitem>
+    <listitem><para>Added support for Poppler >= 22.04 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegraphics/pulls/45">TDE/tdegraphics#45</ulink>)</para></listitem>
+    <listitem><para>Improvements to Python3 Support (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/7">TDE/sip4-tqt#7</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/8">TDE/sip4-tqt#8</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/python-tqt/pulls/7">TDE/python-tqt#7</ulink>)</para></listitem>
+    <listitem><para>Added man pages for several TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/abakus/pulls/6">TDE/abakus#6</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/amarok/pulls/34">TDE/amarok#34</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/arts/pulls/8">TDE/arts#8</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k3b/pulls/18">TDE/k3b#18</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k9copy/pulls/7">TDE/k9copy#7</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/kile/pulls/3">TDE/kile#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice/pulls/28">TDE/koffice#28</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/krecipes/pulls/1">TDE/krecipes#1</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/ktorrent/pulls/4">TDE/ktorrent#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/libksquirrel/pulls/3">TDE/libksquirrel#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/rosegarden/pulls/4">TDE/rosegarden#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tellico/pulls/4">TDE/tellico#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeaddons/pulls/13">TDE/tdeaddons#13</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeartwork/pulls/21">TDE/tdeartwork#21</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/275">TDE/tdebase#275</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebindings/pulls/11">TDE/tdebindings#11</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegraphics/pulls/47">TDE/tdegraphics#47</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdemultimedia/pulls/36">TDE/tdemultimedia#36</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdenetwork/pulls/45">TDE/tdenetwork#45</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdesdk/pulls/13">TDE/tdesdk#13</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeutils/pulls/41">TDE/tdeutils#41</ulink>)</para></listitem>
+    <listitem><para>Improved API visualization (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/167">TDE/tdelibs#167</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/169">TDE/tdelibs#169</ulink>)</para></listitem>
+    <listitem><para>Use gender-neutral language (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/286">TDE/tdebase#286</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/69">TDE/tdepim#69</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdemultimedia/pulls/37">TDE/tdemultimedia#37</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdegames/pulls/16">TDE/tdegames#16</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+<sect2 id="release-notes-r14.0.13-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>Fixed opening of media:/ and system:/media/ URLs from non-TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/157">TDE/tdelibs#157</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/issues/224">TDE/tdebase#224</ulink>)</para></listitem>
+    <listitem><para>Fixed compatibility with openSSL 3.0 API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/175">TDE/tdelibs#175</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/177">TDE/tdelibs#177</ulink>)</para></listitem>
+    <listitem><para>Fixed display of TQMap/TQValueList in dcopclient (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/168">TDE/tdelibs#168</ulink>)</para></listitem>
+    <listitem><para>tdebindings: fixed FTBFS when tdehw is not present (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebindings/pulls/10">TDE/tdebindings#10</ulink>)</para></listitem>
+    <listitem><para>tqt3: fixed rendering of listviews with SGI widget style (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tqt3/pulls/64">TDE/tqt3#64</ulink>)</para></listitem>
+    <listitem><para>Fixed various FTBFS when building with clang</para></listitem>
+    <listitem><para>Fixed font styles detection in TDE font dialogs (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdelibs/pulls/164">TDE/tdelibs#164</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice/pulls/24">TDE/koffice#24</ulink>)</para></listitem>
+    <listitem><para>tdeio-man: fixed visualization of man pages for TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/274">TDE/tdebase#274</ulink>)</para></listitem>
+    <listitem><para>basket: fixed SEGV crash when moving new empty notes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/basket/pulls/12">TDE/basket#12</ulink>)</para></listitem>
+    <listitem><para>kgtk-qt3: added support for gtk2 with glibc 2.34 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/kgtk-qt3/pulls/4">TDE/kgtk-qt3#4</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-security">
+<title>Security</title>
+  <itemizedlist>
+    <listitem><para>FISH protocol: security fix for CVE-2020-12755 (backport from KDE) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdebase/pulls/282">TDE/tdebase#282</ulink>)</para></listitem>
+    <listitem><para>KMail: fixed vulnerability to EFAIL (backport from KDE) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/22">TDE/tdepim#22</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepim/pulls/70">TDE/tdepim#70</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>Gentoo: several improvements and addition to supported ebuilds</para></listitem>
+    <listitem><para>Ubuntu: dropped Groovy (20.10), added Kinetic (22.10)</para></listitem>
+    <listitem><para>Fedora: added support for <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/f36">v36</ulink> and <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/f37">37</ulink></para></listitem>
+    <listitem><para>Arch: added builds for arm64 and armhf</para></listitem>
+    <listitem><para>OpenSuSE: added support for <ulink url="http://mirror.ppa.trinitydesktop.org/trinity/rpm/opensuse15.4">15.4</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.0.13">Full release notes on TDE wiki</ulink></para></listitem>
+    <listitem><para><ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/82">TGW issue list</ulink></para></listitem>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.0.13">Detailed commit change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.0.13-developers-info">
+<title>Additional info for developers/packagers</title>
+  <itemizedlist>
+    <listitem><para>Module version is now automatically added to tarball and detected by cmake at build time (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/scripts/pulls/4">TDE/scripts#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tde-common-cmake/pulls/84">TDE/tde-common-cmake#84</ulink>)</para></listitem>
+    <listitem><para>CMake Trinity's macros can now be used with pure TQt applications which require parsing of .ui files (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tde-common-cmake/pulls/85">TDE/tde-common-cmake#85</ulink>)</para></listitem>
+    <listitem><para>Modules converted to cmake:</para>
+      <itemizedlist>
+        <listitem><para>gtk3-tqt-engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/gtk3-tqt-engine/pulls/2">TDE/gtk3-tqt-engine#2</ulink>)</para></listitem>
+        <listitem><para>tderadio (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tderadio/pulls/4">TDE/tderadio#4</ulink>)</para></listitem>
+        <listitem><para>koffice-i18n (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/koffice-i18n/pulls/1">TDE/koffice-i18n#1</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+    <listitem><para>Dropped autotools support for the following modules:</para>
+      <itemizedlist>
+        <listitem><para>rosegarden (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/rosegarden/pulls/5">TDE/rosegarden#5</ulink>)</para></listitem>
+        <listitem><para>tdeio-locate (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdeio-locate/pulls/2">TDE/tdeio-locate#2</ulink>)</para></listitem>
+        <listitem><para>k3b (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/k3b/pulls/19">TDE/k3b#19</ulink>)</para></listitem>
+        <listitem><para>tdepowersave (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tdepowersave/pulls/10">TDE/tdepowersave#10</ulink>)</para></listitem>
+        <listitem><para>tastymenu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/tastymenu/pulls/3">TDE/tastymenu#3</ulink>)</para></listitem>
+        <listitem><para>gtk-qt-engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/tde/gtk-qt-engine/pulls/9">TDE/gtk-qt-engine#9</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
+
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/CMakeLists.txt b/doc/khelpcenter/releasenotes/r14.1.x/CMakeLists.txt
new file mode 100644
index 000000000..124c38743
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION khelpcenter/releasenotes/r14.1.x )
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/index.docbook b/doc/khelpcenter/releasenotes/r14.1.x/index.docbook
new file mode 100644
index 000000000..4f03b6ead
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/index.docbook
@@ -0,0 +1,49 @@
+<?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 -->
+
+  <!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">
+]>
+
+<article id="release-notes-14-1-x" lang="&language;">
+<title>Release Notes for R14.1.x series</title>
+
+<articleinfo>
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>release notes</keyword>
+<keyword>R14.1.x</keyword>
+</keywordset>
+
+</articleinfo>
+
+<!-- empty section to avoid the first docbook to be shown
+     as part of the index page, instead of just a link-->
+<sect1 id="release-notes-r14-1-x-introduction">
+<title></title>
+<para></para>
+</sect1>
+
+&r14.1.02;
+&r14.1.01;
+&r14.1.00;
+
+</article>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.00.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.00.docbook
new file mode 100644
index 000000000..057131b3d
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.00.docbook
@@ -0,0 +1,194 @@
+<sect1 id="release-notes-r14.1.0">
+<title>R14.1.0 Release Notes</title>
+
+<para>This document tracks some of the most important changes introduced in release R14.1.0, which marks the switch from the old R14.0.x to the new R14.1.x series and therefore
+comes with a bigger list of changes.</para><para>Several items in this list refer to a multitude of commits, so direct link to them has not been provided to avoid cluttering the overall page. Please refer to the detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.0">change log</ulink> for further information.</para>
+<para>Additionally, the <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.0">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para>
+
+<sect2 id="release-notes-r14.1.0-new-applications">
+<title>New applications</title>
+  <itemizedlist>
+    <listitem><para>tdebluez: provides modern Bluetooth functionality (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebluez">TDE/tdebluez</ulink>)</para></listitem>
+    <listitem><para>kplayer: multimedia player with mplayer backend (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kplayer">TDE/kplayer</ulink>)</para></listitem>
+    <listitem><para>tdehwdevicetray: provides an easy access to storage devices and their operations</para></listitem>
+    <listitem><para>ksplash: added new Moodin-based theme "Architecture" (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2553">bug 2553</ulink>)</para></listitem>
+    <listitem><para>icewm-based Helix theme (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/2">TDE/artwork#2</ulink>)</para></listitem>
+    <listitem><para>icewm-based Brise theme (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/6">TDE/artwork#6</ulink>) (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2833">bug 2833</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-new-functionalities">
+<title>New functionalities</title>
+  <itemizedlist>
+    <listitem><para>Added support for Python 3 throughout TDE</para></listitem>
+    <listitem><para>Added support for LUKS disks. Common LUKS operations can now be handled via GUI, tdeio_media_mounthelper and DCOP calls</para></listitem>
+    <listitem><para>Added support for PKI (X.509, PKCS, cryptographic card devices) as part of tdehw library and libtdeldap</para></listitem>
+    <listitem><para>New notification interface for storage device plug/unplugged events (through tdehwdevicetray)</para></listitem>
+    <listitem><para>Expanded DCOP interface for mediamanager with several new fuctions available, which allow finer control over storage device operations</para></listitem>
+		<listitem><para>Added support for hybrid suspend (aka suspend to RAM + suspend to disk)</para></listitem>
+    <listitem><para>Ark: added support for lzip/tar-lzma files</para></listitem>
+    <listitem><para>tdelibs: added passive notification panel (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/9cca7662">9cca7662</ulink>)</para></listitem>
+    <listitem><para>Added MIT license to the set of distributed licenses and new application to show TDE license information (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/197">TDE/tdelibs#197</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/318">TDE/tdebase#318</ulink>)</para></listitem>
+    <listitem><para>New "session panel" in Kate to ease managing multiple sessions and switching among them. Note: the format for save session files has changed, but existing session will transparently be imported and updated to the newer format </para></listitem>
+    <listitem><para>konqueror: added "double-click moves to parent folder" feature (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/3aa5fc08">3aa5fc08</ulink>)</para></listitem>
+    <listitem><para>konqueror: new sorting/grouping actions for listviews</para></listitem>
+    <listitem><para>konqueror: added support for locale based file sorting</para></listitem>
+    <listitem><para>New TCC configuration module for Trash and additional options to control the trash size policy</para></listitem>
+    <listitem><para>KSSLCertificate: added CRL handling support</para></listitem>
+    <listitem><para>tdemultimedia/tdeutils: added initial basic support for PulseAudio</para></listitem>
+    <listitem><para>tdefilereplace: several new options and functions added (sorting results, max depth, save/restore search results and search strings)</para></listitem>
+    <listitem><para>krusader: added support for xz archives</para></listitem>
+    <listitem><para>kweather: added support for XDG icon names, revamped configuration dialog, add support for system icon theme  </para></listitem>
+    <listitem><para>ksnapshot: added option to view/edit the image in KolourPaint or in another application (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/50">TDE/tdegraphics#50</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-enhancements">
+<title>Enhancements</title>
+  <itemizedlist>
+    <listitem><para>Major rework of storage media handling code, providing improved support for LUKS disks, udisks2 and udevil and a consistent interface across TDE. </para></listitem>
+    <listitem><para>Enhanced taskbar setting GUI (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/266">TDE/tdebase#266</ulink>)</para></listitem>
+    <listitem><para>kate: added option to suppress 'Find in files' error dialog (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=1911">bug 1911</ulink>)</para></listitem>
+    <listitem><para>Added 'Delete Line' menu entry in Kate, KWrite and TDevelop (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=1907">bug 1907</ulink>)</para></listitem>
+    <listitem><para>Major enhancement of performances under specific heavy load tasks (for example Konqueror scanning huge folder structures) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/309">TDE/tdebase#309</ulink>)</para></listitem>
+    <listitem><para>kxkb: improved configuration dialog which simplifies setting keyboard shortcuts for layout switching (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/304">TDE/tdebase#304</ulink>)</para></listitem>
+    <listitem><para>dbus-1-tqt: vast improvements to dbusxml2qt3 tool and to the contents and usage of the generated code (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dbus-1-tqt/pulls">dbus-1-tqt PRs</ulink>)</para></listitem>
+    <listitem><para>dbus-1-tqt: added generation of api documentation based on doxygen (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dbus-1-tqt/pulls/10">TDE/dbus-1-tqt#10</ulink>)</para></listitem>
+    <listitem><para>kdcop: added double click functionality to expand/collapse non leaf items (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2503">bug 2503</ulink>)</para></listitem>
+    <listitem><para>tqt3: new TQStringVariantMap type and iterators (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/d795939c">d795939c</ulink>)</para></listitem>
+    <listitem><para>tqt3: added "operator[]" to TQPtrList (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/6b220f98">6b220f98</ulink>)</para></listitem>
+    <listitem><para>Extended KEditListBox's API with new signals (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/88413aaa">88413aaa</ulink> - commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/fa49e53">fa49e53a</ulink>)</para></listitem>
+    <listitem><para>konsole: added support for mouse wheel events in the alternate screen, i.e. in applications such as vim, less, ... (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2597">bug 2597</ulink>)</para></listitem>
+    <listitem><para>ksnapshot: remember window position before/after a snapshot is taken (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/55">TDE/tdegraphics#55</ulink>)</para></listitem>
+    <listitem><para>ksmserver: added 'startupCompleted()' DCOP method to check when session restoration/creation has finished (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/b45b9ed9">b45b9ed9</ulink>)</para></listitem>
+    <listitem><para>dolphin: fixed navigation through jar, txz and lzma archives (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/issues/4">TDE/dolphin#4</ulink>)</para></listitem>
+    <listitem><para>knights: added additional theme pack (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2663">bug 2663</ulink>)</para></listitem>
+    <listitem><para>tdenetwork: use standalone libvncserver for krfb and libvncclient for krdc</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>filelight: fixed SEGV caused by dereferencing null pointer (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/filelight/issues/3">TDE/filelight#3</ulink>)</para></listitem>
+    <listitem><para>gtk-tqt-engine: fixed crash when SESSION_MANAGER environment variable is not set (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gtk-qt-engine/commit/959798f45">959798f45</ulink>)</para></listitem>
+    <listitem><para>yakuake: fixed support for dcop calls with multiple terminals (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=2537">bug 2537</ulink>)</para></listitem>
+    <listitem><para>Fixed incorrect handling of certificate dates in viewer module (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/commit/a837e132">a837e132</ulink>)</para></listitem>
+    <listitem><para>tdefile: autocalculate folder size in KPropertiesDialog only for real local items (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/190">TDE/tdelibs#190</ulink>)</para></listitem>
+    <listitem><para>tdeprint: relaxed page orientation and size selection when an initial setting is already provided (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/194">TDE/tdelibs#194</ulink>)</para></listitem>
+    <listitem><para>Fixed mangling of '@' in KURL's pretty printing (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/issues/71">TDE/tdepim#71</ulink>)</para></listitem>
+    <listitem><para>kalarm: fixed problem with date/time selection for recurrent events (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=304">bug 304</ulink>)</para></listitem>
+    <listitem><para>kalarm: fixed long startup delay when autostarted at login (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=1610">bug 1610</ulink>)</para></listitem>
+    <listitem><para>konqueror: fixed SEGV when the KPropertiesDialog is opened on the root (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/310">TDE/tdebase#310</ulink>)</para></listitem>
+    <listitem><para>kmail: added menu options to toggle "Show Message Structure" (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/25">TDE/tdepim#25</ulink>)</para></listitem>
+    <listitem><para>kpdf: fixed issue with certain fonts not being correctly displayed (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/57">TDE/tdegraphics#57</ulink>)</para></listitem>
+    <listitem><para>tqscintilla: fixed SEGV at runtime caused by invalid platform detection at build time (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqscintilla/pulls/3">TDE/tqscintilla#3</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-renames-and-moves">
+<title>Renames and moves</title>
+  <itemizedlist>
+    <listitem><para>tdefilereplace has been moved from tdewebdev to tdeutils (<ulink url="https://bugs.trinitydesktop.org/show_bug.cgi?id=767">bug 767</ulink>)</para></listitem>
+    <listitem><para>sip4-tqt: python module renamed to sip_tqt (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/2">TDE/sip4-tqt#2</ulink>)</para></listitem>
+    <listitem><para>sip4-tqt: entry step to rename qt* python modules to tqt* (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/sip4-tqt/pulls/10">TDE/sip4-tqt#10</ulink>)</para></listitem>
+    <listitem><para>pytqt: repository renamed from python-tqt to pytqt (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt">TDE/pytqt</ulink>)</para></listitem>
+    <listitem><para>pytqt: rename qt* python modules to tqt* (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt/pulls/13">TDE/pytqt#13</ulink>)</para></listitem>
+    <listitem><para>pytqt: renamed QScintilla to TQScintilla (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt/pulls/5">TDE/pytqt#5</ulink>)</para></listitem>
+    <listitem><para>pytqt: renamed python extension module from python_tqt to PyTQt (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytqt/pulls/12">TDE/pytqt#12</ulink>)</para></listitem>
+    <listitem><para>python-trinity repository renamed to pytde (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/pytde">TDE/pytde</ulink>)</para></listitem>
+    <listitem><para>tde-common-cmake moved from common to dependencies and renamed to tde-cmake (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-cmake">TDE/tde-cmake</ulink>)</para></listitem>
+    <listitem><para>tqt3: several QT_* macros have been renamed into TQT_* equivalents.</para></listitem>
+    <listitem><para>tqt3: IconView widget moved to src/widgets folder (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/a41a0349">a41a0349</ulink>)</para></listitem>
+    <listitem><para>tqt3: removed dummy "int" parameter from "TQVariant(bool, int)" (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/cfc76de7">cfc76de7</ulink>)</para></listitem>
+    <listitem><para>tqt3: renamed tqt-kde integration to tqt-tde (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/commit/a410cb03">a410cb03</ulink>)</para></listitem>
+    <listitem><para>tdelibs: tdehw lib is now built as a standalone library</para></listitem>
+    <listitem><para>tdeaddons: removed mediarealfolder konqueror plugin, which has been integrated into tdebase's media tdeioslave (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaddons/commit/025f091b">025f091b</ulink>)</para></listitem>
+    <listitem><para>renamed "Suspend to disk" to "Hibernate" and "Suspend to RAM" to "Suspend"</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-removed-applications">
+<title>Removed applications, code repositories or features</title>
+  <itemizedlist>
+    <listitem><para>Removed support for Python 2 throughout TDE</para></listitem>
+    <listitem><para>Removed any pending support for HAL</para></listitem>
+    <listitem><para>Removed the following modules: adept, libraries/mlt, libraries/mlt++, kpowersave, knetworkmanager8, tde-construct</para></listitem>
+    <listitem><para>Removed support for building using qt3. Now TDE only uses TQt3</para></listitem>
+    <listitem><para>tqt3: removed the following Qt2 classes (TQList/TQListIterator, TQStack, TQVector) and replaced them with TQt3 equivalent ones (TQPtrList/TQPtrListIterator, TQPtrStack, TQPtrVector). Also removed some old Qt1-related code.</para></listitem>
+    <listitem><para>kpdf: drop suport for t1lib (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/issues/39">TDE/tdegraphics#39</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-deprecated-applications">
+<title>Deprecated applications</title>
+  <para>These are no longer built by default and will be removed in R14.2.0</para>
+  <itemizedlist>
+    <listitem><para>tdegraphics: kmrml (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/commit/ff75de8d">ff75de8d</ulink>)</para></listitem>
+    <listitem><para>tdepim: kitchensync (commit <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/commit/43f0ce5">43f0ce5</ulink>)</para></listitem>
+    <listitem><para>tqtinterface: this module is not deprecated but it will be merged with tqt3 in R14.2.0 and no longer required (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqtinterface">TDE/tqtinterface</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>Ubuntu: dropped Hirsute (21.04), added Lunar (23.04)</para></listitem>
+    <listitem><para>Raspbian: dropped raspbian-stretch</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-cmake-conversions">
+<title>CMake conversions and dropped autotools</title>
+  <itemizedlist>
+    <listitem><para>Modules converted to cmake:</para>
+      <itemizedlist>
+        <listitem><para>bibletime (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime/pulls/2">TDE/bibletime#2</ulink>)</para></listitem>
+        <listitem><para>desktop-effects-tde (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/desktop-effects-tde/pulls/3">TDE/desktop-effects-tde#3</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+  <itemizedlist>
+    <listitem><para>Dropped autotools support for the following modules:</para>
+      <itemizedlist>
+        <listitem><para>bibletime (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime/pulls/3">TDE/bibletime#3</ulink>)</para></listitem>
+        <listitem><para>gtk3-tqt-engine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gtk3-tqt-engine/pulls/3">TDE/gtk3-tqt-engine#3</ulink>)</para></listitem>
+				<listitem><para>gwenview-i18n (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview-i18n/pulls/1">TDE/gwenview-i18n#1</ulink>)</para></listitem>
+				<listitem><para>kbfx (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kbfx/pulls/2">TDE/kbfx#2</ulink>)</para></listitem>
+        <listitem><para>kgtk-qt3 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kgtk-qt3/pulls/6">TDE/kgtk-qt3#6</ulink>)</para></listitem>
+				<listitem><para>kmymoney (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmymoney/pulls/4">TDE/kmymoney#4</ulink>)</para></listitem>
+        <listitem><para>koffice-i18n (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice-i18n/pulls/2">TDE/koffice-i18n#2</ulink>) (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice-i18n/pulls/3">TDE/koffice-i18n#3</ulink>)</para></listitem>
+				<listitem><para>konversation (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/konversation/pulls/3">TDE/konversation#3</ulink>)</para></listitem>
+				<listitem><para>kpilot (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot/pulls/7">TDE/kpilot#7</ulink>)</para></listitem>
+        <listitem><para>tderadio (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tderadio/pulls/6">TDE/tderadio#6</ulink>)</para></listitem>
+				<listitem><para>tdesvn (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn/pulls/7">TDE/tdesvn#7</ulink>)</para></listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-updating-from-r14.0.x">
+<title>Updating from R14.0.x</title>
+<para>There will be no more releases in the R14.0.x series, therefore you should consider switching to R14.1.x during the next TDE update. This will require updating the URL from which packages are downloaded and should be a relatively straight forward process.</para>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.0-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.0">Full release notes</ulink> on TDE wiki</para></listitem>
+    <listitem><para>TGW <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/3">issue list</ulink></para></listitem>
+    <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.0">change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.01.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.01.docbook
new file mode 100644
index 000000000..2e3803d32
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.01.docbook
@@ -0,0 +1,111 @@
+<sect1 id="release-notes-r14.1.1">
+<title>R14.1.1 Release Notes</title>
+
+<para>This document tracks some of the most important changes introduced in release R14.1.1, the first maintenance release of the R14.1.x series.</para>
+<para>The <ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.1">full release notes</ulink> on TDE wiki contains screenshots of some of the new features.</para>
+
+<sect2 id="release-notes-r14.1.1-new-applications">
+<title>New applications</title>
+  <itemizedlist>
+    <listitem><para>kommando: a "Neverwinter Nights"-like wheelmenu for TDE (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kommando">TDE/kommando</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-new-functionalities">
+<title>New functionalities and enhancements</title>
+  <itemizedlist>
+    <listitem><para>twin: added support for aerosnap-style window tiling, improved Active Border functionality and add Active Corners (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/331">TDE/tdebase#331</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/365">TDE/tdebase#365</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/371">TDE/tdebase#371</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/375">TDE/tdebase#375</ulink>)</para></listitem>
+    <listitem><para>konqueror: added option to enable/disable using double click to navitage to the parent folder (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/329">TDE/tdebase#329</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/341">TDE/tdebase#341</ulink>)</para></listitem>
+    <listitem><para>konqueror: extended 'double click to move to parent' functionality to iconview modes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/386">TDE/tdebase#386</ulink>)</para></listitem>
+    <listitem><para>kxkb: re-added TDE shortcuts to switch keyboard layout forward or backward (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/342">TDE/tdebase#342</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/352">TDE/tdebase#352</ulink>)</para></listitem>
+    <listitem><para>kkbswitch: added global shortcuts for switching to previous/next group (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kkbswitch/issues/6">TDE/kkbswitch#6</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kkbswitch/pulls/7">TDE/kkbswitch#7</ulink>)</para></listitem>
+    <listitem><para>twin: added 'shade' to the left mouse button click menu for active windows in TCC module (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/337">TDE/tdebase#337</ulink>)</para></listitem>
+    <listitem><para>Offer all available options to set an image as background from Dolphin's action menu (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/issues/17">TDE/dolphin#17</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/pulls/18">TDE/dolphin#18</ulink>)</para></listitem>
+    <listitem><para>added a few new wallpapers (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork/pulls/24">TDE/tdeartwork#24</ulink>)</para></listitem>
+    <listitem><para>added man pages for several TDE applications (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/ksquirrel/pulls/3">TDE/ksquirrel#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall/pulls/3">TDE/kmyfirewall#3</ulink>)</para></listitem>
+    <listitem><para>improved support for SunOS/Illumos/DilOS (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/131">TDE/tde#131</ulink>)</para></listitem>
+    <listitem><para>tdebluez: added API documentation (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebluez/pulls/23">TDE/tdebluez#23</ulink>)</para></listitem>
+    <listitem><para>added link to TDE release notes to khelpcenter home page (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/332">TDE/tdebase#332</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/353">TDE/tdebase#353</ulink>)</para></listitem>
+    <listitem><para>kmix: improved Preferences dialog (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/pulls/35">TDE/tdemultimedia#35</ulink>)</para></listitem>
+    <listitem><para>tdebase: updated currency for European countries that have switched to euro (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/137">TDE/tde#137</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/385">TDE/tdebase#385</ulink>)</para></listitem>
+    <listitem><para>tdepowersave: made brightness percentage control more accurate (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave/pulls/17">TDE/tdepowersave#17</ulink>)</para></listitem>
+    <listitem><para>kmilo: improve brightness OSD feedback by displaying the actual value (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/pulls/55">TDE/tdeutils#55</ulink>)</para></listitem>
+    <listitem><para>amarok: avoid double logarithmic volume scaling when using libxine >= 1.2.13 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia/issues/40">TDE/tdemultimedia#40</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/46">TDE/amarok#46</ulink>)</para></listitem>
+    <listitem><para>add logarithmic volume control to kaffeine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine/pulls/22">TDE/kaffeine#22</ulink>) and codeine (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/9">TDE/codeine#9</ulink>)</para></listitem>
+    <listitem><para>replace three dot ellipsis with equally spaced ellipsis (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/394">TDE/tdebase#394</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-bug-fixes">
+<title>Bug fixes</title>
+  <itemizedlist>
+    <listitem><para>fixed high CPU/slow speed issue observed in some RPM distros with R14.1.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/128">TDE/tde#128</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/pulls/75">TDE/tqt3#75</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/206">TDE/tdelibs#206</ulink>)</para></listitem>
+    <listitem><para>tdepowersave: fixed high CPU/slow speed issue observed in some hardware when autodimm was enabled (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/136">TDE/tde#136</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave/pulls/14">TDE/tdepowersave#14</ulink>)</para></listitem>
+    <listitem><para>arts: fixed crash on TDE startup (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/arts/issues/5">TDE/arts#5</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/arts/pulls/11">TDE/arts#11</ulink>, <ulink url="https://bugs.pearsoncomputing.net/show_bug.cgi?id=3042">bug 3042</ulink>)</para></listitem>
+    <listitem><para>tqt3: fixed support for recursive mutexes (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/pulls/68">TDE/tqt3#68</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/pulls/72">TDE/tqt3#72</ulink>, <ulink url="http://bugs.trinitydesktop.org/show_bug.cgi?id=2462">bug 2462</ulink>, <ulink url="http://bugs.trinitydesktop.org/show_bug.cgi?id=2526">bug 2526</ulink>)</para></listitem>
+    <listitem><para>chalk: fixed SEGV when loading a PNG previously created from the same application (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice/issues/20">TDE/koffice#20</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/koffice/pulls/34">TDE/koffice#34</ulink>)</para></listitem>
+    <listitem><para>tdebase: fixed kcheckpass support for shadow passwords without PAM (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/pulls/354">TDE/tdebase#354</ulink>)</para></listitem>
+    <listitem><para>tdelibs: fixed intentation when displaying API documentation code (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/207">TDE/tdelibs#207</ulink>)</para></listitem>
+    <listitem><para>tdetoys: fixed pixelated icons bug in KWeather (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdetoys/issues/19">TDE/tdetoys#19</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdetoys/pulls/22">TDE/tdetoys#22</ulink>)</para></listitem>
+    <listitem><para>fixed image conversion naming of files with multiple dots in the name (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/issues/376">TDE/tdebase#376</ulink>) in konqueror (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaddons/pulls/18">TDE/tdeaddons#18</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaddons/pulls/20">TDE/tdeaddons#20</ulink>) and dolphin (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/pulls/19">TDE/dolphin#19</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/dolphin/pulls/21">TDE/dolphin#21</ulink>)</para></listitem>
+    <listitem><para>fixed value returned by 'brightnessGet' DCOP call (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave/pulls/15">TDE/tdepowersave#15</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeutils/pulls/53">TDE/tdeutils#53</ulink>)</para></listitem>
+    <listitem><para>added support for libexiv2 0.28.0 (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libkexiv2/issues/3">TDE/libkexiv2#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libkexiv2/pulls/4">TDE/libkexiv2#4</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/issues/7">TDE/gwenview#7</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview/pulls/8">TDE/gwenview#8</ulink>)</para></listitem>
+    <listitem><para>aligned string hashing function to upstream `gettext` code to ensure translation strings are correctly found (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/228">TDE/tdelibs#228</ulink>)</para></listitem>
+    <listitem><para>k3b: fixed detection and linking of taglib (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k3b/pulls/30">TDE/k3b#30</ulink>)</para></listitem>
+    <listitem><para>codeine: fixed volume slider functionality (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/codeine/pulls/8">TDE/codeine#8</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-distro-support">
+<title>Distro support</title>
+  <itemizedlist>
+    <listitem><para>This is the last version to support Debian Stretch and Ubuntu Xenial. From R14.1.2, package builds for those versions won't be avaiable</para></listitem>
+    <listitem><para>Added support for Debian Bookworm and Ubuntu Mantic</para></listitem>
+    <listitem><para>Removed support for Ubuntu Impish</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-cmake-conversions">
+<title>CMake conversions</title>
+  <itemizedlist>
+    <listitem><para>libksquirrel (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libksquirrel/pulls/5">TDE/libksquirrel#5</ulink>)</para></listitem>
+    <listitem><para>k9copy (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy/pulls/13">TDE/k9copy#13</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-dropped-code-applications">
+<title>Drop code/applications</title>
+  <itemizedlist>
+    <listitem><para>Dropped old Qt1/Qt2 stuff which does not affect public API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/130">TDE/tde#130</ulink>)</para></listitem>
+    <listitem><para>Dropped Qt4 specific stuff which does not affect public API (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdevelop/pulls/21">TDE/tdevelop#21</ulink>)</para></listitem>
+    <listitem><para>Dropped autotools support for various modules (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/libltdl/pulls/3">TDE/libltdl#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/keximdb/pulls/3">TDE/keximdb#3</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/desktop-effects-tde/pulls/7">TDE/desktop-effects</ulink>)</para></listitem>
+    <listitem><para>Dropped support for building in Symbian OS (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/45">TDE/amarok#45</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim/pulls/85">TDE/tdepim#85</ulink>, <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/pulls/222">TDE/tdelibs#222</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-info-developers">
+<title>Info for developers/packagers</title>
+  <itemizedlist>
+    <listitem><para>Added support for creating tarballs from head on a git tag (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/scripts/pulls/6">TDE/scripts#6</ulink>)</para></listitem>
+    <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/135">TDE/tde#135</ulink>)</para></listitem>
+    <listitem><para>tde-admin-common: added support for auto MOC-ing of classes using TQ_OBJECT (<ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin/pulls/17">TDE/tde-common</ulink>)</para></listitem>
+  </itemizedlist>
+</sect2>
+
+
+<sect2 id="release-notes-r14.1.1-additional-info">
+<title>Additional info</title>
+  <itemizedlist>
+    <listitem><para><ulink url="https://wiki.trinitydesktop.org/Release_Notes_For_R14.1.1">Full release notes</ulink> on TDE wiki</para></listitem>
+    <listitem><para>TGW <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tde/issues/121">issue list</ulink></para></listitem>
+    <listitem><para>Detailed commit <ulink url="https://wiki.trinitydesktop.org/Changelog_For_R14.1.1">change log</ulink></para></listitem>
+  </itemizedlist>
+</sect2>
+
+</sect1>
diff --git a/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook
new file mode 100644
index 000000000..e4ea66b86
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.1.x/r14.1.02.docbook
@@ -0,0 +1,129 @@
+<sect1 id="release-notes-r14.1.2">
+<title>R14.1.2 Release Notes</title>
+
+<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.2.x/CMakeLists.txt b/doc/khelpcenter/releasenotes/r14.2.x/CMakeLists.txt
new file mode 100644
index 000000000..51db5fe0c
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.2.x/CMakeLists.txt
@@ -0,0 +1,9 @@
+#################################################
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+tde_create_handbook( DESTINATION khelpcenter/releasenotes/r14.2.x )
diff --git a/doc/khelpcenter/releasenotes/r14.2.x/index.docbook b/doc/khelpcenter/releasenotes/r14.2.x/index.docbook
new file mode 100644
index 000000000..c318f144a
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.2.x/index.docbook
@@ -0,0 +1,45 @@
+<?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 -->
+
+  <!ENTITY r14.2.00 SYSTEM "r14.2.00.docbook">
+]>
+
+<article id="release-notes-14.2-x" lang="&language;">
+<title>Release Notes for R14.2.x series</title>
+
+<articleinfo>
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>&tde-release-date;</date>
+<releaseinfo>&tde-release-version;</releaseinfo>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>release notes</keyword>
+<keyword>R14.2.x</keyword>
+</keywordset>
+
+</articleinfo>
+
+<!-- empty section to avoid the first docbook to be shown
+     as part of the index page, instead of just a link-->
+<sect1 id="release-notes-r14.2-x-introduction">
+<title></title>
+<para></para>
+</sect1>
+
+&r14.2.00;
+
+</article>
diff --git a/doc/khelpcenter/releasenotes/r14.2.x/r14.2.00.docbook b/doc/khelpcenter/releasenotes/r14.2.x/r14.2.00.docbook
new file mode 100644
index 000000000..3b1c31ea7
--- /dev/null
+++ b/doc/khelpcenter/releasenotes/r14.2.x/r14.2.00.docbook
@@ -0,0 +1,6 @@
+<sect1 id="release-notes-r14.2.0">
+<title>R14.2.0 Release Notes (draft)</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/125">here</ulink>.</para>
+
+</sect1>
diff --git a/doc/releasenotes/tde_release_notes.desktop b/doc/khelpcenter/releasenotes/tde_release_notes.desktop
index eb82e1dea..eb82e1dea 100644
--- a/doc/releasenotes/tde_release_notes.desktop
+++ b/doc/khelpcenter/releasenotes/tde_release_notes.desktop
diff --git a/doc/khelpcenter/support.docbook b/doc/khelpcenter/support.docbook
index 59ca40c53..15c9e3908 100644
--- a/doc/khelpcenter/support.docbook
+++ b/doc/khelpcenter/support.docbook
@@ -40,7 +40,7 @@ that interest you.
 </para></listitem>
 
 <listitem><para>
-Read the <ulink url="http://trinity-devel.pearsoncomputing.net/">&tde;
+Read the <ulink url="http://mail.trinitydesktop.org/mailman3/hyperkitty/list/devels@trinitydesktop.org">&tde;
 developer mailing list</ulink> archives to get a feel for &tde; development.
 </para></listitem>
 
diff --git a/doc/userguide/CMakeLists.txt b/doc/khelpcenter/userguide/CMakeLists.txt
index 50fb573cd..50fb573cd 100644
--- a/doc/userguide/CMakeLists.txt
+++ b/doc/khelpcenter/userguide/CMakeLists.txt
diff --git a/doc/userguide/Makefile.am b/doc/khelpcenter/userguide/Makefile.am
index 488634323..488634323 100644
--- a/doc/userguide/Makefile.am
+++ b/doc/khelpcenter/userguide/Makefile.am
diff --git a/doc/userguide/a-window.png b/doc/khelpcenter/userguide/a-window.png
index cfd93ddb4..cfd93ddb4 100644
--- a/doc/userguide/a-window.png
+++ b/doc/khelpcenter/userguide/a-window.png
diff --git a/doc/userguide/accessibility.docbook b/doc/khelpcenter/userguide/accessibility.docbook
index 1d0f50009..d5ac064eb 100644
--- a/doc/userguide/accessibility.docbook
+++ b/doc/khelpcenter/userguide/accessibility.docbook
@@ -148,21 +148,3 @@ automatically</secondary></indexterm>
 
 </sect1>
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/amarok-icon.png b/doc/khelpcenter/userguide/amarok-icon.png
index 3a4191fe3..3a4191fe3 100644
--- a/doc/userguide/amarok-icon.png
+++ b/doc/khelpcenter/userguide/amarok-icon.png
diff --git a/doc/userguide/amarok.png b/doc/khelpcenter/userguide/amarok.png
index 1affe7f29..1affe7f29 100644
--- a/doc/userguide/amarok.png
+++ b/doc/khelpcenter/userguide/amarok.png
diff --git a/doc/userguide/base-tde-applications.docbook b/doc/khelpcenter/userguide/base-tde-applications.docbook
index d687b8d18..dc3074b81 100644
--- a/doc/userguide/base-tde-applications.docbook
+++ b/doc/khelpcenter/userguide/base-tde-applications.docbook
@@ -421,21 +421,3 @@
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/browser-fine-tuning.docbook b/doc/khelpcenter/userguide/browser-fine-tuning.docbook
index 8883a14bf..34a45e606 100644
--- a/doc/userguide/browser-fine-tuning.docbook
+++ b/doc/khelpcenter/userguide/browser-fine-tuning.docbook
@@ -51,21 +51,3 @@ stylesheet defined in "Customize" tab</guilabel>, then go to the
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/khelpcenter/userguide/burning-cds.docbook b/doc/khelpcenter/userguide/burning-cds.docbook
new file mode 100644
index 000000000..21f5214fd
--- /dev/null
+++ b/doc/khelpcenter/userguide/burning-cds.docbook
@@ -0,0 +1,20 @@
+<sect1 id="burning">
+<!-- Uncomment the <*info> below and add your name to be -->
+<!-- credited for writing this section. -->
+
+<!--
+<sect1info>
+<authorgroup>
+<author>
+<firstname>Your First Name here</firstname>
+<surname>Your Surname here </surname>
+</author>
+</authorgroup>
+</sect1info>
+-->
+
+<title>Burning CDs and DVDs</title>
+
+<para>Brief overview of k3b</para>
+
+</sect1>
diff --git a/doc/userguide/control-center.docbook b/doc/khelpcenter/userguide/control-center.docbook
index 6b66ea26b..5446cd0b0 100644
--- a/doc/userguide/control-center.docbook
+++ b/doc/khelpcenter/userguide/control-center.docbook
@@ -901,22 +901,3 @@ driver to use this section.</para></listitem>
 </itemizedlist>-->
 </sect1>
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
diff --git a/doc/userguide/creating-graphics.docbook b/doc/khelpcenter/userguide/creating-graphics.docbook
index 7fd0f1698..61c9b545a 100644
--- a/doc/userguide/creating-graphics.docbook
+++ b/doc/khelpcenter/userguide/creating-graphics.docbook
@@ -28,21 +28,3 @@
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/credits-and-license.docbook b/doc/khelpcenter/userguide/credits-and-license.docbook
index c88ba4873..9ca864aff 100644
--- a/doc/userguide/credits-and-license.docbook
+++ b/doc/khelpcenter/userguide/credits-and-license.docbook
@@ -297,20 +297,3 @@ Administrator Guide</ulink>.</para>
 </para>
 
 </sect1>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/customizing-desktop.docbook b/doc/khelpcenter/userguide/customizing-desktop.docbook
index 800496a23..a8ed7cb42 100644
--- a/doc/userguide/customizing-desktop.docbook
+++ b/doc/khelpcenter/userguide/customizing-desktop.docbook
@@ -345,21 +345,3 @@ interface: buttons, scrollbars, menus, tabs, &etc;</para></glossdef>
 
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/desktop.png b/doc/khelpcenter/userguide/desktop.png
index c9e03af97..c9e03af97 100644
--- a/doc/userguide/desktop.png
+++ b/doc/khelpcenter/userguide/desktop.png
diff --git a/doc/userguide/email.docbook b/doc/khelpcenter/userguide/email.docbook
index 376f4e563..8f69e5e6e 100644
--- a/doc/userguide/email.docbook
+++ b/doc/khelpcenter/userguide/email.docbook
@@ -234,21 +234,3 @@ latest news, tips and tricks, and plenty more.</para>
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/extragear-applications.docbook b/doc/khelpcenter/userguide/extragear-applications.docbook
index 5d0d2671b..5d0d2671b 100644
--- a/doc/userguide/extragear-applications.docbook
+++ b/doc/khelpcenter/userguide/extragear-applications.docbook
diff --git a/doc/userguide/file-sharing.docbook b/doc/khelpcenter/userguide/file-sharing.docbook
index 395e7b9e2..1ab5c4f61 100644
--- a/doc/userguide/file-sharing.docbook
+++ b/doc/khelpcenter/userguide/file-sharing.docbook
@@ -89,21 +89,3 @@ Samba, local cgi? nfs devices
 
 </sect2>-->
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/font-installation.docbook b/doc/khelpcenter/userguide/font-installation.docbook
index df810d55f..1248f660c 100644
--- a/doc/userguide/font-installation.docbook
+++ b/doc/khelpcenter/userguide/font-installation.docbook
@@ -59,21 +59,3 @@ choose <guibutton>Delete</guibutton>.</para>
 <para>tdefontinst and tdefontview should probably get a mention too, since
 they don't seem to have any existing docs.</para>
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/getting-help.docbook b/doc/khelpcenter/userguide/getting-help.docbook
index 6c2ebfaf7..266affd3c 100644
--- a/doc/userguide/getting-help.docbook
+++ b/doc/khelpcenter/userguide/getting-help.docbook
@@ -105,7 +105,7 @@ documents</quote> is appropriate for this list.</para>
 <para>Subscribe to this list at <ulink
 url="http://www.trinitydesktop.org/mailinglist.php">http://www.trinitydesktop.org/mailinglist.php</ulink>.</para>
 <para>Find list archives at <ulink
-url="http://trinity-users.pearsoncomputing.net/">http://trinity-users.pearsoncomputing.net/</ulink>.</para>
+url="http://mail.trinitydesktop.org/mailman3/hyperkitty/list/users@trinitydesktop.org">http://mail.trinitydesktop.org/mailman3/hyperkitty/list/users@trinitydesktop.org</ulink>.</para>
 </listitem>
 </varlistentry>
 
@@ -153,21 +153,3 @@ respective application's handbook or official &tde; documentation.</para>
 </sect2>
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/glossary.docbook b/doc/khelpcenter/userguide/glossary.docbook
index 8e5dcd597..dda9f666f 100644
--- a/doc/userguide/glossary.docbook
+++ b/doc/khelpcenter/userguide/glossary.docbook
@@ -18,21 +18,3 @@
 <para>TDE/GUI/UNIX terms that are worth explaining.</para>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/index.docbook b/doc/khelpcenter/userguide/index.docbook
index f292c454a..691706676 100644
--- a/doc/userguide/index.docbook
+++ b/doc/khelpcenter/userguide/index.docbook
@@ -82,7 +82,7 @@
 </para>
 
 <para>Please report problems with this document to
-<email>trinity-devel@lists.pearsoncomputing.net</email>.
+<email>devels@trinitydesktop.org</email>.
 </para>
 </abstract>
 
@@ -580,21 +580,3 @@ started.</para>
 &documentation.index;
 
 </book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/internet-shortcuts.docbook b/doc/khelpcenter/userguide/internet-shortcuts.docbook
index ab5133109..a4cfa1e68 100644
--- a/doc/userguide/internet-shortcuts.docbook
+++ b/doc/khelpcenter/userguide/internet-shortcuts.docbook
@@ -60,21 +60,3 @@ search for &tde;.</para>
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/juk-icon.png b/doc/khelpcenter/userguide/juk-icon.png
index a9b9150aa..a9b9150aa 100644
--- a/doc/userguide/juk-icon.png
+++ b/doc/khelpcenter/userguide/juk-icon.png
diff --git a/doc/userguide/juk.png b/doc/khelpcenter/userguide/juk.png
index 3c5517cb8..3c5517cb8 100644
--- a/doc/userguide/juk.png
+++ b/doc/khelpcenter/userguide/juk.png
diff --git a/doc/userguide/kaboodle-icon.png b/doc/khelpcenter/userguide/kaboodle-icon.png
index 7737031df..7737031df 100644
--- a/doc/userguide/kaboodle-icon.png
+++ b/doc/khelpcenter/userguide/kaboodle-icon.png
diff --git a/doc/userguide/kaboodle.png b/doc/khelpcenter/userguide/kaboodle.png
index ca64fee01..ca64fee01 100644
--- a/doc/userguide/kaboodle.png
+++ b/doc/khelpcenter/userguide/kaboodle.png
diff --git a/doc/userguide/kcalc-systray.png b/doc/khelpcenter/userguide/kcalc-systray.png
index c36073d3c..c36073d3c 100644
--- a/doc/userguide/kcalc-systray.png
+++ b/doc/khelpcenter/userguide/kcalc-systray.png
diff --git a/doc/userguide/kcontrol.png b/doc/khelpcenter/userguide/kcontrol.png
index d09af9aef..d09af9aef 100644
--- a/doc/userguide/kcontrol.png
+++ b/doc/khelpcenter/userguide/kcontrol.png
diff --git a/doc/userguide/kmag.png b/doc/khelpcenter/userguide/kmag.png
index 0b9de2399..0b9de2399 100644
--- a/doc/userguide/kmag.png
+++ b/doc/khelpcenter/userguide/kmag.png
diff --git a/doc/userguide/kmousetool.png b/doc/khelpcenter/userguide/kmousetool.png
index fe5dfb6a2..fe5dfb6a2 100644
--- a/doc/userguide/kmousetool.png
+++ b/doc/khelpcenter/userguide/kmousetool.png
diff --git a/doc/userguide/kmouth.png b/doc/khelpcenter/userguide/kmouth.png
index ebc59d291..ebc59d291 100644
--- a/doc/userguide/kmouth.png
+++ b/doc/khelpcenter/userguide/kmouth.png
diff --git a/doc/userguide/kmouth2.png b/doc/khelpcenter/userguide/kmouth2.png
index 3e435b772..3e435b772 100644
--- a/doc/userguide/kmouth2.png
+++ b/doc/khelpcenter/userguide/kmouth2.png
diff --git a/doc/userguide/kmouth3.png b/doc/khelpcenter/userguide/kmouth3.png
index 63a52ef65..63a52ef65 100644
--- a/doc/userguide/kmouth3.png
+++ b/doc/khelpcenter/userguide/kmouth3.png
diff --git a/doc/userguide/knode-identity.png b/doc/khelpcenter/userguide/knode-identity.png
index 7039f440a..7039f440a 100644
--- a/doc/userguide/knode-identity.png
+++ b/doc/khelpcenter/userguide/knode-identity.png
diff --git a/doc/userguide/knode-mail-account.png b/doc/khelpcenter/userguide/knode-mail-account.png
index d8dc560a2..d8dc560a2 100644
--- a/doc/userguide/knode-mail-account.png
+++ b/doc/khelpcenter/userguide/knode-mail-account.png
diff --git a/doc/userguide/knode-news-account.png b/doc/khelpcenter/userguide/knode-news-account.png
index 66eb4adec..66eb4adec 100644
--- a/doc/userguide/knode-news-account.png
+++ b/doc/khelpcenter/userguide/knode-news-account.png
diff --git a/doc/userguide/knode-start.png b/doc/khelpcenter/userguide/knode-start.png
index 709978a9c..709978a9c 100644
--- a/doc/userguide/knode-start.png
+++ b/doc/khelpcenter/userguide/knode-start.png
diff --git a/doc/userguide/konq-sidebar.png b/doc/khelpcenter/userguide/konq-sidebar.png
index d58cdda3b..d58cdda3b 100644
--- a/doc/userguide/konq-sidebar.png
+++ b/doc/khelpcenter/userguide/konq-sidebar.png
diff --git a/doc/userguide/konq-simple.png b/doc/khelpcenter/userguide/konq-simple.png
index b2f40fda8..b2f40fda8 100644
--- a/doc/userguide/konq-simple.png
+++ b/doc/khelpcenter/userguide/konq-simple.png
diff --git a/doc/userguide/konsole-intro.docbook b/doc/khelpcenter/userguide/konsole-intro.docbook
index 3b534bf02..35c49519b 100644
--- a/doc/userguide/konsole-intro.docbook
+++ b/doc/khelpcenter/userguide/konsole-intro.docbook
@@ -106,21 +106,3 @@ Handbook has much more information about the features available in
 
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/kopete.png b/doc/khelpcenter/userguide/kopete.png
index 6d1fb850b..6d1fb850b 100644
--- a/doc/userguide/kopete.png
+++ b/doc/khelpcenter/userguide/kopete.png
diff --git a/doc/userguide/kppp-dialer-tab.png b/doc/khelpcenter/userguide/kppp-dialer-tab.png
index 174248710..174248710 100644
--- a/doc/userguide/kppp-dialer-tab.png
+++ b/doc/khelpcenter/userguide/kppp-dialer-tab.png
diff --git a/doc/userguide/kppp-wizard.png b/doc/khelpcenter/userguide/kppp-wizard.png
index 5e720df9a..5e720df9a 100644
--- a/doc/userguide/kppp-wizard.png
+++ b/doc/khelpcenter/userguide/kppp-wizard.png
diff --git a/doc/userguide/messaging-intro.docbook b/doc/khelpcenter/userguide/messaging-intro.docbook
index 54efbdccf..f5e26e222 100644
--- a/doc/userguide/messaging-intro.docbook
+++ b/doc/khelpcenter/userguide/messaging-intro.docbook
@@ -168,21 +168,3 @@ Instant Messenger will start a conversation with the contact.</para>
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/migrator-applications.docbook b/doc/khelpcenter/userguide/migrator-applications.docbook
index 8e511861e..8e511861e 100644
--- a/doc/userguide/migrator-applications.docbook
+++ b/doc/khelpcenter/userguide/migrator-applications.docbook
diff --git a/doc/userguide/migrator-dictionary.docbook b/doc/khelpcenter/userguide/migrator-dictionary.docbook
index 4bd2efa5d..d92c328c9 100644
--- a/doc/userguide/migrator-dictionary.docbook
+++ b/doc/khelpcenter/userguide/migrator-dictionary.docbook
@@ -18,21 +18,3 @@
 <para>Tables of terminology differences</para>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/net-connection-setup.docbook b/doc/khelpcenter/userguide/net-connection-setup.docbook
index af53d1963..4e59dab48 100644
--- a/doc/userguide/net-connection-setup.docbook
+++ b/doc/khelpcenter/userguide/net-connection-setup.docbook
@@ -216,23 +216,3 @@ bar in &konqueror;.</para>
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/doc/userguide/networking-with-windows.docbook b/doc/khelpcenter/userguide/networking-with-windows.docbook
index 546313b7c..08d57e81e 100644
--- a/doc/userguide/networking-with-windows.docbook
+++ b/doc/khelpcenter/userguide/networking-with-windows.docbook
@@ -108,21 +108,3 @@ examples see the entire &lisa; manual by entering
 
 </sect2>
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/noatun-icon.png b/doc/khelpcenter/userguide/noatun-icon.png
index 15131ce39..15131ce39 100644
--- a/doc/userguide/noatun-icon.png
+++ b/doc/khelpcenter/userguide/noatun-icon.png
diff --git a/doc/userguide/noatun.png b/doc/khelpcenter/userguide/noatun.png
index 9d0d2d764..9d0d2d764 100644
--- a/doc/userguide/noatun.png
+++ b/doc/khelpcenter/userguide/noatun.png
diff --git a/doc/userguide/oggfolder.png b/doc/khelpcenter/userguide/oggfolder.png
index 130fc63b7..130fc63b7 100644
--- a/doc/userguide/oggfolder.png
+++ b/doc/khelpcenter/userguide/oggfolder.png
diff --git a/doc/userguide/open-file-dialog.png b/doc/khelpcenter/userguide/open-file-dialog.png
index 2ebd2b254..2ebd2b254 100644
--- a/doc/userguide/open-file-dialog.png
+++ b/doc/khelpcenter/userguide/open-file-dialog.png
diff --git a/doc/userguide/panel-and-desktop.docbook b/doc/khelpcenter/userguide/panel-and-desktop.docbook
index f0e189cee..c89a2539b 100644
--- a/doc/userguide/panel-and-desktop.docbook
+++ b/doc/khelpcenter/userguide/panel-and-desktop.docbook
@@ -296,21 +296,3 @@ features in &tde;. You can read it in &khelpcenter; or by entering
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/khelpcenter/userguide/pdf-files.docbook b/doc/khelpcenter/userguide/pdf-files.docbook
new file mode 100644
index 000000000..73d951e18
--- /dev/null
+++ b/doc/khelpcenter/userguide/pdf-files.docbook
@@ -0,0 +1,22 @@
+<sect1 id="pdfs">
+<!-- Uncomment the <*info> below and add your name to be -->
+<!-- credited for writing this section. -->
+
+<!--
+<sect1info>
+<authorgroup>
+<author>
+<firstname>Your First Name here</firstname>
+<surname>Your Surname here </surname>
+</author>
+</authorgroup>
+</sect1info>
+-->
+
+<title>PDF Files</title>
+
+<para>How to print to a pdf file</para>
+
+<para>Viewing pdf files</para>
+
+</sect1>
diff --git a/doc/userguide/playing-audiocds.docbook b/doc/khelpcenter/userguide/playing-audiocds.docbook
index 300a2badd..26e7e494c 100644
--- a/doc/userguide/playing-audiocds.docbook
+++ b/doc/khelpcenter/userguide/playing-audiocds.docbook
@@ -122,21 +122,3 @@ latest news and information about <application>amaroK</application>.</para>
 <!-- it's fixed :-) -->
 </sect2>
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/playing-movies.docbook b/doc/khelpcenter/userguide/playing-movies.docbook
index 89e986cbb..135289a02 100644
--- a/doc/userguide/playing-movies.docbook
+++ b/doc/khelpcenter/userguide/playing-movies.docbook
@@ -28,21 +28,3 @@
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/playing-music.docbook b/doc/khelpcenter/userguide/playing-music.docbook
index 956bff22b..2b8c529eb 100644
--- a/doc/userguide/playing-music.docbook
+++ b/doc/khelpcenter/userguide/playing-music.docbook
@@ -130,21 +130,3 @@ also make useful music players.</para>
 
 </sect2>
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/printer-setup.docbook b/doc/khelpcenter/userguide/printer-setup.docbook
index 658be16ac..216c9e819 100644
--- a/doc/userguide/printer-setup.docbook
+++ b/doc/khelpcenter/userguide/printer-setup.docbook
@@ -27,21 +27,3 @@ big manual if there is trouble</para>
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/printing-from-apps.docbook b/doc/khelpcenter/userguide/printing-from-apps.docbook
index 213942114..964431189 100644
--- a/doc/userguide/printing-from-apps.docbook
+++ b/doc/khelpcenter/userguide/printing-from-apps.docbook
@@ -20,21 +20,3 @@
 <para>Printing from non-TDE apps</para>
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/programs-and-documents.docbook b/doc/khelpcenter/userguide/programs-and-documents.docbook
index 60ced60d3..b56f486b4 100644
--- a/doc/userguide/programs-and-documents.docbook
+++ b/doc/khelpcenter/userguide/programs-and-documents.docbook
@@ -520,21 +520,3 @@ is.</para>
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/programs-controlling.docbook b/doc/khelpcenter/userguide/programs-controlling.docbook
index a1f072e6f..5d170f3a0 100644
--- a/doc/userguide/programs-controlling.docbook
+++ b/doc/khelpcenter/userguide/programs-controlling.docbook
@@ -20,20 +20,3 @@
 <para>Keybindings</para>
 
 </sect1>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/removable-disks.docbook b/doc/khelpcenter/userguide/removable-disks.docbook
index 34f16e4b7..9c3575e1b 100644
--- a/doc/userguide/removable-disks.docbook
+++ b/doc/khelpcenter/userguide/removable-disks.docbook
@@ -19,10 +19,7 @@ it, and much more.</para>
 
 <para>The use of a device is controlled by the operating
 system and it is important your operating system has tools for managing
-these devices. &tde; can also auto mount devices, working with
-<acronym>HAL</acronym> (Hardware Abstraction Layer). Your distribution
-should have set up <acronym>HAL</acronym> automatically; if not,
-consult the documentation provided by your distribution.</para>
+these devices. &tde; can also auto mount devices.</para>
 <para>There are several ways to find the list of media devices: use
 whichever one suits you best:</para>
 
@@ -89,14 +86,6 @@ configured. To find out if they are running on your system check the
 <command>udevd</command>. &tde; does not provide any of these
 components. You must check with you distribution.</para>
 
-<itemizedlist>
-<title>Related Information</title>
-<listitem><para><ulink url="http://wiki.kde.org/tiki-index.php?page=DBUS">HOWTO: setting up D-BUS and HAL with TDE's media ioslave
-edit</ulink> (A community maintained HOWTO on the &tde; wiki)</para></listitem>
-<listitem><para><ulink url="http://www.freedesktop.org/wiki/Software/dbus">The DBus page</ulink></para></listitem>
-<listitem><para><ulink url="http://www.freedesktop.org/wiki/Software/hal"></ulink>HAL - Hardware Abstraction Layer</para></listitem>
-</itemizedlist>
-
 </sect2>
 
 <sect2 id="mounting-removable-disks">
@@ -120,21 +109,3 @@ removable devices one can also unmount with <guimenuitem>Safely Remove</guimenui
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/rip.png b/doc/khelpcenter/userguide/rip.png
index b1461a979..b1461a979 100644
--- a/doc/userguide/rip.png
+++ b/doc/khelpcenter/userguide/rip.png
diff --git a/doc/userguide/ripsettings.png b/doc/khelpcenter/userguide/ripsettings.png
index e4e50addb..e4e50addb 100644
--- a/doc/userguide/ripsettings.png
+++ b/doc/khelpcenter/userguide/ripsettings.png
diff --git a/doc/khelpcenter/userguide/screen-captures.docbook b/doc/khelpcenter/userguide/screen-captures.docbook
new file mode 100644
index 000000000..b6ea1da1f
--- /dev/null
+++ b/doc/khelpcenter/userguide/screen-captures.docbook
@@ -0,0 +1,20 @@
+<sect1 id="screen-captures">
+<!-- Uncomment the <*info> below and add your name to be -->
+<!-- credited for writing this section. -->
+
+<!--
+<sect1info>
+<authorgroup>
+<author>
+<firstname>Your First Name here</firstname>
+<surname>Your Surname here </surname>
+</author>
+</authorgroup>
+</sect1info>
+-->
+
+<title>Screen Captures</title>
+
+<para>Grabbing screen caps</para>
+
+</sect1>
diff --git a/doc/userguide/services.png b/doc/khelpcenter/userguide/services.png
index 7ccd315d4..7ccd315d4 100644
--- a/doc/userguide/services.png
+++ b/doc/khelpcenter/userguide/services.png
diff --git a/doc/userguide/shared-sessions.docbook b/doc/khelpcenter/userguide/shared-sessions.docbook
index 688a4b93f..5712bf817 100644
--- a/doc/userguide/shared-sessions.docbook
+++ b/doc/khelpcenter/userguide/shared-sessions.docbook
@@ -26,21 +26,3 @@
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/splash-screen.png b/doc/khelpcenter/userguide/splash-screen.png
index cd11c5d35..cd11c5d35 100644
--- a/doc/userguide/splash-screen.png
+++ b/doc/khelpcenter/userguide/splash-screen.png
diff --git a/doc/userguide/standard-menu-entries.docbook b/doc/khelpcenter/userguide/standard-menu-entries.docbook
index 5e8a4efe5..379b0fa0a 100644
--- a/doc/userguide/standard-menu-entries.docbook
+++ b/doc/khelpcenter/userguide/standard-menu-entries.docbook
@@ -299,21 +299,3 @@ change settings relating to how the application works in general.
 &help.menu.documentation;
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/switching-sessions.docbook b/doc/khelpcenter/userguide/switching-sessions.docbook
index e23e22876..3d38adb9c 100644
--- a/doc/userguide/switching-sessions.docbook
+++ b/doc/khelpcenter/userguide/switching-sessions.docbook
@@ -5,9 +5,9 @@
 <para>From version 3.3 onwards, &tde; provides a session management
 system which allows you to switch between different user account on
 one computer. You can stay logged in and &eg; let your sister,
-brother, wife, neigbour or whoever read her or his emails just for a
+brother, wife, neigbour or whoever read their emails just for a
 moment. Before you had to log off (therefore &eg; close programs or
-save documents) and let her or him log in.</para>
+save documents) and let them log in.</para>
 
 <para>Now it's almost as easy as switching to another virtual desktop.</para>
 
@@ -36,8 +36,8 @@ submenu.</para>
 <varlistentry>
 <term>Switch User with the screensaver</term>
 <listitem><para>If you have activated your screensaver and another user
-wants to log in she or he can simply press the <guibutton>Switch
-User...</guibutton> button and log into another session.</para>
+wants to log in, they can simply press the <guibutton>Switch User...</guibutton>
+button and log into another session.</para>
 </listitem>
 </varlistentry>
 
@@ -61,21 +61,3 @@ above.</para>
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/tde-as-root.docbook b/doc/khelpcenter/userguide/tde-as-root.docbook
index ec866638f..c7e9b966e 100644
--- a/doc/userguide/tde-as-root.docbook
+++ b/doc/khelpcenter/userguide/tde-as-root.docbook
@@ -32,21 +32,3 @@
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/tde-edutainment.docbook b/doc/khelpcenter/userguide/tde-edutainment.docbook
index b3cbe8246..0cafe8f04 100644
--- a/doc/userguide/tde-edutainment.docbook
+++ b/doc/khelpcenter/userguide/tde-edutainment.docbook
@@ -322,21 +322,3 @@ information about all the &tde; Edutainment applications.</para>
 
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/tde-office.docbook b/doc/khelpcenter/userguide/tde-office.docbook
index f8df13365..f8df13365 100644
--- a/doc/userguide/tde-office.docbook
+++ b/doc/khelpcenter/userguide/tde-office.docbook
diff --git a/doc/userguide/tdm.png b/doc/khelpcenter/userguide/tdm.png
index 1ad4fcce0..1ad4fcce0 100644
--- a/doc/userguide/tdm.png
+++ b/doc/khelpcenter/userguide/tdm.png
diff --git a/doc/userguide/the-filemanager.docbook b/doc/khelpcenter/userguide/the-filemanager.docbook
index 6957da0d0..20e4dedfe 100644
--- a/doc/userguide/the-filemanager.docbook
+++ b/doc/khelpcenter/userguide/the-filemanager.docbook
@@ -254,23 +254,3 @@ has much more information about the features available in
 
 </sect2>
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/doc/userguide/titlebar-menu.png b/doc/khelpcenter/userguide/titlebar-menu.png
index d772e7995..d772e7995 100644
--- a/doc/userguide/titlebar-menu.png
+++ b/doc/khelpcenter/userguide/titlebar-menu.png
diff --git a/doc/userguide/troubleshooting-network-x.docbook b/doc/khelpcenter/userguide/troubleshooting-network-x.docbook
index fd4610f2a..fd4610f2a 100644
--- a/doc/userguide/troubleshooting-network-x.docbook
+++ b/doc/khelpcenter/userguide/troubleshooting-network-x.docbook
diff --git a/doc/userguide/troubleshooting-no-open.docbook b/doc/khelpcenter/userguide/troubleshooting-no-open.docbook
index 682f4b675..80046478d 100644
--- a/doc/userguide/troubleshooting-no-open.docbook
+++ b/doc/khelpcenter/userguide/troubleshooting-no-open.docbook
@@ -29,21 +29,3 @@ be that the launcher itself is wrong.</para>
 </varlistentry>
 </variablelist>
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/under-the-hood.docbook b/doc/khelpcenter/userguide/under-the-hood.docbook
index 331f41ce0..923ecba46 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/khelpcenter/userguide/under-the-hood.docbook
@@ -53,7 +53,7 @@ which are in in the file <filename>kmailrc</filename>).
 
 <para>So why would you want to touch the configuration files at all? Well, first you need it
 when you want to enforce the KIOSK mode. Perhaps a developer has asked you
-to add an entry to help him to solve a problem with the application. Perhaps you want to recover from
+to add an entry to help them to solve a problem with the application. Perhaps you want to recover from
 a problem without having to remove all the <filename
 class="directory">.kde</filename> directory. Perhaps you want to learn more
 about the depths of &tde;.</para>
@@ -468,21 +468,3 @@ encountered anyway.</para>
 </sect2>
 </sect1>
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/usenet.docbook b/doc/khelpcenter/userguide/usenet.docbook
index 6b27b2a32..a307e45f3 100644
--- a/doc/userguide/usenet.docbook
+++ b/doc/khelpcenter/userguide/usenet.docbook
@@ -231,21 +231,3 @@ lists, so you can read them with &knode;.</para>
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "chapter")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/khelpcenter/userguide/where-next.docbook b/doc/khelpcenter/userguide/where-next.docbook
new file mode 100644
index 000000000..840bf3084
--- /dev/null
+++ b/doc/khelpcenter/userguide/where-next.docbook
@@ -0,0 +1,22 @@
+<chapter id="where-next">
+<!-- Uncomment the <*info> below and add your name to be -->
+<!-- credited for writing this section. -->
+
+<!--
+<chapterinfo>
+<authorgroup>
+<author>
+<firstname>Your First Name here</firstname>
+<surname>Your Surname here </surname>
+</author>
+</authorgroup>
+</chapterinfo>
+-->
+
+<title>Where To Next?</title>
+
+<para>Web Sites</para>
+
+<para>Books</para>
+
+</chapter>
diff --git a/doc/userguide/windows-how-to.docbook b/doc/khelpcenter/userguide/windows-how-to.docbook
index c6d1020d9..25dc3ba80 100644
--- a/doc/userguide/windows-how-to.docbook
+++ b/doc/khelpcenter/userguide/windows-how-to.docbook
@@ -498,20 +498,3 @@ Windows</primary></indexterm> item.</para>
 </sect2>
 
 </sect1>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/your-tde-account.docbook b/doc/khelpcenter/userguide/your-tde-account.docbook
index 6b351b208..96ec4b713 100644
--- a/doc/userguide/your-tde-account.docbook
+++ b/doc/khelpcenter/userguide/your-tde-account.docbook
@@ -60,21 +60,3 @@ more information about the directories that &tde; uses.</para>
 
 
 </sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/visualdict/CMakeLists.txt b/doc/khelpcenter/visualdict/CMakeLists.txt
index 82b6a9816..82b6a9816 100644
--- a/doc/visualdict/CMakeLists.txt
+++ b/doc/khelpcenter/visualdict/CMakeLists.txt
diff --git a/doc/visualdict/Makefile.am b/doc/khelpcenter/visualdict/Makefile.am
index 81064650f..81064650f 100644
--- a/doc/visualdict/Makefile.am
+++ b/doc/khelpcenter/visualdict/Makefile.am
diff --git a/doc/visualdict/index.docbook b/doc/khelpcenter/visualdict/index.docbook
index 6d3312353..6d3312353 100644
--- a/doc/visualdict/index.docbook
+++ b/doc/khelpcenter/visualdict/index.docbook
diff --git a/doc/visualdict/pict1.png b/doc/khelpcenter/visualdict/pict1.png
index 2a0d11097..2a0d11097 100644
--- a/doc/visualdict/pict1.png
+++ b/doc/khelpcenter/visualdict/pict1.png
diff --git a/doc/visualdict/pict10.png b/doc/khelpcenter/visualdict/pict10.png
index ff0748ac7..ff0748ac7 100644
--- a/doc/visualdict/pict10.png
+++ b/doc/khelpcenter/visualdict/pict10.png
diff --git a/doc/visualdict/pict11.png b/doc/khelpcenter/visualdict/pict11.png
index e2b33ea3d..e2b33ea3d 100644
--- a/doc/visualdict/pict11.png
+++ b/doc/khelpcenter/visualdict/pict11.png
diff --git a/doc/visualdict/pict12.png b/doc/khelpcenter/visualdict/pict12.png
index 69e958c00..69e958c00 100644
--- a/doc/visualdict/pict12.png
+++ b/doc/khelpcenter/visualdict/pict12.png
diff --git a/doc/visualdict/pict13.png b/doc/khelpcenter/visualdict/pict13.png
index f70b40a75..f70b40a75 100644
--- a/doc/visualdict/pict13.png
+++ b/doc/khelpcenter/visualdict/pict13.png
diff --git a/doc/visualdict/pict14.png b/doc/khelpcenter/visualdict/pict14.png
index 491505064..491505064 100644
--- a/doc/visualdict/pict14.png
+++ b/doc/khelpcenter/visualdict/pict14.png
diff --git a/doc/visualdict/pict15.png b/doc/khelpcenter/visualdict/pict15.png
index 81deaace4..81deaace4 100644
--- a/doc/visualdict/pict15.png
+++ b/doc/khelpcenter/visualdict/pict15.png
diff --git a/doc/visualdict/pict16.png b/doc/khelpcenter/visualdict/pict16.png
index acb85b32c..acb85b32c 100644
--- a/doc/visualdict/pict16.png
+++ b/doc/khelpcenter/visualdict/pict16.png
diff --git a/doc/visualdict/pict17.png b/doc/khelpcenter/visualdict/pict17.png
index c5bfab766..c5bfab766 100644
--- a/doc/visualdict/pict17.png
+++ b/doc/khelpcenter/visualdict/pict17.png
diff --git a/doc/visualdict/pict18.png b/doc/khelpcenter/visualdict/pict18.png
index eb7fc172f..eb7fc172f 100644
--- a/doc/visualdict/pict18.png
+++ b/doc/khelpcenter/visualdict/pict18.png
diff --git a/doc/visualdict/pict19.png b/doc/khelpcenter/visualdict/pict19.png
index 22c841137..22c841137 100644
--- a/doc/visualdict/pict19.png
+++ b/doc/khelpcenter/visualdict/pict19.png
diff --git a/doc/visualdict/pict2.png b/doc/khelpcenter/visualdict/pict2.png
index 69c64624a..69c64624a 100644
--- a/doc/visualdict/pict2.png
+++ b/doc/khelpcenter/visualdict/pict2.png
diff --git a/doc/visualdict/pict20.png b/doc/khelpcenter/visualdict/pict20.png
index fac840877..fac840877 100644
--- a/doc/visualdict/pict20.png
+++ b/doc/khelpcenter/visualdict/pict20.png
diff --git a/doc/visualdict/pict21.png b/doc/khelpcenter/visualdict/pict21.png
index 70f148c4e..70f148c4e 100644
--- a/doc/visualdict/pict21.png
+++ b/doc/khelpcenter/visualdict/pict21.png
diff --git a/doc/visualdict/pict22.png b/doc/khelpcenter/visualdict/pict22.png
index cc29e0f14..cc29e0f14 100644
--- a/doc/visualdict/pict22.png
+++ b/doc/khelpcenter/visualdict/pict22.png
diff --git a/doc/visualdict/pict23.png b/doc/khelpcenter/visualdict/pict23.png
index 0d3844382..0d3844382 100644
--- a/doc/visualdict/pict23.png
+++ b/doc/khelpcenter/visualdict/pict23.png
diff --git a/doc/visualdict/pict3.png b/doc/khelpcenter/visualdict/pict3.png
index 6a053a7ac..6a053a7ac 100644
--- a/doc/visualdict/pict3.png
+++ b/doc/khelpcenter/visualdict/pict3.png
diff --git a/doc/visualdict/pict4.png b/doc/khelpcenter/visualdict/pict4.png
index 88f4b85c4..88f4b85c4 100644
--- a/doc/visualdict/pict4.png
+++ b/doc/khelpcenter/visualdict/pict4.png
diff --git a/doc/visualdict/pict5.png b/doc/khelpcenter/visualdict/pict5.png
index ec4b70f7a..ec4b70f7a 100644
--- a/doc/visualdict/pict5.png
+++ b/doc/khelpcenter/visualdict/pict5.png
diff --git a/doc/visualdict/pict6.png b/doc/khelpcenter/visualdict/pict6.png
index e5e1da4a8..e5e1da4a8 100644
--- a/doc/visualdict/pict6.png
+++ b/doc/khelpcenter/visualdict/pict6.png
diff --git a/doc/visualdict/pict7.png b/doc/khelpcenter/visualdict/pict7.png
index bfe63c9e5..bfe63c9e5 100644
--- a/doc/visualdict/pict7.png
+++ b/doc/khelpcenter/visualdict/pict7.png
diff --git a/doc/visualdict/pict8.png b/doc/khelpcenter/visualdict/pict8.png
index 805b07964..805b07964 100644
--- a/doc/visualdict/pict8.png
+++ b/doc/khelpcenter/visualdict/pict8.png
diff --git a/doc/visualdict/pict9.png b/doc/khelpcenter/visualdict/pict9.png
index d8a4be594..d8a4be594 100644
--- a/doc/visualdict/pict9.png
+++ b/doc/khelpcenter/visualdict/pict9.png
diff --git a/doc/khelpcenter/welcome.docbook b/doc/khelpcenter/welcome.docbook
index b408e625d..73719b6fb 100644
--- a/doc/khelpcenter/welcome.docbook
+++ b/doc/khelpcenter/welcome.docbook
@@ -9,6 +9,9 @@
 <para>The Trinity team welcomes you to user-friendly &UNIX; desktop computing.</para>
 
 <sect1 id="welcome-information-about-tde">
+<title></title>
+
+<sect2 id="welcome-to-tde-section">
 <title>Information about &tde;</title>
 
 <para>The Trinity Desktop Environment (&tde;) is a graphical desktop environment for &UNIX; workstations. The
@@ -26,10 +29,7 @@ professional graphical design along with the technical advantages of
 
 <para><link linkend="support">Supporting the &tde; Project</link></para>
 
-</sect1>
-
-<sect1 id="welcome-getting-the-most-out-of-tde">
-<title>Getting the most out of &tde;</title>
+</sect2>
 
 <sect2 id="welcome-general-documentation">
 <title>General documentation</title>
@@ -42,15 +42,5 @@ professional graphical design along with the technical advantages of
 
 </sect2>
 
-<sect2 id="welcome-basic-applications">
-<title>Basic applications</title>
-
-<para><ulink url="help:/kicker">Desktop Panel (Kicker)</ulink></para>
-
-<para><ulink url="help:/kcontrol">Control Center</ulink></para>
-
-<para><ulink url="help:/konqueror">File Manager</ulink></para>
-
-</sect2>
 </sect1>
 </chapter>
diff --git a/doc/khelpcenter/whatistde.docbook b/doc/khelpcenter/whatistde.docbook
index b93bab5dd..bc094ea40 100644
--- a/doc/khelpcenter/whatistde.docbook
+++ b/doc/khelpcenter/whatistde.docbook
@@ -19,7 +19,7 @@ flow philosophy.</para>
 version 3.5, originally written by the KDE Team, a world-wide network of
 software engineers committed to Free Software development. This group's
 major goal in free software development is to provide high quality software
-that empowers the user with easy control of his computer's resources.</para>
+that empowers the user with easy control of their computer's resources.</para>
 
 <para>The &tde; developers continue the tradition of KDE 3.5.</para>
 
diff --git a/doc/klipper/index.docbook b/doc/klipper/index.docbook
index 8f121091a..be8ab83f0 100644
--- a/doc/klipper/index.docbook
+++ b/doc/klipper/index.docbook
@@ -491,21 +491,3 @@ The latter will keep the system installation intact and only prevent
 &documentation.index; 
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-indent-step: 0
-End:
--->
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/kmenuedit/index.docbook b/doc/kmenuedit/index.docbook
index 1fce0a1a9..11e09af39 100644
--- a/doc/kmenuedit/index.docbook
+++ b/doc/kmenuedit/index.docbook
@@ -511,11 +511,3 @@ work.</para></footnote>.</para>
 &documentation.index;
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/doc/knetattach/index.docbook b/doc/knetattach/index.docbook
index 339e9854f..2a889055b 100644
--- a/doc/knetattach/index.docbook
+++ b/doc/knetattach/index.docbook
@@ -334,16 +334,3 @@ Documentation Copyright &copy; 2005 &Orville.Bennett; &Orville.Bennett.mail;
 
 &documentation.index;
 </book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
-kate: space-indent on; indent-width 2; tab-width 2; indent-mode none;
--->
diff --git a/doc/kompmgr/index.docbook b/doc/kompmgr/index.docbook
index 192c7dd8e..85498153d 100644
--- a/doc/kompmgr/index.docbook
+++ b/doc/kompmgr/index.docbook
@@ -182,7 +182,7 @@ fix this.</para>
 
 <sect1 id="shadows">
 <title>Shadows</title>
-<para>Why should anyone want his windows to throw shadows? Well, maybe just
+<para>Why should anyone want their windows to throw shadows? Well, maybe just
 because it looks cute, or because it allows a better window separation,
 or... because it looks cute!</para> 
 <variablelist>
@@ -423,11 +423,3 @@ translucent videos isn't fast anyway.</para>
 </chapter>
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/konqueror/basics.docbook b/doc/konqueror/basics.docbook
index 4212090e9..6ca1cd4cc 100644
--- a/doc/konqueror/basics.docbook
+++ b/doc/konqueror/basics.docbook
@@ -370,14 +370,3 @@ http://docs.kde.org</ulink>.</para></note>
 </sect1>
 
 </chapter>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/bookmarks.docbook b/doc/konqueror/bookmarks.docbook
index 6797f4499..3237547f5 100644
--- a/doc/konqueror/bookmarks.docbook
+++ b/doc/konqueror/bookmarks.docbook
@@ -117,13 +117,3 @@ the <guilabel>Bookmark Editor</guilabel>.
 
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/browser.docbook b/doc/konqueror/browser.docbook
index c6c8ecbb2..a3200e639 100644
--- a/doc/konqueror/browser.docbook
+++ b/doc/konqueror/browser.docbook
@@ -469,14 +469,3 @@ to <filename>$TDEDIR/share/config/tdeio_httprc
 
 
 </chapter>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/commands.docbook b/doc/konqueror/commands.docbook
index 945fd11c4..d6ab43668 100644
--- a/doc/konqueror/commands.docbook
+++ b/doc/konqueror/commands.docbook
@@ -549,19 +549,147 @@ viewing a folder in Icon Mode.</para></listitem>
 <varlistentry>
 <term><menuchoice>
 <guimenu>View</guimenu>
+<guimenuitem>Show Hidden Files</guimenuitem>
+</menuchoice></term>
+<listitem><para>Show hidden (dot) files.</para></listitem>
+</varlistentry>
+
+
+<varlistentry>
+
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+</menuchoice></term>
+<listitem>
+
+<para>In
+<emphasis role="bold">Icon View</emphasis> or
+<emphasis role="bold">MultiColumn View</emphasis>:
+Choose order in which items are presented in the window.
+</para>
+
+<para>In
+<emphasis role="bold">Detailed List View</emphasis>,
+<emphasis role="bold">Tree View</emphasis>,
+<emphasis role="bold">Text View</emphasis> or
+<emphasis role="bold">Info List View</emphasis>:
+Access the following sort options &amp; actions submenu.
+<variablelist>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>1</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Unicode based</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Sort file names in numeric Unicode character codepoint order.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>2</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Unicode based, case-insensitive</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+This is a <guimenuitem>Unicode based</guimenuitem> sort, modified so
+that upper and lower case alphabetic character variants sort together.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>3</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Locale based</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Sort file names according to the rules of the current locale.
+The current locale can be displayed using the command
+<literal>`locale | grep COLL`</literal>.
+If the value of <literal>'LC_COLLATE'</literal> is either
+<literal>'C'</literal> or <literal>'POSIX'</literal>, then the
+sort order will be identical to <guimenuitem>Unicode based</guimenuitem>.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
 <guisubmenu>Sort</guisubmenu>
+<guimenuitem>Group Directories First</guimenuitem>
 </menuchoice></term>
-<listitem><para>Choose order in which items are presented in the
-window when in Icon or MultiColumn View mode.</para></listitem>
+<listitem><para>
+Folders will be listed <emphasis>before</emphasis> non-folders,
+regardless of sort column and order.
+</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>H</keycap></keycombo>
+</shortcut><guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Group Hidden First</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+If "hidden" files and folders are visible, they will be listed
+<emphasis>before</emphasis> non-hidden files and folders,
+regardless of sort column and order.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
+</shortcut>
 <guimenu>View</guimenu>
-<guimenuitem>Case Insensitive Sort</guimenuitem>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Alternate Sort Order</guimenuitem>
 </menuchoice></term>
-<listitem><para>Choose whether the sort order in Tree, Detailed List
-or Text View modes is case sensitive.</para></listitem>
+<listitem><para>
+Users may sort the list in different ways by clicking on different
+columns. This action allows one to toggle sorting between the two
+most recently clicked sort columns without using the mouse.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guisubmenu>Sort</guisubmenu>
+<guimenuitem>Reverse Sort Order</guimenuitem>
+</menuchoice></term>
+<listitem><para>
+Toggle between ascending and descending ordering of current sort
+column without using the mouse.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</para>
+</listitem>
+
 </varlistentry>
 
 <varlistentry>
@@ -641,14 +769,6 @@ MultiColumn View modes.</para></listitem>
 <varlistentry>
 <term><menuchoice>
 <guimenu>View</guimenu>
-<guimenuitem>Show Hidden Files</guimenuitem>
-</menuchoice></term>
-<listitem><para>Show hidden (dot) files.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<guimenu>View</guimenu>
 <guimenuitem>Show details...</guimenuitem>
 </menuchoice></term>
 <listitem><para>Lets you choose which file and folder details are
@@ -973,13 +1093,3 @@ you are running.</para></listitem>
 
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/config.docbook b/doc/konqueror/config.docbook
index 90a1a5212..75e7c33c0 100644
--- a/doc/konqueror/config.docbook
+++ b/doc/konqueror/config.docbook
@@ -125,13 +125,3 @@ use the <link linkend="bubble">What's This?</link> feature.</para>
 
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/credits.docbook b/doc/konqueror/credits.docbook
index 02155b3f4..1ee11b2e6 100644
--- a/doc/konqueror/credits.docbook
+++ b/doc/konqueror/credits.docbook
@@ -170,13 +170,3 @@ to applet support)</para></listitem>
 &underGPL;
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/faq.docbook b/doc/konqueror/faq.docbook
index f85f1931d..863298a9b 100644
--- a/doc/konqueror/faq.docbook
+++ b/doc/konqueror/faq.docbook
@@ -157,13 +157,3 @@ http://www.konqueror.org/konq-java.html</ulink>.</para>
 </qandaset>
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/filemanager.docbook b/doc/konqueror/filemanager.docbook
index ee73d7963..9774213b6 100644
--- a/doc/konqueror/filemanager.docbook
+++ b/doc/konqueror/filemanager.docbook
@@ -886,13 +886,3 @@ you make in the normal file manager view.</para>
 </sect1>
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/index.docbook b/doc/konqueror/index.docbook
index a48974b89..f7c3b17a0 100644
--- a/doc/konqueror/index.docbook
+++ b/doc/konqueror/index.docbook
@@ -98,13 +98,3 @@ url="http://www.kde.org">http://www.kde.org</ulink>.</para>
 
 &documentation.index; 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
diff --git a/doc/konqueror/introduction.docbook b/doc/konqueror/introduction.docbook
index fc57dbaa4..82684dbfa 100644
--- a/doc/konqueror/introduction.docbook
+++ b/doc/konqueror/introduction.docbook
@@ -51,14 +51,3 @@ saved for easy recall as needed.
 </para>
 
 </chapter>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/man-kbookmarkmerger.1.docbook b/doc/konqueror/man-kbookmarkmerger.1.docbook
index dc041c71d..1a5fbeaed 100644
--- a/doc/konqueror/man-kbookmarkmerger.1.docbook
+++ b/doc/konqueror/man-kbookmarkmerger.1.docbook
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- vim:set ts=4 noet syntax=xml: -->
 <!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
 <!ENTITY % English "INCLUDE">
 <!ENTITY kbookmarkmerger "<command>kbookmarkmerger</command>">
diff --git a/doc/konqueror/path-complete.docbook b/doc/konqueror/path-complete.docbook
index a05f0845c..832b976ab 100644
--- a/doc/konqueror/path-complete.docbook
+++ b/doc/konqueror/path-complete.docbook
@@ -70,13 +70,3 @@ Text Completion function can be viewed and edited in the <guilabel>History
 
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/plugins.docbook b/doc/konqueror/plugins.docbook
index 4cb56795d..2e36d36a6 100644
--- a/doc/konqueror/plugins.docbook
+++ b/doc/konqueror/plugins.docbook
@@ -150,13 +150,3 @@ Navigation Panel. You can drag songs or videos onto this page to play them.
 
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/save-settings.docbook b/doc/konqueror/save-settings.docbook
index 2eab552ea..63ef2fa5b 100644
--- a/doc/konqueror/save-settings.docbook
+++ b/doc/konqueror/save-settings.docbook
@@ -80,13 +80,3 @@ suitable icon.</para></note>
 
 </sect1>
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konqueror/sidebar.docbook b/doc/konqueror/sidebar.docbook
index 14e82bcd9..b25976847 100644
--- a/doc/konqueror/sidebar.docbook
+++ b/doc/konqueror/sidebar.docbook
@@ -189,13 +189,3 @@ change the &URL; (path) of the folder viewed in that page.</para></listitem>
 
 
 </chapter>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-sgml-parent-document:("index.docbook" "book" "chapter")
-End:
--->
diff --git a/doc/konsole/index.docbook b/doc/konsole/index.docbook
index c39af3e13..a11c0dd17 100644
--- a/doc/konsole/index.docbook
+++ b/doc/konsole/index.docbook
@@ -1452,14 +1452,3 @@ FreeBSD</ulink></para></listitem>
 &documentation.index;
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-sgml-general-insert-case: lower
-End:
--->
-
-
diff --git a/doc/kpager/index.docbook b/doc/kpager/index.docbook
index 25f47af07..b618c4157 100644
--- a/doc/kpager/index.docbook
+++ b/doc/kpager/index.docbook
@@ -370,12 +370,3 @@ installation of the main &tde; packages.</para>
 &documentation.index; 
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes: nil
-sgml-general-insert-case: lower
-End:
--->
-
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index f92e36a96..08ca89534 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -607,7 +607,7 @@ follows:</para>
 
 <programlisting>
 DCOPClient *c = kapp-&gt;dcopClient();
-QString error;
+TQString error;
 QCString KSplashName;
 int pid = 0;
 QStringList args;
@@ -644,10 +644,10 @@ data))
 <para>Whenever you want to display a message with or without an icon, use</para>
 
 <programlisting>
-    arg &lt;&lt; QString("iconName") &lt;&lt; QString("programName") &lt;&lt;
-QString("Some description");
+    arg &lt;&lt; TQString("iconName") &lt;&lt; TQString("programName") &lt;&lt;
+TQString("Some description");
     if (!(c-&gt;send(KSplashName, "KSplashIface",
-"programStarted(QString,QString,QString)", data))
+"programStarted(TQString,TQString,TQString)", data))
     {
       // Some error processing here.
     }
@@ -791,7 +791,7 @@ functions <function>slotSetText</function>,
 <function>slotSetPixmap</function>, <function>slotUpdateProgress</function> and
 <function>slotUpdateSteps</function> to make it usable.</para></listitem>
 <listitem><para>The constructor should take the form
-<literal>ThemeEngine( QWidget *parent, const char *name, const QStringList
+<literal>ThemeEngine( TQWidget *parent, const char *name, const QStringList
 &amp;args )</literal>
 so that it can be used with
 <classname>KGenericFactory</classname>.</para></listitem>
@@ -822,7 +822,7 @@ class RotWidget;
 
 class Cfg2k: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Cfg2k( TDEConfig * );
 };
@@ -830,13 +830,13 @@ public:
 class ObjKsTheme;
 class Theme2k: public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
-  Theme2k( QWidget *, const char *, const QStringList&amp; );
+  Theme2k( TQWidget *, const char *, const QStringList&amp; );
 
-  inline const QString name()
+  inline const TQString name()
   {
-    return( QString("KSplash2k") );
+    return( TQString("KSplash2k") );
   }
   inline const KDialogBase *config( TDEConfig *kc )
   {
@@ -853,7 +853,7 @@ public:
   };
 
 public slots:
-  inline void slotSetText( const QString&amp; s )
+  inline void slotSetText( const TQString&amp; s )
   {
     if( mText &amp;&amp; mText-&gt;text() != s ) mText-&gt;setText( s );
   };
@@ -864,9 +864,9 @@ private:
 
   QLabel *mText;
   RotWidget *mRotator;
-  QColor mTBgColor, mTFgColor, mRotColor1, mRotColor2, mStatusColor;
+  TQColor mTBgColor, mTFgColor, mRotColor1, mRotColor2, mStatusColor;
   int mRotSpeed;
-  QString mWndTitle, mLogoFile;
+  TQString mWndTitle, mLogoFile;
 };
 
 #endif
@@ -878,7 +878,7 @@ the naming conventions, and is inherited from
 <classname>ThemeEngine</classname>. It provides
 a <methodname>Theme2k::names()</methodname>, and has a constructor that takes
 the required
-parameters: <function>Theme2k( QWidget *, const char *, const QStringList&amp;
+parameters: <function>Theme2k( TQWidget *, const char *, const QStringList&amp;
 );</function>
 and also provides a simple <methodname>Theme2k::slotSetText()</methodname>
 method. For the moment,
@@ -913,7 +913,7 @@ straightforward.</para>
 <example>
 <title>Plugin constructor</title>
 <programlisting>
-Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args
+Theme2k::Theme2k( TQWidget *parent, const char *name, const QStringList &amp;args
  )
     :ThemeEngine( parent, name, args )
 {
@@ -938,10 +938,10 @@ void Theme2k::readSettings()
   if( !cfg )
     return;
 
-  cfg-&gt;setGroup( QString("KSplash Theme: %1").arg(mTheme-&gt;theme()) );
+  cfg-&gt;setGroup( TQString("KSplash Theme: %1").arg(mTheme-&gt;theme()) );
 
-  QColor DefaultTBgColor( Qt::darkBlue );
-  QColor DefaultTFgColor( Qt::white );
+  TQColor DefaultTBgColor( TQt::darkBlue );
+  TQColor DefaultTFgColor( TQt::white );
 
   mTBgColor = cfg-&gt;readColorEntry( "Title Background Color",
 &amp;DefaultTBgColor );
@@ -949,14 +949,14 @@ void Theme2k::readSettings()
 &amp;DefaultTFgColor );
   mStatusColor = cfg-&gt;readColorEntry("Status Text Color", &amp;mTBgColor );
 
-  QColor DefaultRot1( Qt::darkBlue );
-  QColor DefaultRot2( Qt::cyan );
+  TQColor DefaultRot1( TQt::darkBlue );
+  TQColor DefaultRot2( TQt::cyan );
   mRotColor1 = cfg-&gt;readColorEntry( "Rotator Color 1", &amp;DefaultRot1 );
   mRotColor2 = cfg-&gt;readColorEntry( "Rotator Color 2", &amp;DefaultRot2 );
 
   mRotSpeed = cfg-&gt;readNumEntry( "Rotator Speed", 30 );
   mWndTitle = cfg-&gt;readEntry( "Window Title", i18n("Please wait...") );
-  mLogoFile = cfg-&gt;readEntry( "Logo File", QString::null );
+  mLogoFile = cfg-&gt;readEntry( "Logo File", TQString::null );
 }
 </programlisting>
 </example>
@@ -1112,7 +1112,7 @@ K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory&lt;Theme2k&gt; );
 Cfg2k::Cfg2k( TDEConfig * )
 {}
 
-Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &amp;args
+Theme2k::Theme2k( TQWidget *parent, const char *name, const QStringList &amp;args
  )
     :ThemeEngine( parent, name, args )
 {
@@ -1134,10 +1134,10 @@ void Theme2k::initUi()
   lbl-&gt;setPaletteForegroundColor( mTFgColor );
 
   QLabel *logo = new QLabel( vbox );
-  logo-&gt;setPalette( Qt::white );
+  logo-&gt;setPalette( TQt::white );
 
-  QString px( locate( "appdata", mTheme-&gt;themeDir() +
-(mLogoFile.isNull()?QString("/Logo.png"):mLogoFile) ) );
+  TQString px( locate( "appdata", mTheme-&gt;themeDir() +
+(mLogoFile.isNull()?TQString("/Logo.png"):mLogoFile) ) );
   if (px.isNull())
     px = locate("appdata","Themes/Default/splash_top.png");
   if( !px.isNull() )
@@ -1178,10 +1178,10 @@ void Theme2k::readSettings()
   if( !cfg )
     return;
 
-  cfg-&gt;setGroup( QString("KSplash Theme: %1").arg(mTheme-&gt;theme()) );
+  cfg-&gt;setGroup( TQString("KSplash Theme: %1").arg(mTheme-&gt;theme()) );
 
-  QColor DefaultTBgColor( Qt::darkBlue );
-  QColor DefaultTFgColor( Qt::white );
+  TQColor DefaultTBgColor( TQt::darkBlue );
+  TQColor DefaultTFgColor( TQt::white );
 
   mTBgColor = cfg-&gt;readColorEntry( "Title Background Color",
 &amp;DefaultTBgColor );
@@ -1189,14 +1189,14 @@ void Theme2k::readSettings()
 &amp;DefaultTFgColor );
   mStatusColor = cfg-&gt;readColorEntry("Status Text Color", &amp;mTBgColor );
 
-  QColor DefaultRot1( Qt::darkBlue );
-  QColor DefaultRot2( Qt::cyan );
+  TQColor DefaultRot1( TQt::darkBlue );
+  TQColor DefaultRot2( TQt::cyan );
   mRotColor1 = cfg-&gt;readColorEntry( "Rotator Color 1", &amp;DefaultRot1 );
   mRotColor2 = cfg-&gt;readColorEntry( "Rotator Color 2", &amp;DefaultRot2 );
 
   mRotSpeed = cfg-&gt;readNumEntry( "Rotator Speed", 30 );
   mWndTitle = cfg-&gt;readEntry( "Window Title", i18n("Please wait...") );
-  mLogoFile = cfg-&gt;readEntry( "Logo File", QString::null );
+  mLogoFile = cfg-&gt;readEntry( "Logo File", TQString::null );
 }
 </programlisting>
 </sect1>
@@ -1216,11 +1216,11 @@ void Theme2k::readSettings()
 /**
  * @short Display a rotating-gradient widget.
  */
-class 	RotWidget: public QWidget
+class 	RotWidget: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
-  RotWidget( QWidget *, const QColor&amp;, const QColor&amp;, int );
+  RotWidget( TQWidget *, const TQColor&amp;, const TQColor&amp;, int );
   ~RotWidget();
 
 private slots:
@@ -1231,7 +1231,7 @@ protected:
   void	paintEvent( QPaintEvent * );
   void	resizeEvent( QResizeEvent * );
 
-  QColor m_color1, m_color2;
+  TQColor m_color1, m_color2;
   int m_step, m_speed;
   QTimer *m_stepTimer;
 
@@ -1255,9 +1255,9 @@ protected:
 #include "rotwidget.h"
 #include "rotwidget.moc"
 
-RotWidget::RotWidget( QWidget *parent, const QColor&amp; c1, const QColor&amp;
+RotWidget::RotWidget( TQWidget *parent, const TQColor&amp; c1, const TQColor&amp;
 c2, int sp )
-    :QWidget(parent), m_color1(c1), m_color2(c2), m_step(0), m_speed(sp)
+    :TQWidget(parent), m_color1(c1), m_color2(c2), m_step(0), m_speed(sp)
 {
   if( (m_speed &lt;= 0) || (m_speed &gt; 20) )
     m_speed = 1;
@@ -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 );
 }
 
@@ -1296,7 +1296,7 @@ void RotWidget::paintEvent( QPaintEvent *pe )
     bitBlt( this, r.x(), r.y(), m_stepPixmap.at( m_step ), r.x(), r.y(),
 r.width(), r.height() );
   else
-    p.fillRect( rect(), Qt::black );
+    p.fillRect( rect(), TQt::black );
   p.end();
 }
 
@@ -1350,15 +1350,3 @@ KPixmapEffect::HorizontalGradient );
 
 &documentation.index;
 </book>
-
-<!--
-Local Variables:
-mode: xml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-vim:tabstop=2:shiftwidth=2:expandtab
--->
diff --git a/doc/ksysguard/index.docbook b/doc/ksysguard/index.docbook
index c596315e4..06c87e53e 100644
--- a/doc/ksysguard/index.docbook
+++ b/doc/ksysguard/index.docbook
@@ -486,11 +486,3 @@ have worked on <application>KTop</application>:</para>
 </chapter>
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/kwrite/index.docbook b/doc/kwrite/index.docbook
index 8b8d1d389..b21989121 100644
--- a/doc/kwrite/index.docbook
+++ b/doc/kwrite/index.docbook
@@ -567,8 +567,8 @@ The toolbar, which is located at the top of the dialog, has left and
 right arrow buttons that let the user move back and forth through
 previously selected folders as well as an up arrow button for moving
 up the folder tree. The button with the little house takes the user
-to his or her home folder and the one with the two arrows curved in
-on each other updates the view of the current folder. The flag button
+to their home folder and the one with the two arrows curved in on
+each other updates the view of the current folder. The flag button
 lets the user set a new bookmark at the current folder or go to one
 that was previously set.
 </para>
@@ -1690,7 +1690,7 @@ a key combination for the command in question by means of the check boxes and
 key button. For example, with the About &tde; command selected in the display
 window, the user could select &Ctrl; and <keycap>Alt</keycap>, click on  the key
 button, and then press the <keycap>K</keycap> key on the keyboard.  This would
-mean that anytime he or she held down the &Ctrl; and  <keycap>Alt</keycap>
+mean that anytime they held down the &Ctrl; and  <keycap>Alt</keycap>
 buttons and pressed <keycap>K</keycap> (while using
 &kwrite;) the About &tde; display box would be called.</para>
 </listitem>
@@ -1822,7 +1822,7 @@ along the bottom of the box the user can control the process.
 </para>
 
 <para>
-She or he may invoke the <guilabel>Help</guilabel> system, accept the
+They may invoke the <guilabel>Help</guilabel> system, accept the
 current settings and close the dialog by means of the
 <guibutton>OK</guibutton> button, or <guibutton>Cancel</guibutton> the
 process. The categories <guilabel>Colors</guilabel>,
@@ -2623,7 +2623,7 @@ follows:</para>
 <para>
 The user can configure the default appearance for
 particular items. This would allow a programmer to more easily identify
-different items (types of entries) in his or her code.
+different items (types of entries) in their code.
 </para>
 
 <variablelist>
@@ -2947,14 +2947,3 @@ Converted to docbook/proofreading by &Lauri.Watts; &Lauri.Watts.mail;
 
 &documentation.index;
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-namecase-general: t
-sgml-namecase-entity: nil
-sgml-general-insert-case: lower
-sgml-minimize-attributes: nil
-sgml-omittag: nil
-End:
--->
-
diff --git a/doc/kxkb/index.docbook b/doc/kxkb/index.docbook
index 88e858fe8..278f588a9 100644
--- a/doc/kxkb/index.docbook
+++ b/doc/kxkb/index.docbook
@@ -348,11 +348,3 @@ have worked on <application>kxkb</application>:</para>
 </chapter>
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/man/appletproxy.1 b/doc/man/appletproxy.1
new file mode 100644
index 000000000..3ab13208f
--- /dev/null
+++ b/doc/man/appletproxy.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH APPLETPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel applet proxy"
+.SH NAME
+appletproxy
+\- TDE kicker panel applet proxy
+.SH SYNOPSIS
+\fBappletproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
+.SH DESCRIPTION
+\fBappletproxy\fP is a small application that allows you to run a kicker applet outside of \fBkicker\fP itself. The applet will appear in it's own window, making this a convenient way to debug panel applets.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B desktopfile
+The applet's desktop file
+.SS 
+.SS Options:
+.TP
+.B  \-\-configfile  <file>
+The config file to be used
+.TP
+.B  \-\-callbackid  <id>
+DCOP callback id of the applet container
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS
+.SH FILES
+\fI/usr/share/apps/kicker/applets\fP
+kicker applets directory
+.SH SEE ALSO
+\fBkicker\fP(1), \fBextensionproxy\fP(1)
+.SH AUTHORS
+.nf
+Matthias Elter <elter@kde.org>
+.br
+Matthias Ettrich <ettrich@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/drkonqi.1 b/doc/man/drkonqi.1
new file mode 100644
index 000000000..987164834
--- /dev/null
+++ b/doc/man/drkonqi.1
@@ -0,0 +1,175 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH DRKONQI 1 "June 2006" "Trinity Desktop Environment" "TDE crash handler"
+.SH NAME
+drkonqi
+\- TDE crash handler gives the user feedback if a program crashed
+.SH SYNOPSIS
+\fBdrkonqi\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+The TDE crash handler gives the user feedback if a program crashed.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-signal  <number>
+The signal number that was caught
+.TP
+.B  \-\-appname  <name>
+Name of the program
+.TP
+.B  \-\-apppath  <path>
+Path to the executable
+.TP
+.B  \-\-appversion  <version>
+The version of the program
+.TP
+.B  \-\-bugaddress  <address>
+The bug address to use
+.TP
+.B  \-\-programname  <name>
+Translated name of the program
+.TP
+.B  \-\-pid  <pid>
+The PID of the program
+.TP
+.B  \-\-startupid  <id>
+Startup ID of the program
+.TP
+.B  \-\-tdeinit  
+The program was started by tdeinit
+.TP
+.B  \-\-safer  
+Disable arbitrary disk access
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Hans Petter Bieker <bieker@kde.org>
+.br
+
+.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/extensionproxy.1 b/doc/man/extensionproxy.1
new file mode 100644
index 000000000..4ea041189
--- /dev/null
+++ b/doc/man/extensionproxy.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH EXTENSIONPROXY 1 "June 2006" "Trinity Desktop Environment" "Panel extension proxy"
+.SH NAME
+extensionproxy
+\- TDE kicker panel extension proxy
+.SH SYNOPSIS
+\fBextensionproxy\fP [Qt\-options] [TDE\-options] \fIdesktopfile\fP
+.SH DESCRIPTION
+\fBextensionproxy\fP is a small application that allows you to run a kicker extension outside of \fBkicker\fP itself.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B desktopfile
+The extension's desktop file
+.SS 
+.SS Options:
+.TP
+.B  \-\-configfile  <file>
+The config file to be used
+.TP
+.B  \-\-callbackid  <id>
+DCOP callback id of the extension container
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS
+.SH FILES
+\fI/usr/share/apps/kicker/extensions\fP
+kicker extensions directory
+.SH SEE ALSO
+\fBkicker\fP(1), \fBappletproxy\fP(1)
+.SH AUTHORS
+.nf
+Matthias Elter <elter@kde.org>
+.br
+Matthias Ettrich <ettrich@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/gentdmconf.1 b/doc/man/gentdmconf.1
new file mode 100644
index 000000000..d98e166c2
--- /dev/null
+++ b/doc/man/gentdmconf.1
@@ -0,0 +1,91 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH GENTDMCONF 1 "June 2006" "Trinity Desktop Environment" "generate configuration files for tdm"
+.SH NAME
+gentdmconf
+\- generate configuration files for tdm
+.SH SYNOPSIS
+\fBgentdmconf\fP
+.RB [ \-\-in
+.IR /path/to/new/tdm\-config\-dir ]
+.RS 11
+.RB [ \-\-old\-xdm
+.IR /path/to/old/xdm\-dir ]
+.br
+.RB [ \-\-old\-kde
+.IR /path/to/old/kde\-config\-dir ]
+.br
+.RB [ \-\-no\-old ]
+.RB [ \-\-no\-old\-xdm ]
+.RB [ \-\-no\-old\-kde ]
+.RB [ \-\-old\-scripts ]
+.br
+.RB [ \-\-no\-old\-scripts ]
+.RB [ \-\-old\-confs ]
+.RB [ \-\-no\-backup ]
+.br
+.RB [ \-\-no\-in\-notice ]
+.RE
+
+.SH DESCRIPTION
+\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP.
+.br
+If an older xdm/tdm configuration is found, its config files are "absorbed";
+if it lives in the new target directory, its scripts are reused (and possibly
+modified) as well, otherwise the scripts are ignored and default scripts are
+installed.
+.SH OPTIONS
+.TP
+.BI \-\-in \ /path/to/new/tdm\-config\-dir
+In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected.
+.br
+Default is \fI/etc/trinity/tdm\fP.
+.TP
+.BI \-\-old\-xdm \ /path/to/old/xdm\-dir
+Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan
+.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ;
+there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP.
+.br
+Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect.
+.TP
+.BI \-\-old\-kde \ /path/to/old/kde\-config\-dir
+Where to look for the \fItdmrc\fP of an older \fBtdm\fP.
+.br
+.RI Default\ is\ to\ scan\  /etc/trinity \ and\ { /usr,/usr/local ,
+.RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config .
+.TP
+.B \-\-no\-old
+Don't look at older xdm/tdm configurations, just create default config.
+.TP
+.B \-\-no\-old\-xdm
+Don't look at older xdm configurations.
+.TP
+.B \-\-no\-old\-kde
+Don't look at older tdm configurations.
+.TP
+.B \-\-old\-scripts
+Directly use all scripts from the older xdm/tdm configuration.
+.TP
+.B \-\-no\-old\-scripts
+Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory.
+.TP
+.B \-\-old\-confs
+Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea.
+.TP
+.B \-\-no\-backup
+Overwrite/delete old config files instead of backing them up.
+.TP
+.B \-\-no\-in\-notice
+Don't put the notice about \fB\-\-in\fP being used into the generated README.
+.SH SEE ALSO
+.BR tdm (1)
+.SH AUTHORS
+.nf
+Oswald Buddenhagen <ossi@kde.org>
+
+.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/kappfinder.1 b/doc/man/kappfinder.1
new file mode 100644
index 000000000..ec8eae964
--- /dev/null
+++ b/doc/man/kappfinder.1
@@ -0,0 +1,54 @@
+.TH KAPPFINDER 1 "August, 24 2003"
+.SH NAME
+kappfinder \- searches for program to add to the Kde menu
+.SH SYNOPSIS
+.B kappfinder
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kappfinder
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkappfinder\fP is a program that searches your system for applications that can be inserted in the TDE menu, but that are not yet there. User can then select individually each of them and choose whether to add them.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-\-dir directory
+Use this option to set where the .desktop files will be installed (default is $(HOME)/.trinity/share/applnk
+
+.SH SEE ALSO
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kappfinder was written by the KDE project
diff --git a/doc/man/kasbar.1 b/doc/man/kasbar.1
new file mode 100644
index 000000000..7d57958d2
--- /dev/null
+++ b/doc/man/kasbar.1
@@ -0,0 +1,148 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KASBAR 1 "June 2006" "Trinity Desktop Environment" "An alternative task manager"
+.SH NAME
+kasbar
+\- An alternative task manager
+.SH SYNOPSIS
+\fBkasbar\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+The \fBKasBar\fP is an iconic replacement of the taskbar. It always shows the icons of all currently running applications on any desktop, they can be chosen by clicking with the left mouse button. The active window is highlighted, minimized windows will show a little triangle pointing downwards instead of the square in the lower right of the icons. A triangle pointing to the right indicates that the application is shaded.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-test  
+Test the basic kasbar code
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH SEE ALSO
+\fBkicker\fP(1)
+.SH AUTHORS
+.nf
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/kate.1 b/doc/man/kate.1
new file mode 100644
index 000000000..e48268d6f
--- /dev/null
+++ b/doc/man/kate.1
@@ -0,0 +1,83 @@
+.TH KATE 1 "May 2006"
+.SH NAME
+kate \- TDE Advanced Text Editor
+.SH SYNOPSIS
+.B kate
+.RI [ options ] [file(s)]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kate
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkate\fP is a powerful text editor for TDE. It allows multiple documents (MDI interface), syntax coloration for many languages, ...
+
+It is able to expand or collapse parts of code (C functions, ...), can handle complete projects, and includes a terminal emulator.
+
+Kate is primarily intended for developers but can be used by anyone. It will for example be very useful to edit configuration files for example.
+
+It can handle plugins to expand its capabilities (more languages support, vim/Emacs compatibility, ...)
+
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-s, \-\-start <name>
+Start Kate with a given session
+.TP
+.B \-u, \-\-use
+Use a already running kate instance (if possible)
+.TP
+.B \-p, \-\-pid <pid>
+Only try to reuse kate instance with this pid
+.TP
+.B \-e, \-\-encoding <name>
+Set encoding for the file to open
+.TP
+.B \-l, \-\-line <line>
+Navigate to this line
+.TP
+.B \-c, \-\-column <column>
+Navigate to this column
+.TP
+.B \-i, \-\-stdin
+Read the contents of stdin
+.TP
+.B file(s)
+is the file or the files to open
+
+.SH SEE ALSO
+.BR kwrite (1)
+.PP
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>, for Debian GNU/Linux, but may be used by others.
+.PP
+kate was written by the KDE project
diff --git a/doc/man/kblankscrn.kss.1 b/doc/man/kblankscrn.kss.1
new file mode 100644
index 000000000..46b2d4e1a
--- /dev/null
+++ b/doc/man/kblankscrn.kss.1
@@ -0,0 +1,156 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KBLANKSCRN.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
+.SH NAME
+kblankscrn.kss
+\- TDE screensaver which shows a blank screen
+.SH SYNOPSIS
+\fBkblankscrn.kss\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBKBlankScreen\fP is a screensaver which shows a blank screen.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-setup  
+Setup screen saver
+.TP
+.B  \-\-window\-id  wid
+Run in the specified XWindow
+.TP
+.B  \-\-root  
+Run in the root XWindow
+.TP
+.B  \-\-demo  
+Start screen saver in demo mode [default]
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+The KDE Project <www.kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/kcheckpass.1 b/doc/man/kcheckpass.1
new file mode 100644
index 000000000..fa5a4c817
--- /dev/null
+++ b/doc/man/kcheckpass.1
@@ -0,0 +1,49 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH  KCHECKPASS 1 "June 2006" "Trinity Desktop Environment" "authentication software"
+.SH NAME
+kcheckpass
+\- The KCheckPass authentication software
+.SH SYNOPSIS
+\fBkcheckpass\fP
+.SH DESCRIPTION
+\fBKCheckPass\fP is TDE's authentication program. It is meant to be
+used by any software in need of user authentication, most
+notably screensavers.
+.sp 1
+It enhances security be the following means:
+.br
+.IP "     \-"
+It's only a small program, which is hopefully simple enough to
+allow it to be SUID root. Setting it to SUID root is necessary
+on Shadow Password systems.
+.IP "     \-"
+No other program in need of user authentication, must be
+SUID root.
+.IP "     \-"
+It provides a single implementation to check passwords. So one only must take a closer look at \fBKCheckPass\fP to ensure password security. It's much easier for programs using \fBKCheckPass\fP to preserve security.
+.PP
+.br
+\fBTechnique:\fP
+.sp 1
+\fBKCheckPass\fP is a simple password checker. Just invoke and send it the password on stdin.
+.sp 1
+If the password was accepted, the program exits with 0;
+.br
+if it was rejected, it exits with 1. Any other exit code signals an error.
+
+.SH AUTHORS
+.nf
+Olaf Kirch <okir@caldera.de>
+.br
+Christian Esken <esken@kde.org>
+.br
+Oswald Buddenhagen <ossi@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/kcminit.1 b/doc/man/kcminit.1
new file mode 100644
index 000000000..4c557456e
--- /dev/null
+++ b/doc/man/kcminit.1
@@ -0,0 +1,153 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KCMINIT 1 "June 2006" "Trinity Desktop Environment" "Trinity Control Modules initialization"
+.SH NAME
+kcminit
+\- runs startups initialization for Control Modules.
+.SH SYNOPSIS
+\fBkcminit\fP [Qt\-options] [TDE\-options] [options] module 
+.SH DESCRIPTION
+\fBkcminit\fP runs startups initialization for Control Modules.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B module
+Configuration module to run
+.SS Options:
+.TP
+.B  \-\-list  
+List modules that are run at startup
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
+
+.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/kdcop.1 b/doc/man/kdcop.1
new file mode 100644
index 000000000..1c01dcc47
--- /dev/null
+++ b/doc/man/kdcop.1
@@ -0,0 +1,159 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KDCOP 1 "June 2006" "Trinity Desktop Environment" "A graphical DCOP browser/client"
+.SH NAME
+kdcop
+\- A graphical DCOP browser/client
+.SH SYNOPSIS
+\fBkdcop\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+\fBkdcop\fP is a browser/executor for DCOP. It queries the DCOP clients in a system,
+their interfaces, and the interfaces' arguments. You can even execute DCOP
+calls by double\-clicking on a call. If the method has parameters, \fBkdcop\fP will
+open a dialog and prompt you for them. If the method returns a return value,
+you will see it in a message box after the call.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kdcop/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kdcop/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Matthias Kalle Dalheimer <kalle@kde.org>
+.br
+Rik Hemsley <rik@kde.org>
+.br
+Ian Reinhart Geiser <geiseri@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/kdialog.1 b/doc/man/kdialog.1
new file mode 100644
index 000000000..243709ed1
--- /dev/null
+++ b/doc/man/kdialog.1
@@ -0,0 +1,209 @@
+.TH KDIALOG "1" "December 2002" "TDE" "TDE Application"
+.SH NAME
+kdialog \- Show TDE dialog boxes from shell scripts
+.SH SYNOPSIS
+.B kdialog
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIarg\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kdialog
+TDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+.B kdialog
+allows to display dialog boxes from shell scripts.
+The syntax is very much inspired from the 
+.B dialog
+command
+(which shows text mode dialogs).
+.SH OPTIONS
+.TP
+.BI \-\-yesno " text"
+Question message box with yes/no buttons
+.TP
+.BI \-\-yesnocancel " text"
+Question message box with yes/no/cancel buttons
+.TP
+.BI \-\-warningyesno " text"
+Warning message box with yes/no buttons
+.TP
+.BI \-\-warningcontinuecancel " text"
+Warning message box with continue/cancel buttons
+.TP
+.BI \-\-warningyesnocancel " text"
+Warning message box with yes/no/cancel buttons
+.TP
+.BI \-\-sorry " text"
+\&'Sorry' message box
+.TP
+.BI \-\-error " text"
+\&'Error' message box
+.TP
+.BI \-\-msgbox " text"
+Message Box dialog
+.TP
+.BI \-\-inputbox " text init"
+Input Box dialog
+.TP
+.BI \-\-password " text"
+Password dialog
+.TP
+.RI \fB\-\-textbox\fP \ file " [" width "] [" height ]
+Text Box dialog
+.TP
+.RI \fB\-\-menu\fP \ text " [" "tag item" "] [" "tag item" "] ..."
+Menu dialog
+.TP
+.RI \fB\-\-checklist\fP \ text " [" "tag item status" "] ..."
+Check List dialog
+.TP
+.RI \fB\-\-radiolist\fP " text" " [" "tag item status" "] ..."
+Radio List dialog
+.TP
+.BI \-\-title " text"
+Dialog title
+.TP
+.B \-\-separate\-output
+Return list items on separate lines (for checklist option)
+.SS "Arguments:"
+.TP
+arg
+Arguments - depending on main option
+.SS "Generic options:"
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-tde
+Show TDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.SS "Qt options:"
+.TP
+.BI \-\-display \ displayname
+Use the X-server display \fIdisplayname\fP.
+.TP
+.BI \-\-session \ sessionId
+Restore the application for the given \fIsessionId\fP.
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.BI \-\-ncols \ count
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+running under a debugger can cause an implicit
+.B \-nograb, use \fB\-dograb\fR to override.
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging.
+.TP
+.BI "\-\-fn\fR, \fP\-\-font" \ fontname
+defines the application font.
+.TP
+.BI "-\-bg\fR, \fB\-\-background"  \ color
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
+sets the default foreground color.
+.TP
+.BI \-\-btn\fR, \fB\-\-button \ color
+sets the default button color.
+.TP
+.BI \-\-name \ name
+sets the application name.
+.TP
+.BI \-\-title \ title
+sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.BI \-\-inputstyle \ inputstyle
+sets XIM (X Input Method) input style. Possible
+values are 
+.BR onthespot ", " overthespot ", " offthespot and root .
+.TP
+.BI \-\-im " XIM-server"
+set XIM server.
+.TP
+.B \-\-noxim
+disable XIM.
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets.
+.SS "TDE options:"
+.TP
+.BI \-\-caption \ caption
+Use \fIcaption\fP as name in the titlebar.
+.TP
+.BI \-\-icon \ icon
+Use \fIicon\fP as the application icon.
+.TP
+.BI \-\-miniicon \ icon
+Use \fIicon\fP as the icon in the titlebar.
+.TP
+.BI \-\-config \ filename
+Use alternative configuration file.
+.TP
+.BI \-\-dcopserver \ server
+Use the DCOP Server specified by \fIserver\fP.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.BI \-\-style \ style
+sets the application GUI style.
+.TP
+.BI \-\-geometry \ geometry
+sets the client geometry of the main widget.
+.SH AUTHOR
+KDialog was written by
+.nh
+.ad l
+David Faure <faure@kde.org>,
+Nick Thompson,
+Nick Thompson,
+Matthias Hoelzer <hoelzer@kde.org> and
+David Gumbel <david.guembel@gmx.net>.
+.br
+.hy
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+.ad l
+Karolina Lindqvist <pgd\-karolinali@algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/doc/man/keditbookmarks.1 b/doc/man/keditbookmarks.1
new file mode 100644
index 000000000..23606dccb
--- /dev/null
+++ b/doc/man/keditbookmarks.1
@@ -0,0 +1,181 @@
+.\" This file was generated by kdemangen.pl
+.TH KEDITBOOKMARKS 1 "Jan 2005" "Trinity Desktop Environment" "Konqueror Bookmarks Editor"
+.SH NAME
+keditbookmarks
+- Konqueror Bookmark Editor
+.SH SYNOPSIS
+keditbookmarks [Qt-options] [TDE-options] [options] [file] 
+.SH DESCRIPTION
+Bookmark editor for TDE.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B file
+File to edit
+.SS Options:
+.TP
+.B  --importmoz  <filename>
+Import bookmarks from a file in Mozilla format
+.TP
+.B  --importns  <filename>
+Import bookmarks from a file in Netscape (4.x and earlier) format
+.TP
+.B  --importie  <filename>
+Import bookmarks from a file in Internet Explorer's Favorites format
+.TP
+.B  --importopera  <filename>
+Import bookmarks from a file in Opera format
+.TP
+.B  --exportmoz  <filename>
+Export bookmarks to a file in Mozilla format
+.TP
+.B  --exportns  <filename>
+Export bookmarks to a file in Netscape (4.x and earlier) format
+.TP
+.B  --exporthtml  <filename>
+Export bookmarks to a file in a printable HTML format
+.TP
+.B  --exportie  <filename>
+Export bookmarks to a file in Internet Explorer's Favorites format
+.TP
+.B  --exportopera  <filename>
+Export bookmarks to a file in Opera format
+.TP
+.B  --address  <address>
+Open at the given position in the bookmarks file
+.TP
+.B  --customcaption  <caption>
+Set the user readable caption for example "Konsole"
+.TP
+.B  --nobrowser  
+Hide all browser related functions
+.SS 
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-tde  
+Show TDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  --display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  --session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  --cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  --ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  --nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  --dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  --sync  
+switches to synchronous mode for debugging
+.TP
+.B --fn,  --font  <fontname>
+defines the application font
+.TP
+.B --bg,  --background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg,  --foreground  <color>
+sets the default foreground color
+.TP
+.B --btn,  --button  <color>
+sets the default button color
+.TP
+.B  --name  <name>
+sets the application name
+.TP
+.B  --title  <title>
+sets the application title (caption)
+.TP
+.B  --visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  --inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  --im  <XIM server>
+set XIM server
+.TP
+.B  --noxim  
+disable XIM
+.TP
+.B  --reverse  
+mirrors the whole layout of widgets
+.SS 
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+.br
+Alexander Kellett <lypanov@kde.org>
+.br
+
diff --git a/doc/man/kfind.1 b/doc/man/kfind.1
new file mode 100644
index 000000000..55542fd66
--- /dev/null
+++ b/doc/man/kfind.1
@@ -0,0 +1,58 @@
+.TH KFIND 1 "August, 25 2003"
+.SH NAME
+kfind \- TDE find tool
+.SH SYNOPSIS
+.B kfind
+.RI [ options ]  [searchpath]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kfind
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkfind\fP is a find tool for TDE. It allows fine tuning of the search options (name, path, type, plain text search, meta search, modification date, size, user, group, ...)
+
+It also permits to save the results of the search in a file, which is a plain-text list of file URIs. (file:/path_to_file)
+
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+
+.TP
+.B searchpath
+is the path in which the search must be done
+
+.SH SEE ALSO
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kfind was written by the KDE project
diff --git a/doc/man/kfmclient.1 b/doc/man/kfmclient.1
new file mode 100644
index 000000000..67cbed380
--- /dev/null
+++ b/doc/man/kfmclient.1
@@ -0,0 +1,222 @@
+.\" This file was generated by kdemangen.pl
+.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
+.TH KFMCLIENT 1 "Jan 2005" "Trinity Desktop Environment" "TDE tool for opening URLs from the command line"
+.SH NAME
+kfmclient
+- TDE tool for opening URLs from the command line
+.SH SYNOPSIS
+kfmclient [Qt-options] [TDE-options] [options] command [URL(s)] 
+.SH DESCRIPTION
+kfmclient is a tool for opening local and remote URLs in Konqueror from
+the command line.
+.SH COMMANDS
+.SS
+.SS openURL
+.TP
+kfmclient openURL \fIurl\fR [ \fImimetype\fR ]
+Opens a window showing \fIurl\fR. \fIurl\fR may be a relative path or file name,
+such as . or subdir/. If \fIurl\fR is omitted, $HOME is used instead.
+
+If \fImimetype\fR is specified, it will be used to determine the component
+that Konqueror should use. For instance, set it to text/html for a web
+page, to make it appear faster.
+.SS newTab
+.TP
+kfmclient newTab \fIurl\fR [ \fImimetype\fR ]
+Same as above but opens a new tab with \fIurl\fR in an existing Konqueror
+window on the current active desktop if possible.
+.SS openProfile
+.TP
+kfmclient openProfile \fIprofile\fR [ \fIurl\fR ]
+Opens a window using the given profile. \fIprofile\fR is a file under
+~/.trinity/share/apps/konqueror/profiles. \fIurl\fR is an optional URL to open.
+.SS openProperties
+.TP
+kfmclient openProperties \fIurl\fR
+Opens a properties menu.
+.SS exec
+.TP
+kfmclient exec [ \fIurl\fR [ \fIbinding\fR ] ]
+Tries to execute \fIurl\fR. \fIurl\fR may be a usual URL, this URL will
+be opened. You may omit \fIbinding\fR. In this case the default binding
+is tried. Of course URL may be the URL of a document, or it may be a
+*.desktop file.
+This way you could for example mount a device by passing 'Mount default'
+as binding to 'cdrom.desktop'.
+.SS move
+.TP
+kfmclient move \fIsrc\fR \fIdest\fR
+Moves the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
+.SS copy
+.TP
+kfmclient copy \fIsrc\fR \fIdest\fR
+Copies the URL \fIsrc\fR to \fIdest\fR. \fIsrc\fR may be a list of URLs.
+.SS download
+.TP
+kfmclient download [ \fIsrc\fR ]
+Copies the URL \fIsrc\fR to a user specified location. \fIsrc\fR may be
+a list of URLs, if not present then a URL will be requested.
+.SS sortDesktop
+.TP
+kfmclient sortDesktop
+Rearranges all icons on the desktop.
+.SS configure
+.TP
+kfmclient configure
+Re-read Konqueror's configuration.
+.SS configureDesktop
+.TP
+kfmclient configureDesktop
+Re-read kdesktop's configuration.
+.SH OPTIONS
+.SS
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-tde  
+Show TDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  --display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  --session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  --cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  --ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  --nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  --dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  --sync  
+switches to synchronous mode for debugging
+.TP
+.B --fn,  --font  <fontname>
+defines the application font
+.TP
+.B --bg,  --background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg,  --foreground  <color>
+sets the default foreground color
+.TP
+.B --btn,  --button  <color>
+sets the default button color
+.TP
+.B  --name  <name>
+sets the application name
+.TP
+.B  --title  <title>
+sets the application title (caption)
+.TP
+.B  --visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  --inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  --im  <XIM server>
+set XIM server
+.TP
+.B  --noxim  
+disable XIM
+.TP
+.B  --reverse  
+mirrors the whole layout of widgets
+.SH EXAMPLES
+.TP
+kfmclient exec file:/root/Desktop/cdrom.desktop "Mount default"
+Mounts the CD-ROM.
+.TP
+kfmclient exec file:/home/weis/data/test.html
+Opens the file with default binding.
+.TP
+kfmclient exec file:/home/weis/data/test.html Netscape
+Opens the file with netscape.
+.TP
+kfmclient exec ftp://localhost/
+Opens new window with URL.
+.TP
+kfmclient exec file:/root/Desktop/emacs.desktop
+Starts emacs.
+.TP
+kfmclient exec file:/root/Desktop/cdrom.desktop
+Opens the CD-ROM's mount directory.
+.TP
+kfmclient exec .
+Opens the current directory. Very convenient.
+.SH OTHER
+This manual page was written by Adeodato Simo <asp16@alu.ua.es> for the
+Debian system (but may be used by others).
+
+This manual page can be redistribute and/or modified it under the terms
+of the GNU General Public License as published by the Free Software
+Foundation; version 2 dated June, 1991.
+.nf
diff --git a/doc/man/khotkeys.1 b/doc/man/khotkeys.1
new file mode 100644
index 000000000..34d754b05
--- /dev/null
+++ b/doc/man/khotkeys.1
@@ -0,0 +1,150 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KHOTKEYS 1 "June 2006" "Trinity Desktop Environment" "KHotKeys daemon"
+.SH NAME
+khotkeys
+\- daemon to bind actions to triggers and conditions
+.SH SYNOPSIS
+\fBkhotkeys\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+\fBKHotKeys\fP is a utility that allows you to bind actions to triggers and conditions. The most common case is where action means launching some  command/application/URL, the trigger is some key combination pressed and condition is some window being (not) active/existing.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS
+
+.SH FILES
+.I ~/.trinity/share/config/khotkeysrc
+\fBkhotkeys\fP configuration file
+
+.SH AUTHORS
+.nf
+Lubos Lunak <l.lunak@kde.org>
+
+.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/kicker.1 b/doc/man/kicker.1
new file mode 100644
index 000000000..1d17fa199
--- /dev/null
+++ b/doc/man/kicker.1
@@ -0,0 +1,171 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KICKER 1 "June 2006" "Trinity Desktop Environment" "The TDE panel"
+.SH NAME
+kicker
+\- The TDE panel
+.SH SYNOPSIS
+\fBkicker\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+\fBKicker\fP is the TDE application starter panel and is also capable of some useful applets and extensions. It usually resides on the bottom of the desktop.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+
+.SH SEE ALSO
+\fBkasbar\fP(1)
+.sp 1
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kicker/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kicker/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Aaron J. Seigo <aseigo@kde.org>
+.br
+Matthias Elter <elter@kde.org>
+.br
+Matthias Ettrich <ettrich@kde.org>
+.br
+Wilco Greven <greven@kde.org>
+.br
+Rik Hemsley <rik@kde.org>
+.br
+Daniel M. Duley <mosfet@kde.org>
+.br
+Preston Brown <pbrown@kde.org>
+.br
+John Firebaugh <jfirebaugh@kde.org>
+.br
+Waldo Bastian <bastian@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/kjobviewer.1 b/doc/man/kjobviewer.1
new file mode 100644
index 000000000..6dae2692e
--- /dev/null
+++ b/doc/man/kjobviewer.1
@@ -0,0 +1,202 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KJOBVIEWER 1 "June 2006" "Trinity Desktop Environment" "A print job viewer"
+.SH NAME
+kjobviewer
+\- a print job viewer
+.SH SYNOPSIS
+\fBkjobviewer\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBKJobViewer\fP is a powerful queue and spool manager. You can view jobs in the different queues waiting for print as well as manipulate jobs in many ways.
+.sp 1
+The details are, again, as with all other modules of \fBTDEPrint\fP, dependent on the print subsystem in use. \fBCUPS\fP, as is usual now, in this field is the most feature\-complete system for "doing something with jobs that are sent away already and wait for print, possibly on a remote print server".
+.sp 1
+With kjobviewer you can...
+.IP "     \-"
+see an overview for a certain queue or see all jobs on all queues;
+.IP "     \-"
+filter the list to see your "own" jobs only;
+.IP "     \-"
+sort the pending jobs according to different criteria (size, ownership, job\-ide, job\-name; billing\-tags);
+.IP "     \-"
+stop a job from printing, putting it into a "held" state;
+.IP "     \-"
+re\-start a held job;
+.IP "     \-"
+manually release a job that was sent to "hold" from the client already;
+.IP "     \-"
+reschedule a job for printing at a specified time;
+.IP "     \-"
+increase or decrease the job\-priorities (allowed values are 1\-100) to re-arrange the order of automatic printing;
+.IP "     \-"
+move a job to a different print\-queue;
+.IP "     \-"
+stop jobs from leaving the queue (while still accepting incoming ones);
+.IP "     \-"
+reject new incoming jobs (while still printing all the pending ones until the queue is empty);
+.IP "     \-"
+check and re\-set all job options \-\- even adapt them to another target printet which might have a complete different set of commands;
+.IP "     \-"
+view the existing and re\-assign a new job\-billing tag to a job;
+.IP "     \-"
+pop up on screen a nicely formatted report of IPP attributes for any job and also print it;
+.IP "     \-"
+increase or decrease the number of required copies;
+.IP "     \-"
+cancel and delete a no-longer\-required job.
+.PP
+Note, that some of these manipulations require job ownership or root access.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-d  
+<printer\-name>         The printer for which jobs are requested
+.TP
+.B  \-\-noshow  
+Show job viewer at startup
+.TP
+.B  \-\-all  
+Show jobs for all printers
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kjobviewer/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kjobviewer/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Michael Goffioul <tdeprint@swing.be>
+.br
+
+.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/kmenuedit.1 b/doc/man/kmenuedit.1
new file mode 100644
index 000000000..fd5c7daf5
--- /dev/null
+++ b/doc/man/kmenuedit.1
@@ -0,0 +1,51 @@
+.TH KMENUEDIT 1 "August, 24 2003"
+.SH NAME
+kmenuedit \- editor for the TDE menu
+.SH SYNOPSIS
+.B kmenuedit
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kmenuedit
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkmenuedit\fP is a powerful editor for the TDE menu. It allows you to add, remove, or move items in the menu, add sub-menus, ...
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+
+.SH SEE ALSO
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kmenuedit was written by the KDE project
diff --git a/doc/man/knetattach.1 b/doc/man/knetattach.1
new file mode 100644
index 000000000..84bc38fcf
--- /dev/null
+++ b/doc/man/knetattach.1
@@ -0,0 +1,164 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KNETATTACH 1 "June 2006" "Trinity Desktop Environment" "TDE Network Wizard"
+.SH NAME
+knetattach
+\- TDE Network Wizard
+.SH SYNOPSIS
+\fBknetattach\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+The \fBTDE Network Wizard\fP is an application which makes it easier to integrate your network resources with your Trinity Desktop.
+.sp 1
+The program, also known as the \fBNetwork Folder Wizard\fP, allows easy addition and integration of various network folders with your Trinity desktop.
+.sp 1
+The \fBNetwork Folder Wizard\fP currently allows you to add four types of network folders:
+.br
+.RS 3
+\- WebDav
+.br
+\- FTP
+.br
+\- Microsoft(R) Windows(R) (Samba) network drives
+.br
+\- SSH
+.RE
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/knetattach/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/knetattach/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+George Staikos <staikos@kde.org>
+.br
+
+.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/konqueror.1 b/doc/man/konqueror.1
new file mode 100644
index 000000000..0515c4f87
--- /dev/null
+++ b/doc/man/konqueror.1
@@ -0,0 +1,245 @@
+.\" This file was generated by kdemangen.pl
+.TH KONQUEROR 1 "Jan 2005" "Trinity Desktop Environment" "Web browser, file manager, ..."
+.SH NAME
+konqueror
+- Web browser, file manager, ...
+.SH SYNOPSIS
+konqueror [Qt-options] [TDE-options] [options] [URL] 
+.SH DESCRIPTION
+Konqueror is the file manager for the Trinity Desktop Environment.
+It supports basic file management on local UNIX filesystems,
+from simple cut/copy and paste operations to advanced remote
+and local network file browsing.
+
+It is also the canvas for all the latest TDE technology,
+from KIO slaves (which provide mechanisms for file access) to
+component embedding via the KParts object interface, and it
+is one of the most customizable applications available.
+
+Konqueror is an Open Source web browser with HTML4.0 compliance,
+supporting Java applets, JavaScript, CSS1 and (partially) CSS2,
+as well as Netscape plugins (for example, Flash or RealVideo plugins).
+
+It is a universal viewing application, capable of embedding
+read-only viewing components in itself to view
+documents without ever launching another application.
+
+This package is part of the official TDE base module.
+
+
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B URL
+Location to open
+.SS Options:
+.TP
+.B  --silent  
+Start without a default window
+.TP
+.B  --preload  
+Preload for later use
+.TP
+.B  --profile  <profile>
+Profile to open
+.TP
+.B  --profiles  
+List available profiles
+.TP
+.B  --mimetype  <mimetype>
+Mimetype to use for this URL (e.g. text/html or inode/directory)
+.TP
+.B  --select  
+For URLs that point to files, opens the directory and selects the file, instead of opening the actual file
+.SS 
+.SS Generic options:
+.TP
+.B  --help  
+Show help about options
+.TP
+.B  --help-qt  
+Show Qt specific options
+.TP
+.B  --help-tde  
+Show TDE specific options
+.TP
+.B  --help-all  
+Show all options
+.TP
+.B  --author  
+Show author information
+.TP
+.B -v,  --version  
+Show version information
+.TP
+.B  --license  
+Show license information
+.TP
+.B  --  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  --caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  --icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  --miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  --config  <filename>
+Use alternative configuration file
+.TP
+.B  --dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  --nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  --waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  --style  <style>
+sets the application GUI style
+.TP
+.B  --geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  --display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  --session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  --cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  --ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  --nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  --dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  --sync  
+switches to synchronous mode for debugging
+.TP
+.B --fn,  --font  <fontname>
+defines the application font
+.TP
+.B --bg,  --background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B --fg,  --foreground  <color>
+sets the default foreground color
+.TP
+.B --btn,  --button  <color>
+sets the default button color
+.TP
+.B  --name  <name>
+sets the application name
+.TP
+.B  --title  <title>
+sets the application title (caption)
+.TP
+.B  --visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  --inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  --im  <XIM server>
+set XIM server
+.TP
+.B  --noxim  
+disable XIM
+.TP
+.B  --reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/konqueror/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/konqueror/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+.br
+Simon Hausmann <hausmann@kde.org>
+.br
+Michael Reiher <michael.reiher@gmx.de>
+.br
+Matthias Welk <welk@fokus.gmd.de>
+.br
+Alexander Neundorf <neundorf@kde.org>
+.br
+Michael Brade <brade@kde.org>
+.br
+Lars Knoll <knoll@kde.org>
+.br
+Dirk Mueller <mueller@kde.org>
+.br
+Peter Kelly <pmk@post.com>
+.br
+Waldo Bastian <bastian@kde.org>
+.br
+Germain Garand <germain@ebooksfrance.org>
+.br
+Leo Savernik <l.savernik@aon.at>
+.br
+Stephan Kulow <coolo@kde.org>
+.br
+Antti Koivisto <koivisto@kde.org>
+.br
+Apple Safari Developers
+.br
+Harri Porten <porten@kde.org>
+.br
+Koos Vriezen <koos.vriezen@xs4all.nl>
+.br
+Matt Koss <koss@miesto.sk>
+.br
+Alex Zepeda <zipzippy@sonic.net>
+.br
+Richard Moore <rich@kde.org>
+.br
+Dima Rogozin <dima@mercury.co.il>
+.br
+Wynn Wilkes <wynnw@calderasystems.com>
+.br
+Stefan Schimanski <schimmi@kde.org>
+.br
+George Staikos <staikos@kde.org>
+.br
+Dawit Alemayehu <adawit@kde.org>
+.br
+Carsten Pfeiffer <pfeiffer@kde.org>
+.br
+Torsten Rahn <torsten@kde.org>
+.br
+Torben Weis <weis@kde.org>
+.br
+Joseph Wenninger <jowenn@kde.org>
+.br
+
diff --git a/doc/man/konsole.1 b/doc/man/konsole.1
new file mode 100644
index 000000000..5de5500b4
--- /dev/null
+++ b/doc/man/konsole.1
@@ -0,0 +1,179 @@
+.\" The draft of this file was generated by kdemangen.pl and edited after.
+.TH Konsole 1 "Nov 2005" "Trinity Desktop Environment" ""
+.SH NAME
+.BR Konsole
+\- X terminal emulator for TDE.
+.SH SYNOPSIS
+.BR Konsole 
+[Qt\-options] [TDE\-options] [options] [args] 
+.SH DESCRIPTION
+Konsole is an X terminal emulation which provides a command-line interface
+(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
+better organize user's desktop by containing multiple sessions in a single
+window (a less cluttered desktop).
+.PP
+Konsole advanced features include simple configuration and the ability to use
+multiple terminal shells in a single window, making for a less
+cluttered desktop.
+.PP
+Using Konsole, a user can open:
+.PP
+.RS
+Linux console sessions
+.PP
+Shell sessions
+.PP
+Screen sessions
+.PP
+Midnight Commander file manager sessions
+.PP
+Root console sessions
+.PP
+Root Midnight Commander sessions
+.PP
+User created sessions
+.RE
+
+These sessions can be renamed to help you keep track of all your shells,
+or signaled (STOP, CONT, HUP, INT, TERM, KILL).
+.PP
+For more control over konsole, a user can:
+hide/show the menubar and/or frame;
+select the size of a konsole window, fonts, color
+schemes, and key mapping;
+change location of the scrollbar or hide the scrollbar;
+change location of the tabbar or hide the tabbar.
+.PP
+All chosen settings can be made the default for forthcoming sessions by
+saving them.
+.SH OPTIONS
+.SS
+.SS Konsole specific options:
+.TP
+.B  \-\-name  <name>
+Set window class
+.TP
+.B  \-\-ls  
+Start login shell
+.B \-T <title>                
+Set the window title
+.TP
+.B  \-\-tn  <terminal>
+Specify terminal type as set in the TERM [xterm]
+environment variable
+.TP
+.B  \-\-noclose  
+Do not close Konsole when command exits
+.TP
+.B  \-\-nohist  
+Do not save lines in history
+.TP
+.B  \-\-nomenubar  
+Do not display menubar
+.TP
+.B \-\-notabbar,  \-\-notoolbar  
+Do not display tab bar
+.TP
+.B  \-\-noframe  
+Do not display frame
+.TP
+.B  \-\-noscrollbar  
+Do not display scrollbar
+.TP
+.B  \-\-noxft  
+Do not use Xft (anti-aliasing)
+.TP
+.B  \-\-vt_sz CCxLL             
+Terminal size in columns x lines
+.TP
+.B  \-\-noresize  
+Terminal size is fixed
+.TP
+.B  \-\-type  <type>
+Start with given session type
+.TP
+.B  \-\-types  
+List available session types
+.TP
+.B  \-\-keytab  <name>
+Set keytab to 'name'
+.TP
+.B  \-\-keytabs  
+List available keytabs
+.TP
+.B  \-\-profile  <name>
+Start with given session profile
+.TP
+.B  \-\-profiles  
+List available session profiles
+.TP
+.B  \-\-schema  <name>
+| <file>  Set schema to 'name' or use 'file'
+.TP
+.B \-\-schemas,  \-\-schemata  
+List available schemata
+.TP
+.B  \-\-script  
+Enable extended DCOP Qt functions
+.TP
+.B  \-\-workdir  <dir>
+Change working directory to 'dir'
+.TP
+.B \-e <command> [ arguments ]
+Execute 'command' instead of shell. It also sets the window title and 
+icon name to be the basename of the program being executed if neither 
+-T nor -n are given on the command line. 
+This must be the last option on the command line.
+.SS 
+.SS Arguments:
+.TP
+.B args
+Arguments for 'command'
+.SS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/konsole/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/konsole/'"
+from the command-line.
+.BR
+
+Konsole homepage: 
+.BR http://konsole.kde.org/
+.SH AUTHORS
+Kurt V. Hindenburg <kurt.hindenburg@kdemail.net>
+
+Lars Doelle <lars.doelle@on-line.de>
+.BR
+.SH OTHER
+This manual page was written by Ana Beatriz Guerrero Lopez <ana@ekaia.org> for the Debian
+system (but may be used by others).
+.BR
+
diff --git a/doc/man/kpager.1 b/doc/man/kpager.1
new file mode 100644
index 000000000..63a24f267
--- /dev/null
+++ b/doc/man/kpager.1
@@ -0,0 +1,53 @@
+.TH KPAGER 1 "August, 24 2003"
+.SH NAME
+kpager \- Trinity desktop pager
+.SH SYNOPSIS
+.B kpager
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kpager
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkpager\fP is a desktop pager for the Trinity desktop. It creates mini-views of the different Trinity desktops. These views show the real content of the desktop, or only icons. 
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-\-hidden
+Create the preview of the desktops, but hide the window
+.SH SEE ALSO
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kpager was written by the KDE project
diff --git a/doc/man/kpersonalizer.1 b/doc/man/kpersonalizer.1
new file mode 100644
index 000000000..01dc0b3cc
--- /dev/null
+++ b/doc/man/kpersonalizer.1
@@ -0,0 +1,66 @@
+.TH KPERSONALIZER 1
+.SH NAME
+kpersonalizer - TDE basic settings wizard
+
+.SH SYNOPSIS
+
+.B kpersonalizer [OPTION...]
+
+.SH DESCRIPTION
+
+The TDE Personalizer (KPersonalizer) is a wizard to configure TDE, and should automatically be run the first time a user runs TDE, to allow the user to configure basic TDE settings.
+.PP
+KPersonalizer allows the user to set locales, desktop behavior, enable accessibility features, and so forth. The options can be changed later by the Trinity Control Center application.
+
+.SH OPTIONS
+
+KPersonalizer accepts the following options:
+.PP
+.B Help options
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-help-qt
+Show Qt specific options.
+.TP
+.B \-\-help-tde 
+Show TDE specific options.
+.TP
+.B \-\-help-all 
+Show all options.
+.TP
+.B \-\-author
+Show author information.
+.TP
+.B \-v, \-\-version
+Show version information.
+.TP
+.B \-\-license 
+Show license information. 
+
+.PP
+.B Options
+.TP
+.B \-r 
+KPersonalizer is restarted by itself. 
+.TP
+.B \-\-before-session 
+KPersonalizer is started before the TDE session.
+
+.SH EXAMPLES
+.TP
+.B kpersonalizer
+Run kpersonalizer to set (or reset) TDE preferences.
+.TP
+.B kpersonalizer --before-session
+Run kpersonalizer before the first TDE session. 
+
+.SH AUTHORS
+
+Kpersonalizer was written by Ralf Nolden <nolden@kde.org>, Carsten Wolff <wolff@kde.org>, qwertz <kraftw@gmx.de>, and Bernhard Rosenkraenzer <bero@redhat.com>.
+.PP
+This  manual page was written by Joe Brockmeier <jzb@zonker.net>, for the Debian GNU/Linux project, but may be used by others.
+.SH "SEE ALSO"
+.TP
+.BR khelpcenter (1)
diff --git a/doc/man/kprinter.1 b/doc/man/kprinter.1
new file mode 100644
index 000000000..a3ecdc88b
--- /dev/null
+++ b/doc/man/kprinter.1
@@ -0,0 +1,209 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KPRINTER 1 "June 2006" "Trinity Desktop Environment" "A printer tool for TDE"
+.SH NAME
+kprinter
+\- a printer tool for TDE
+.SH SYNOPSIS
+\fBkprinter\fP [Qt\-options] [TDE\-options] [options] file(s) 
+.SH DESCRIPTION
+\fBKPrinter\fP opens automatically when you click on the "Print" icon of any TDE application. Choose your print job settings by going through the dialog and then click on the "Print" button.
+.sp 1
+\fBkprinter\fP is a very versatile tool. Depending on the actual features and power of the print subsystem of your computer, \fBkprinter\fP translates the former's abilities into a nice and easy\-to\-understand GUI. If your print subsystem does not support duplexing, \fBkprinter\fP will not show the option. If your print subsystem is CUPS, kprinter is at its peak shape.
+.sp 1
+With \fBKPrinter\fP you can...
+.IP "     \-"
+switch "on the fly" the print subsystem\-to\-use,
+.IP "     \-"
+start the Add Printer Wizard,
+.IP "     \-"
+choose the target printer,
+.IP "     \-"
+possibly select one or more files to print,
+.IP "     \-"
+drag'n'drop files for print,
+.IP "     \-"
+check for or set the print options,
+.IP "     \-"
+schedule the job for later printing,
+.IP "     \-"
+tag the print job with accounting information for billing purposes,
+.IP "     \-"
+set the job priority for a higher or lower level to influence the order of the job queue,
+.IP "     \-"
+access the TDEPrint configurator,
+.IP "     \-"
+and activate (or disable) a viewing filter that shows all or just the selected few printers relevant to the user.
+.SP
+.SH OPTIONS
+.SS
+.SS Arguments:
+file(s)                   Files to load
+.SS Options:
+.TP
+.B  \-c  
+Make an internal copy of the files to print
+.TP
+.B \-P,  \-d  <printer>
+Printer/destination to print on
+.TP
+.B \-J,  \-t  <title>
+Title/Name for the print job
+.TP
+.B \-#, \-n <number>
+Number of copies
+.TP
+.B  \-o  
+<option=value>         Printer option
+.TP
+.B  \-j  <mode>
+Job output mode (gui, console, none) [gui]
+.TP
+.B  \-\-system  <printsys>
+Print system to use (lpd, cups)
+.TP
+.B  \-\-stdin  
+Allow printing from STDIN
+.TP
+.B  \-\-nodialog  
+Do not show the print dialog (print directly)
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\fB\-\-nograb\fP, use \fB\-\-dograb\fP to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kprinter/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kprinter/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Michael Goffioul <tdeprint@swing.be>
+
+.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/krandom.kss.1 b/doc/man/krandom.kss.1
new file mode 100644
index 000000000..4a13d95ec
--- /dev/null
+++ b/doc/man/krandom.kss.1
@@ -0,0 +1,152 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KRANDOM.KSS 1 "June 2006" "Trinity Desktop Environment" "TDE screen saver"
+.SH NAME
+krandom.kss
+\- Start a random TDE screen saver
+.SH SYNOPSIS
+\fBkrandom.kss\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBkrandom.kss\fP starts a random TDE screen saver.
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-setup  
+Setup screen saver
+.TP
+.B  \-\-window\-id  wid
+Run in the specified XWindow
+.TP
+.B  \-\-root  
+Run in the root XWindow
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/kreadconfig.1 b/doc/man/kreadconfig.1
new file mode 100644
index 000000000..3bb6c4d0b
--- /dev/null
+++ b/doc/man/kreadconfig.1
@@ -0,0 +1,173 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KREADCONFIG 1 "June 2006" "Trinity Desktop Environment" "Read TDEConfig entries"
+.SH NAME
+kreadconfig
+\- Read TDEConfig entries (for use in shell scripts)
+.SH SYNOPSIS
+\fBkreadconfig\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBkreadconfig\fP is a command line tool to retrieve values from TDE configuration files.
+.sp 1
+If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
+.SS Example:
+.TP
+\fBkreadconfig \-\-group\fP Directories \fB--key\fP dir_tmp
+read the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories from TDE's main configuration file
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-file  <file>
+Use <file> instead of global config
+.TP
+.B  \-\-group  <group>
+Group to look in [TDE]
+.TP
+.B  \-\-key  <key>
+Key to look for
+.TP
+.B  \-\-default  <default>
+Default value
+.TP
+.B  \-\-type  <type>
+Type of variable
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS
+
+.SH FILES
+.I /etc/trinity/system.kdeglobals
+global TDE configuration file
+.I ~/.trinity/share/config
+standard configuration directory
+
+.SH AUTHORS
+.nf
+Bernhard Rosenkraenzer <bero@redhat.com>
+.br
+
+.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/krootimage.1 b/doc/man/krootimage.1
new file mode 100644
index 000000000..e9b19a604
--- /dev/null
+++ b/doc/man/krootimage.1
@@ -0,0 +1,151 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KROOTIMAGE 1 "June 2006" "Trinity Desktop Environment" "helper program"
+.SH NAME
+krootimage
+\- set desktop background for tdm
+.SH SYNOPSIS
+\fBkrootimage\fP [Qt\-options] [TDE\-options] config 
+.SH DESCRIPTION
+\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B config
+Name of the configuration file
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SH SEE ALSO
+.BR tdm (1)
+.SH AUTHORS
+.nf
+Matthias Hoelzer\-Kluepfel <hoelzer@kde.org>
+.br
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/kstart.1 b/doc/man/kstart.1
new file mode 100644
index 000000000..9d3a77ddc
--- /dev/null
+++ b/doc/man/kstart.1
@@ -0,0 +1,215 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KSTART 1 "June 2006" "Trinity Desktop Environment" "application launch utility"
+.SH NAME
+kstart
+\- Utility to launch applications with special window properties 
+.SH SYNOPSIS
+\fBkstart\fP [Qt\-options] [TDE\-options] [options] command 
+.SH DESCRIPTION
+Utility to launch applications with special window properties.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B command
+Command to execute
+.SS 
+.SS Options:
+.TP
+.B  \-\-window  <regexp>
+A regular expression matching the window title
+.TP
+.B  \-\-windowclass  <class>
+A string matching the window class (WM_CLASS property)
+The window class can be found out by running
+'xprop | grep WM_CLASS' and clicking on a window
+(use either both parts separated by a space or only the right part).
+NOTE: If you specify neither window title nor window class,
+then the very first window to appear will be taken;
+omitting both options is NOT recommended.
+.TP
+.B  \-\-desktop  <number>
+Desktop on which to make the window appear
+.TP
+.B  \-\-currentdesktop  
+Make the window appear on the desktop that was active
+when starting the application
+.TP
+.B  \-\-alldesktops  
+Make the window appear on all desktops
+.TP
+.B  \-\-iconify  
+Iconify the window
+.TP
+.B  \-\-maximize  
+Maximize the window
+.TP
+.B  \-\-maximize\-vertically  
+Maximize the window vertically
+.TP
+.B  \-\-maximize\-horizontally  
+Maximize the window horizontally
+.TP
+.B  \-\-fullscreen  
+Show window fullscreen
+.TP
+.B  \-\-type  <type>
+The window type: Normal, Desktop, Dock, Tool, 
+Menu, Dialog, TopMenu or Override
+.TP
+.B  \-\-activate  
+Jump to the window even if it is started on a 
+different virtual desktop
+.TP
+.B \-\-ontop,  \-\-keepabove  
+Try to keep the window above other windows
+.TP
+.B \-\-onbottom,  \-\-keepbelow  
+Try to keep the window below other windows
+.TP
+.B  \-\-skiptaskbar  
+The window does not get an entry in the taskbar
+.TP
+.B  \-\-skippager  
+The window does not get an entry on the pager
+.TP
+.B  \-\-tosystray  
+The window is sent to the system tray in Kicker
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Matthias Ettrich <ettrich@kde.org>
+.br
+David Faure <faure@kde.org>
+.br
+Richard J. Moore <rich@kde.org>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors 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/ksystraycmd.1 b/doc/man/ksystraycmd.1
new file mode 100644
index 000000000..4807276c0
--- /dev/null
+++ b/doc/man/ksystraycmd.1
@@ -0,0 +1,189 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KSYSTRAYCMD 1 "June 2006" "Trinity Desktop Environment" "system tray utility"
+.SH NAME
+ksystraycmd
+\- Allows any application to be kept in the system tray
+.SH SYNOPSIS
+\fBksystraycmd\fP [Qt\-options] [TDE\-options] [options] command 
+.SH DESCRIPTION
+The system tray is an area in which an application can display a small window.
+It may be used to display status information or provide quick access to commands.
+Normally tray icons are developed as part of an application.
+\fBksystraycmd\fP allows any application to be kept in the system tray.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B command
+Command to execute
+.SS 
+.SS Options:
+.TP
+.B  \-\-window  <regexp>
+A regular expression matching the window title
+If you do not specify one, then the very first window
+to appear will be taken \- not recommended.
+.TP
+.B  \-\-wid  <int>
+The window id of the target window
+Specifies the id of the window to use. If the id starts with 0x
+it is assumed to be in hex.
+.TP
+.B  \-\-hidden  
+Hide the window to the tray on startup
+.TP
+.B  \-\-startonshow  
+Wait until we are told to show the window before
+executing the command
+.TP
+.B  \-\-tooltip  <text>
+Sets the initial tooltip for the tray icon
+.TP
+.B  \-\-keeprunning  
+Keep the tray icon even if the client exits. This option
+has no effect unless startonshow is specified.
+.TP
+.B  \-\-ownicon  
+Use ksystraycmd's icon instead of window's icon in systray
+(should be used with \-\-icon to specify ksystraycmd icon)
+.TP
+.B  \-\-ontop  
+Try to keep the window above other windows
+.TP
+.B  \-\-quitonhide  
+Quit the client when we are told to hide the window.
+This has no effect unless startonshow is specified and implies keeprunning.
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Richard Moore <rich@kde.org>
+.br
+
+.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/ktrash.1 b/doc/man/ktrash.1
new file mode 100644
index 000000000..0094c84fa
--- /dev/null
+++ b/doc/man/ktrash.1
@@ -0,0 +1,155 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KTRASH 1 "June 2006" "Trinity Desktop Environment" "helper program"
+.SH NAME
+ktrash
+\- Helper program to handle the TDE trash can
+.SH SYNOPSIS
+\fBktrash\fP [Qt\-options] [TDE\-options] [options]
+.SH DESCRIPTION
+\fBktrash\fP is a helper program to handle the TDE trash can.
+.sp 1
+Note: to move files to the trash, do not use \fBktrash\fP, but "\fBkfmclient\fP move 'url' trash:/"
+.SH OPTIONS
+.SS
+.SS Options:
+.TP
+.B  \-\-empty  
+Empty the contents of the trash
+.TP
+.B  \-\-restore  <file>
+Restore a trashed file to its original location
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SH SEE ALSO
+\fBkfmclient\fP(1)
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+
+.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/kwrite.1 b/doc/man/kwrite.1
new file mode 100644
index 000000000..f7d39f61d
--- /dev/null
+++ b/doc/man/kwrite.1
@@ -0,0 +1,60 @@
+.TH KWRITE 1 "August, 25 2003"
+.SH NAME
+kwrite \- TDE text editor
+.SH SYNOPSIS
+.B kwrite
+.RI [ options ]  [file]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B kwrite
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBkwrite\fP is a text editor for TDE, that is a light version of \fIkate\fP.
+It allows syntax coloration for many langages.
+
+It is able to expand or collapse parts of code (C functions, ...).
+
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B  \-\-help
+Show summary of options.
+.TP
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP
+.B \-\-help\-tde
+Show TDE specific help (common for all TDE apps).
+.TP
+.B \-\-help\-all
+Show the complete help.
+.TP
+.B \-\-author
+Show program author(s).
+.TP
+.B \-\-license
+Show program license.
+.TP
+.B \-v, \-\-version
+Show version of program.
+
+.B file
+is the file to open
+
+.SH SEE ALSO
+.BR kate (1)
+.PP
+For more details, you should have a look at the TDE Help center, available
+from the T menu.
+.SH AUTHOR
+This manual page was written by Clement Stenac <zorglub@via.ecp.fr>,
+for the Debian GNU/Linux project (but may be used by others).
+.PP
+kwrite was written by the KDE project
diff --git a/doc/man/kwriteconfig.1 b/doc/man/kwriteconfig.1
new file mode 100644
index 000000000..b347b9849
--- /dev/null
+++ b/doc/man/kwriteconfig.1
@@ -0,0 +1,173 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KWRITECONFIG 1 "June 2006" "Trinity Desktop Environment" "Write TDEConfig entries"
+.SH NAME
+kwriteconfig
+\- Write TDEConfig entries (for use in shell scripts)
+.SH SYNOPSIS
+\fBkwriteconfig\fP [Qt\-options] [TDE\-options] [options] value 
+.SH DESCRIPTION
+\fBkwriteconfig\fP is a command line tool to write values in TDE configuration files.
+Nonexisting files/groups/keys will be created.
+.sp 1
+If a file given via option \fB\-\-file\fP does not contain a path the TDE standard configuration directory is used.
+.SS Example:
+.TP
+\fBkwriteconfig \-\-file\fP \fImyrc\fP \fB\-\-group\fP Directories \fB\-\-key\fP dir_tmp /tmp
+writes the \fBvalue\fP for \fBkey\fP dir_tmp in \fBgroup\fP Directories in configuration \fBfile\fP \fImyrc\fP
+
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B value
+The value to write. Mandatory, on a shell use '' for empty
+.SS Options:
+.TP
+.B  \-\-file  <file>
+Use <file> instead of global config
+.TP
+.B  \-\-group  <group>
+Group to look in [TDE]
+.TP
+.B  \-\-key  <key>
+Key to look for
+.TP
+.B  \-\-type  <type>
+Type of variable. Use "bool" for a boolean, otherwise it is treated as a string
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Luis Pedro Coelho <luis_pedro@netcabo.pt>
+.br
+Bernhard Rosenkraenzer <bero@redhat.com>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/kxkb.1 b/doc/man/kxkb.1
new file mode 100644
index 000000000..9a6a6bcf6
--- /dev/null
+++ b/doc/man/kxkb.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KXKB 1 "June 2006" "Trinity Desktop Environment" "A utility to switch keyboard maps"
+.SH NAME
+kxkb
+\- A utility to switch keyboard maps
+.SH SYNOPSIS
+\fBkxkb\fP [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+\fBKxkb\fP is a keyboard layout switching utility based on X11 xkb extension. It allows to use different keyboard layouts for inputing text. \fBKxkb\fP features keyboard layout indicator.
+.sp 1
+\fBKxkb\fP starts automatically and stays in system tray as a flag with 2 or 3 letter abbreviation of layout name on top of it if more than one layout is defined or Show indicator for single layout option is turned on.
+.sp 1
+When \fBKxkb\fP is running you can change layouts clicking on its tray icon with the mouse or pressing its keyboard shortcut. Keyboard shortcut or mouse click will switch to next layout or alternatively you can right mouse button click the \fBKxkb\fP icon and select layout from the list.
+.sp 1
+Right mouse button clicking on the \fBKxkb\fP icon you can start its configuration by selecting Configure... or by opening \fBControl Center\fP and selecting Localization/Keyboard Layout. Alternatively, you can start it by typing \fBtdecmshell keyboard_layout\fP in a terminal.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/kxkb/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/kxkb/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Andriy Rysin <rysin@kde.org>
+.br
+Shaheed Haque <srhaque@iee.org>
+.br
+Ilya Konstantinov <kde\-devel@future.galanet.net>
+.br
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/starttde.1 b/doc/man/starttde.1
new file mode 100644
index 000000000..73ab27b9c
--- /dev/null
+++ b/doc/man/starttde.1
@@ -0,0 +1,46 @@
+.TH starttde 1 "Jan 17, 2005"
+.SH NAME
+starttde \- Starts up the Trinity Desktop Environment 
+.SH SYNOPSIS
+.B starttde
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B starttde
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+The \fBstarttde\fP script starts up the Trinity Desktop Environment and
+is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from
+your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which
+will load your last session, or a default session that includes the standard
+TDE programs if no saved session is available.
+
+\fBstarttde\fP, with ksmserver, is a standard X11R6 session manager that can manage
+any X11R6 SM compliant program.
+
+\fBstarttde\fP and ksmserver use the contents of the ~/.trinity directory
+for starting previously saved sessions. Source scripts found in ~/.trinity/env/*.sh
+can be used to define environment variables that will be available to all TDE 
+programs.
+
+For anything else (that doesn't set env vars, or that needs a window manager),
+better use the ~/.trinity/Autostart folder.
+
+At the end of a session, the scripts found in ~/.trinity/shutdown will be executed.
+
+
+.SH OPTIONS
+\fBstarttde\fP takes no command line options.
+
+.SH AUTHOR
+\fBstarttde\fP is written by the KDE Project.
+
+This manual page was written by Philipp Grau.
+
+.SH "REPORTING BUGS"
+Report bugs of this modified Debian version of starttde to the Bug
+Tracking System at: http://bugs.debian.org
+.SH COPYRIGHT
+Copyright \(co 2005 Philipp Grau.
diff --git a/doc/man/tdedebugdialog.1 b/doc/man/tdedebugdialog.1
new file mode 100644
index 000000000..af48f59e6
--- /dev/null
+++ b/doc/man/tdedebugdialog.1
@@ -0,0 +1,200 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH TDEDEBUGDIALOG 1 "June 2006" "Trinity Desktop Environment" "control debug output"
+.SH NAME
+tdedebugdialog
+\- A dialog box for setting preferences for debug output
+.SH SYNOPSIS
+\fBtdedebugdialog\fP [Qt\-options] [TDE\-options] [options] 
+.SH DESCRIPTION
+\fBTDEDebugDialog\fP shows a dialog box for managing diagnostic messages at runtime.
+.sp 1
+If you simply start \fBtdedebugdialog\fP, you will see a list of \fBareas\fP, that can be disabled or enabled.
+.sp 1
+If you start \fBtdedebugdialog \-\-fullmode\fP, then for every severity level you can define separately what should be done with the diagnostic messages of that level, and the same for each debug area.
+.sp 1
+In full mode, first you should select the debug area you are interested in from the drop down list at the top.
+.sp 1
+You may independently set the output for various types of messages:
+.sp 1
+.RS 3
+\- Information
+.br
+\- Warning
+.br
+\- Error
+.br
+\- Fatal Error
+.RE
+.PP
+For each of these types, you can set the following:
+.sp 1
+\fBOutput to\fP:
+.br
+In this Combobox, you can choose where the messages should be output. The choices are: \fBFile\fP?, \fBMessage Box\fP, \fBShell\fP (meaning stderr), \fBSyslog\fP an \fBNone\fP. Please do not direct fatal messages to syslog unless you are the system administrator yourself. The default is ?Message Box?.
+.sp 1
+\fBFilename:\fP
+.br
+This is only enabled when you have chosen \fBFile\fP as the output and provides the name of that file (which is interpreted as relative to the current folder). The default is \fIkdebug.dbg\fP.
+Apart from this, you can also tick the checkbox Abort on fatal errors. In this case, if a diagnostic message with the severity level TDEBUG_FATAL is output, the application aborts with a SIGABRT after outputting the message.
+.sp 1
+When you close the dialog by pressing OK, your entries apply immediately and are saved in \fIkdebugrc\fP. When you press Cancel, your entries are discarded and the old ones are restored.
+
+.SH OPTIONS
+.SS Options:
+.TP
+.B  \-\-fullmode  
+Show the fully\-fledged dialog instead of the default list dialog
+.TP
+.B  \-\-on  <area>
+Turn area on
+.TP
+.B  \-\-off  <area>
+Turn area off
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS
+
+.SH FILES
+.I ~/.trinity/share/config/kdebugrc
+\fBtdedebugdialog\fP configuration file
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdedebugdialog/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/tdedebugdialog/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+David Faure <faure@kde.org>
+.br
+
+.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/tdeio_media_mounthelper.1 b/doc/man/tdeio_media_mounthelper.1
new file mode 100644
index 000000000..1e7b055f6
--- /dev/null
+++ b/doc/man/tdeio_media_mounthelper.1
@@ -0,0 +1,163 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "Trinity Desktop Environment" "helper program"
+.SH NAME
+tdeio_media_mounthelper
+\- tdeio_media_mounthelper
+.SH SYNOPSIS
+\fBtdeio_media_mounthelper\fP [Qt\-options] [TDE\-options] [options] URL 
+.SH DESCRIPTION
+\fBtdeio_media_mounthelper\fP is a helper program to handle the mounting of media in TDE. It is part of the KIO subsystem.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B URL
+media:/ URL to mount/unmount/eject/remove
+.SS Options:
+.TP
+.B  \-u  
+Unmount given URL
+.TP
+.B  \-m  
+Mount given URL (default)
+.TP
+.B  \-e  
+Eject given URL via tdeeject
+.TP
+.B  \-s  
+Unmount and Eject given URL (necessary for some USB devices)
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+.SH AUTHORS
+.nf
+Waldo Bastian <bastian@kde.org>
+.br
+Kevin Ottens <ervin@ipsquad.net>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/tdeio_system_documenthelper.1 b/doc/man/tdeio_system_documenthelper.1
new file mode 100644
index 000000000..270dd86e6
--- /dev/null
+++ b/doc/man/tdeio_system_documenthelper.1
@@ -0,0 +1,22 @@
+.\" 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/tdepasswd.1 b/doc/man/tdepasswd.1
new file mode 100644
index 000000000..e09aff0e2
--- /dev/null
+++ b/doc/man/tdepasswd.1
@@ -0,0 +1,169 @@
+.TH TDEPASSWD 1
+
+.SH NAME
+tdepasswd \- graphical frontend to change the user's password
+
+.SH SYNOPSIS
+.B tdepasswd [ \fIQt-options\fR ] [ \fITDE-options\fR ] \fIoptions\fR
+
+.SH DESCRIPTION
+Changes a UNIX password.
+
+.SH OPTIONS
+.B Generic options:
+.TP
+.HP
+.B \-\-help
+Show help about options
+.TP
+.HP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.HP
+.B \-\-help\-tde
+Show TDE specific options
+.TP
+.HP
+.B \-\-help\-all
+Show all options
+.TP
+.HP
+.B \-\-author
+Show author information
+.TP
+.HP
+.B \-v\fR, \fB \-\-version
+Show version information
+.TP
+.HP
+.B \-\-license
+Show license information
+.TP
+.B Qt options:
+.TP
+.HP
+.B \-\-display <displayname>
+Use the X-server display 'displayname'.
+.TP
+.HP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'.
+.TP
+.HP
+.B \-\-cmap
+Causes the application to install a private 
+color map on an 8-bit display.
+.TP
+.HP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.HP
+.B \-\-nograb
+Tells Qt to never grab the mouse or the keyboard.
+.TP
+.HP
+.B \-\-dograb
+Running under a debugger can cause an implicit
+-nograb, use -dograb to override.
+.TP
+.HP
+.B \-\-sync
+Switches to synchronous mode for debugging.
+.TP
+.HP
+.B \-\-fn, \-\-font <fontname>
+Defines the application font.
+.TP
+.HP
+.B \-\-bg, \-\-background <color> 
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.HP
+.B \-\-fg, \-\-foreground <color> 
+Sets the default foreground color.
+.TP
+.HP
+.B \-\-btn, \-\-button <color>
+Sets the default button color.
+.TP
+.HP
+.B \-\-name <name>
+Sets the application name.
+.TP
+.HP
+.B \-\-title <title>
+Sets the application title (caption).
+.TP
+.HP
+.B \-\-visual TrueColor
+Forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.HP
+.B \-\-inputstyle <inputstyle>
+Sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root.
+.TP
+.HP
+.B \-\-im <XIM server>
+Set XIM server.
+.TP
+.HP
+.B \-\-noxim
+Disable XIM.
+.TP
+.HP
+.B \-\-reverse
+Mirrors the whole layout of widgets.
+.TP
+.B TDE options:
+.TP
+.HP
+.B \-\-caption <caption>
+Use 'caption' as name in the titlebar.
+.TP
+.HP
+.B \-\-icon <icon>
+Use 'icon' as the application icon.
+.TP
+.HP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar.
+.TP
+.HP
+.B \-\-config <filename>
+Use alternative configuration file.
+.TP
+.HP
+.B \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'.
+.TP
+.HP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.HP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.HP
+.B \-\-style <style>
+Sets the application GUI style.
+.TP
+.HP
+.B \-\-geometry <geometry>
+Sets the client geometry of the main widget.
+
+.SH "SEE ALSO"
+.BR passwd (1).
+
+.SH AUTHOR
+Andre Ramos <andre@alunos.di.fc.ul.pt>
diff --git a/doc/man/tdeprintfax.1 b/doc/man/tdeprintfax.1
new file mode 100644
index 000000000..e407c294e
--- /dev/null
+++ b/doc/man/tdeprintfax.1
@@ -0,0 +1,160 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH TDEPRINTFAX 1 "June 2006" "Trinity Desktop Environment" "A fax utility"
+.SH NAME
+tdeprintfax
+\- a interface to fax-packages
+.SH SYNOPSIS
+\fBtdeprintfax\fP [Qt\-options] [TDE\-options] [options] [file] 
+.SH DESCRIPTION
+\fBtdeprintfax\fP is a small fax utility to be used with tdeprint.
+.SH OPTIONS
+.SS
+.SS Arguments:
+.TP
+.B file
+File to fax (added to the file list)
+.SS Options:
+.TP
+.B  \-\-phone  
+Phone number to fax to
+.TP
+.B  \-\-immediate  
+Send fax immediately
+.TP
+.B  \-\-batch  
+Exit after sending
+.SS 
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8\-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8\-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+\-nograb, use \-dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8\-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget \- see man X for the argument format
+.SS 
+
+.SH AUTHORS
+.nf
+Michael Goffioul <tdeprint@swing.be>
+.br
+
+.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/tdesu.1 b/doc/man/tdesu.1
new file mode 100644
index 000000000..fa8c45e09
--- /dev/null
+++ b/doc/man/tdesu.1
@@ -0,0 +1,102 @@
+.TH TDESU 1 "May 2005" "Trinity Desktop Environment" "Runs a program with elevated privileges."
+.SH NAME
+tdesu \- Runs a program with elevated privileges.
+.SH SYNOPSIS
+\fBtdesu\fR [Qt\-options] [TDE\-options] [tdesu options] command 
+.SH DESCRIPTION
+Runs a program with elevated privileges.
+.PP
+TDE su is a graphical front end to the Unix \fBsu\fR utility. It allows you to run programs as another user by entering their password. It is not a SUID root program, but runs unprivileged. The system program \fBsu\fR is used for acquiring special privileges.
+.PP
+\fBtdesu\fR has the ability to store passwords for the convenience of users. The passwords are NOT written to disk, but stored in memory using a special program, \fBtdesud\fR. This is only done if the user specifies that the password be remembered. In this case, passwords are stored in memory for a certain period of time before being removed. \fBtdesud\fR runs in such a way that only the user who entered the password originally can use it, though no one, not even the user who originally entered the password, can retrieve the password that is stored by \fBtdesud\fR. Through these measures, users can avoid having to repeatedly enter root passwords or other passwords, without a significant risk to overall system security.
+.PP
+\fBtdesu\fR uses normally \fBsu\fR to gain root by using the root password. \fBtdesu\fR can also be configured to use other commands to gain root like sudo to use users password.
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  --help
+Show help about options
+.TP
+.B  --help-qt
+Show Qt specific options
+.TP
+.B  --help-tde
+Show TDE specific options
+.TP
+.B  --help-all
+Show all options
+.TP
+.B  --author
+Show author information
+.TP
+.B -v,  --version
+Show version information
+.TP
+.B  --license
+Show license information
+.SS
+.SS tdesu Options:
+.TP
+.TP
+.B -c <command>
+Specifies the command to run
+.TP
+.B -f <file>
+Run command under target uid if <file> is not writable
+.TP
+.B -u <user>
+Specifies the target uid [default is root]
+.TP
+.B -n
+Do not keep password
+.TP
+.B -s
+Stop the daemon (forgets all passwords)
+.TP
+.B -t
+Enable terminal output (no password keeping)
+.TP
+.B -p <prio>
+Set priority value: 0 <= prio <= 100, 0 is lowest [default is 50]
+.TP
+.B -r
+Use realtime scheduling
+.TP
+.B  --nonewdcop
+Let command use existing dcopserver
+.TP
+.B -i <icon name>
+Specify icon to use in the password dialog
+.TP
+.B -d
+Do not show the command to be run in the dialog
+.SS 
+.SS Arguments:
+.TP
+.B command
+Specifies the command to run
+
+.SH CONFIGURATION FILES
+.PP
+\fBtdesu\fR can be configured with a default configuration file /etc/trinity/tdesurc and with a per user configuration file in .trinity/share/config/tdesurc. Alternative a section could be added to kdeglobals.
+.SH EXAMPLE
+The configuration item for the configuration files is the following:
+.br
+[super-user-command] 
+.br
+super-user-command=sudo
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/tdesu/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/tdesu/'"
+from the command-line.
+.br
+.SH AUTHORS
+.br
+Geert Jansen <jansen@kde.org>
+.br
+Pietro Iglio <iglio@fub.it>
+.PP
+This manual page was written by Christopher Martin <chrsmrtn@debian.org> for Debian GNU/Linux, but may be used by others. It borrows from an earlier manpage by Karolina Lindqvist <pgd\-karolinali@algonet.se>.
diff --git a/doc/man/tdm.1 b/doc/man/tdm.1
new file mode 100644
index 000000000..1150fe5a8
--- /dev/null
+++ b/doc/man/tdm.1
@@ -0,0 +1,116 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH TDM 1 "June 2006" "Trinity Desktop Environment" "Trinity Display Manager"
+.SH NAME
+tdm
+\- Trinity Display Manager
+.SH SYNOPSIS
+\fBtdm\fP [options] [tty]
+.SH DESCRIPTION
+\fBtdm\fP is the Trinity display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session.
+.br
+\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network.
+.sp 1
+\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP.
+.SH OPTIONS
+.TP
+.B \-daemon
+Daemonize even when started by init
+.TP
+.B \-nodaemon
+Don't daemonize even when started from command line
+.TP
+.BI \-config\  file
+Use alternative master configuration file
+.TP
+.BR \-xrm \ res
+Override frontend\-specific resource
+.TP
+.BI \-error\  file
+Use alternative log file
+.TP
+.BR \-debug \ num
+Debug option bitfield:
+.RS 11
+0x1   \- core log
+.br
+0x2   \- config reader log
+.br
+0x4   \- greeter log
+.br
+0x8   \- IPC log
+.br
+0x10  \- session sub-daemon post-fork delay
+.br
+0x20  \- config reader post-start delay
+.br
+0x40  \- greeter post-start delay
+.br
+0x80  \- don't use syslog
+.br
+0x100 \- core Xauth log
+.br
+0x400 \- valgrind config reader and greeter
+.br
+0x800 \- strace config reader and greeter
+.RE
+.SH FILES
+.TP
+.I /etc/trinity/tdm/backgroundrc
+configuration file with background settings
+.TP
+.I /etc/trinity/tdm/tdm.options
+options for X display manager tdm
+.TP
+.I /etc/trinity/tdm/tdmrc
+the tdm configuration file
+.TP
+.I /etc/trinity/tdm/Xaccess
+access control file for XDMCP connections
+.TP
+.I /etc/trinity/tdm/Xservers
+list of local X-servers
+.TP
+.I /etc/trinity/tdm/Xreset
+script to run as root after session exits
+.TP
+.I /etc/trinity/tdm/Xsession
+script to run as user after login of user
+.TP
+.I /etc/trinity/tdm/Xsetup
+script to run as root before the login dialog appears
+.sp 1
+this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen
+.TP
+.I /etc/trinity/tdm/Xstartup
+script to run as root before session starts
+.TP
+.I /etc/trinity/tdm/Xwilling
+output of this script is displayed in the chooser window
+.SH SEE ALSO
+.BR tdm.options (5),\  tdmctl (1),\  tdm_config (1),\  tdm_greet (1),\  startx (1),\  X (7x),\  xconsole (1),\  xdm (1)
+.TP
+.I /opt/trinity/share/doc/tdm/README.gz
+Information about \fBtdm\fP and its options
+.sp 1
+.RE
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdm/
+directly into konqueror or you can run 
+.BR "khelpcenter help:/tdm/"
+from the command\-line.
+.br
+.SH AUTHORS
+.nf
+Steffen Hansen <hansen@kde.org>
+.br
+Thomas Tanghus <tanghus@earthling.net>
+.br
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/tdm_config.1 b/doc/man/tdm_config.1
new file mode 100644
index 000000000..b8753b168
--- /dev/null
+++ b/doc/man/tdm_config.1
@@ -0,0 +1,22 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH  TDM_CONFIG 1 "June 2006" "Trinity Desktop Environment" "helper program"
+.SH NAME
+tdm_config
+\- helper programm for tdm to read configuration files
+.SH SYNOPSIS
+\fBtdm_config\fP
+.SH DESCRIPTION
+\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files.
+.SH SEE ALSO
+\fBtdm\fP(1)
+.SH AUTHORS
+.nf
+Oswald Buddenhagen <ossi@kde.org>
+
+.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/tdm_greet.1 b/doc/man/tdm_greet.1
new file mode 100644
index 000000000..10b7bde6e
--- /dev/null
+++ b/doc/man/tdm_greet.1
@@ -0,0 +1,22 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH  TDM_GREET 1 "June 2006" "Trinity Desktop Environment" "TDE greeter module"
+.SH NAME
+tdm_greet
+\- TDE greeter module for tdm
+.SH SYNOPSIS
+\fBtdm_greet\fP
+.SH DESCRIPTION
+\fBtdm_greet\fP is a TDE greeter module for \fBtdm\fP. It shows the login dialog.
+.SH SEE ALSO
+.BR tdm (1)
+.SH AUTHORS
+.nf
+Oswald Buddenhagen <ossi@kde.org>
+
+.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/tdmctl.1 b/doc/man/tdmctl.1
new file mode 100644
index 000000000..82be6ae16
--- /dev/null
+++ b/doc/man/tdmctl.1
@@ -0,0 +1,220 @@
+.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
+.TH TDMCTL 1 "June 2006" "Trinity Desktop Environment" "TDM remote control application"
+.SH NAME
+tdmctl
+\- tdm remote control application
+.SH SYNOPSIS
+\fBtdmctl\fP [options] [command [command arguments]]
+.SH DESCRIPTION
+\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets.
+.sp 1
+There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user).
+.sp 1
+The directory in which the sockets are located is determined this way:
+.RS 3
+\- the \fB\-s\fP option is examined
+.br
+\- the $DM_CONTROL variable is examined
+.br
+\- the tdm config file is searched for the FifoDir key
+.br
+.RI \- /var/run/xdmctl \ and\  /var/run \ are\ tried
+.RE
+.sp 1
+If $DISPLAY is set (or \fB\-d\fP was specified) and \fB\-g\fP was not specified, the
+display\-specific control socket will be used, otherwise the global one.
+.sp 1
+Tokens in the command and the reply are tab\-separated.
+Command arguments can be specified as separate command line parameters,
+in which case they are simply concatenated with tabs in between.
+.sp 1
+If the command is '\-', \fBtdmctl\fP reads commands from stdin.
+The default command is 'caps'.
+.SH OPTIONS
+.SS
+.SS Options:
+.TP
+.B \-h \-help
+print help message.
+.TP
+.B \-g \-global
+Use global control socket even if $DISPLAY is set
+.TP
+.B \-d \-display
+Override $DISPLAY
+.TP
+.B \-s \-sockets
+Override $DM_CONTROL
+.TP
+.B \-c \-config
+Use alternative tdm config file
+.SS Commands:
+.br
+.SS Global commands:
+.TP 
+.B login
+display (now|schedule) user password [session_arguments]
+.br
+ login user at specified display. if "now" is specified, a possibly running session is killed, otherwise the login is done after the session exits.
+.br
+session_arguments are printf\-like escaped contents for \fI.dmrc\fP. Unlisted keys will default to previously saved values.
+.SS Per\-display commands:
+.TP 
+.B lock
+The display is marked as locked. If the X\-Server crashes in this state, no auto\-relogin will be performed even if the option is on.
+.TP 
+.B unlock
+Reverse the effect of "lock": re\-enable auto\-relogin.
+.TP 
+.B suicide
+The currently running session is forcibly terminated. No auto\-relogin is attempted, but a scheduled "login" command will be executed.
+.SS Commands for all sockets:
+.TP
+.B caps
+Returns a list of this socket's capabilities:
+.IP "    \- tdm"
+identifies tdm, in case some other DM implements this protocol, too.
+.IP "    \- list, activate, lock, suicide, login"
+the respective command is supported.
+.IP "    \- bootoptions"
+the "listbootoptions" command and the "=" option to "shutdown" are supported.
+.IP "    \- shutdown <list>"
+"shutdown" is supported and allowed to the listed users (comma\-separated). "*" means all authenticated users.
+.IP "    \- shutdown"
+"shutdown" is supported and allowed to everybody.
+.IP "    \- nuke <list>"
+forced shutdown is allowed to the listed users.
+.IP "    \- nuke"
+forced shutdown is allowed to everybody.
+.IP "    \- reserve <number>"
+reserve displays are configured and <number> are available at this time.
+.TP 
+\fBlist\fP [all|alllocal]
+.br
+Return a list of running sessions. By default all active sessions are listed. If "all" is specified, passive sessions are listed as well. If "alllocal" is specified, passive sessions are listed as well, but all incoming remote sessions are skipped.
+.sp 1
+Each session entry is a comma\-separated tuple of:
+.RS 7
+\- Display or TTY name
+.br
+\- VT name for local sessions
+.br
+\- Logged in user's name, empty for passive sessions and outgoing
+.br
+  remote sessions (local chooser mode)
+.br
+\- Session type or remote host for outgoing remote sessions,
+.br
+  empty for passive sessions
+.br
+\- A flag field:
+.RS 5
+\- "t" for tty sessions
+.br
+\- "*" for the display belonging to the requesting socket
+.br
+\- "!" for sessions that cannot be killed by the requesting
+.br
+  socket
+.br
+\- New flags might be added later
+.br
+.RE
+\- New fields might be added later
+.RE
+.TP
+\fBreserve\fP [timeout in seconds]
+.br
+Start a reserve login screen. If nobody logs in within the specified amount of time (one minute by default), the display is removed again. When the session on the display exits, the display is removed, too.
+.br
+Permitted only on sockets of local displays and the global socket.
+.TP
+\fBactivate\fP (vt|display)
+.br
+Switch to a particular VT (virtual terminal). The VT may be specified either directly (e.g., vt3) or by a display using it (e.g., :2).
+.br
+Permitted only on sockets of local displays and the global socket.
+.TP
+.B listbootoptions
+List available boot options.
+.br
+=> "ok" list default current default and current are indices into the list and are \-1 if unset or undeterminable.
+.TP
+\fBshutdown\fP (reboot|halt) [=bootchoice]
+.br
+  (ask|trynow|forcenow|schedule|start
+.br
+   (\-1|end (force|forcemy|cancel)))
+.br
+.RS 7
+Request a system shutdown, either a reboot or a halt/poweroff.
+.sp 1
+An OS choice for the next boot may be specified from the list returned by "listbootoptions".
+.sp 1
+Shutdowns requested from per\-display sockets are executed when the current session on that display exits. Such a request may pop up a dialog asking for confirmation and/or authentication.
+.sp 1
+start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately.
+.sp 1
+end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following:
+.RS 3
+- "cancel" \- give up the shutdown.
+.br
+- "force" \- shut down nonetheless.
+.br
+- "forcemy" \- shut down nonetheless if all active sessions
+.br
+   belong to the requesting user. Only for per\-display sockets.
+.RE
+.sp 1
+start and end are specified in seconds since the UNIX epoch.
+.sp 1
+"trynow" is a synonym for "0 0 cancel", "forcenow" for "0 0 force" and "schedule" for "0 \-1".
+.sp 1
+"ask" attempts an immediate shutdown and interacts with the user if active sessions are still running. Only for per\-display sockets.
+.RE
+.TP
+\fBshutdown cancel\fP [local|global]
+.br
+Cancel a scheduled shutdown. The global socket always cancels the currently pending shutdown, while per\-display sockets default to cancelling their queued request.
+.TP
+\fBshutdown status\fP
+Return a list with information about shutdowns.
+.br
+The entries are comma\-separated tuples of:
+.RS 10
+\- ("global"|"local") \- pending vs. queued shutdown. A local
+.br
+  entry can be returned only by a per\-display socket.
+.br
+\- ("halt"|"reboot")
+.br
+\- start
+.br
+\- end
+.br
+\- ("ask"|"force"|"forcemy"|"cancel")
+.br
+\- Numeric user ID of the requesting user, \-1 for the global
+.br
+  socket.
+.br
+\- The next boot OS choice or "\-" for none.
+.br
+\- New fields might be added later.
+.RE
+.SH SEE ALSO
+.BR tdm (1)
+.TP
+.I /opt/trinity/share/doc/tdm/README.gz
+Information about the command sockets (and \fBtdm\fP)
+.SH AUTHORS
+.nf
+Oswald Buddenhagen <ossi@kde.org>
+
+.br
+.fi
+Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors 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/releasenotes/README b/doc/releasenotes/README
deleted file mode 100644
index 8a9d1b1d8..000000000
--- a/doc/releasenotes/README
+++ /dev/null
@@ -1,9 +0,0 @@
-To update the Release Notes in the help handbook:
-
-* For archival purposes, copy index.docbook to index-Rxx.yy.zz.docbook,
-  where Rxx.yy.zz is the previous release version. For example.
-  index-R14.0.0.docbook.
-
-* Edit index.docbook as necessary for the next release. For example, R14.0.1.
-
-No changes or updates are needed in ./release_notes.desktop or ../../tde_release_notes.
diff --git a/doc/releasenotes/index.docbook b/doc/releasenotes/index.docbook
deleted file mode 100644
index 8d50226d9..000000000
--- a/doc/releasenotes/index.docbook
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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 -->
-
-  <!ENTITY r14.0.0 SYSTEM "r14.0.0.docbook">
-  <!ENTITY r14.0.1 SYSTEM "r14.0.1.docbook">
-  <!ENTITY r14.0.2 SYSTEM "r14.0.2.docbook">
-  <!ENTITY r14.0.3 SYSTEM "r14.0.3.docbook">
-  <!ENTITY r14.0.4 SYSTEM "r14.0.4.docbook">
-  <!ENTITY r14.0.5 SYSTEM "r14.0.5.docbook">
-  <!ENTITY r14.0.6 SYSTEM "r14.0.6.docbook">
-  <!ENTITY r14.0.7 SYSTEM "r14.0.7.docbook">
-  <!ENTITY r14.0.8 SYSTEM "r14.0.8.docbook">
-  <!ENTITY r14.0.9 SYSTEM "r14.0.9.docbook">
-
-]>
-
-<article id="release-notes" lang="&language;">
-<title>&tde-release-version; Release Notes</title>
-
-<articleinfo>
-<authorgroup>
-<author>&tde-authors;</author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>&tde-release-date;</date>
-<releaseinfo>&tde-release-version;</releaseinfo>
-
-<copyright>
-<year>&tde-copyright-date;</year>
-<holder>&tde-team;</holder>
-</copyright>
-
-<!-- <legalnotice>&FDLNotice;</legalnotice> -->
-
-<abstract>
-<para>&tde-release-version; Release Notes</para>
-</abstract>
-
-<keywordset>
-<keyword>TDE</keyword>
-<keyword>release notes</keyword>
-</keywordset>
-
-</articleinfo>
-
-<sect1 id="release-notes-introduction">
-<title>Introduction</title>
-
-<para>This  document contains important information for users, developers, and  packagers. This document is
-intended for people who are migrating from previous versions of Trinity. If you are a using Trinity for the
-first time, then you can ignore the contents of this document.</para>
-
-<para>The Trinity Desktop is a full software desktop environment designed for Unix-like operating systems,
-intended  for computer users preferring a traditional desktop model focusing primarily on retaining the overall
-KDE 3.5 user experience and efficiency. Trinity is free/libre software.</para>
-
-<para>First, thank you to the many people who contributed to all of these improvements. Many people played a
-role, including bug fixing, enhancements, testing, etc.</para>
-
-</sect1>
-
-&r14.0.9;
-&r14.0.8;
-&r14.0.7;
-&r14.0.6;
-&r14.0.5;
-&r14.0.4;
-&r14.0.3;
-&r14.0.2;
-&r14.0.1;
-&r14.0.0;
-
-</article>
diff --git a/doc/tdeprint/cups-config.docbook b/doc/tdeprint/cups-config.docbook
index 8f7bf8677..637ce9619 100644
--- a/doc/tdeprint/cups-config.docbook
+++ b/doc/tdeprint/cups-config.docbook
@@ -475,7 +475,7 @@ url="http://localhost:631/">http://localhost:631/</ulink>).</para>
 to <systemitem class="username">root</systemitem>, so never do this,
 as it only involves dangers. Should anyone discover security
 vulnerabilities in one of the used file filters, printer drivers or
-<acronym>CGI</acronym> programs, he could remotely execute arbitrary
+<acronym>CGI</acronym> programs, they could remotely execute arbitrary
 commands on your system with root user privileges. Always use an
 unprivileged account for the server directive
 <guilabel>User</guilabel>.</para>
diff --git a/doc/tdeprint/cupsoptions.docbook b/doc/tdeprint/cupsoptions.docbook
index 0648510db..5468e0594 100644
--- a/doc/tdeprint/cupsoptions.docbook
+++ b/doc/tdeprint/cupsoptions.docbook
@@ -121,7 +121,7 @@ users:</para>
 <para>will allow the usage of this (believe me: very nice and also very
 professional) printer to only the three mentioned users and at the same
 time deny it to all others. If another user wants to print on the
-DigiMaster via this &CUPS; server, he will receive an error message
+DigiMaster via this &CUPS; server, they will receive an error message
 along the lines <errortype>client-error-not-possible</errortype>.</para>
 
 <screen><userinput><command>lpadmin</command> <option>-p</option> <parameter>HeidelbergDigimaster9110</parameter> <option>-v</option> <parameter>lpd:/10.160.16.99/mqueue</parameter> <option>-u</option> <parameter>deny:tackat,boss,waba</parameter> <option>-E</option> <option>-P</option> <parameter>/home/kurt/PPDs/DVHV.ppd</parameter></userinput></screen>
@@ -129,7 +129,7 @@ along the lines <errortype>client-error-not-possible</errortype>.</para>
 <para>will deny the usage of this same printer to the three mentioned
 users and at the same time allow it to all others. If
 <quote>denied</quote> user wants to print on the DigiMaster via this
-&CUPS; server, he will receive an error message along the lines
+&CUPS; server, they will receive an error message along the lines
 <errortype>client-error-not-possible</errortype>.</para>
 
 <note>
@@ -255,8 +255,8 @@ is defined)</para>
 <sect3>
 <title>Related Error Messages</title>
 
-<para>Once a user reaches his quota limit, he'll get a
-<errortype>client-error-not-possible</errortype> message, if he wants to
+<para>Once a user reaches their quota limit, they'll get a
+<errortype>client-error-not-possible</errortype> message, if they want to
 print.</para>
 
 </sect3>
@@ -315,7 +315,7 @@ file.</para>
 </question>
 <answer>
 <para>User is either not allowed to print to a certain printer or has
-achieved his quota (based on file size and/or page number)</para>
+achieved their quota (based on file size and/or page number)</para>
 </answer>
 </qandaentry>
 
diff --git a/doc/tdeprint/index.docbook b/doc/tdeprint/index.docbook
index a574b2298..225469889 100644
--- a/doc/tdeprint/index.docbook
+++ b/doc/tdeprint/index.docbook
@@ -184,15 +184,3 @@ settings</phrase></textobject>
 </chapter>
 
 </book>
-
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
-
-// vim:ts=2:sw=2:tw=78:noet
--->
diff --git a/doc/tdeprint/rlpr.docbook b/doc/tdeprint/rlpr.docbook
index fab48d7bb..a8def77e6 100644
--- a/doc/tdeprint/rlpr.docbook
+++ b/doc/tdeprint/rlpr.docbook
@@ -8,7 +8,7 @@ Utility</title>
 <para>Printer management: basic operations are supported
 (add/remove/modify).</para>
 
-<para>Each user can predefine the printers he wants to use by specifying
+<para>Each user can predefine the printers they want to use by specifying
 the host and related printer queues. Printers are stored on a <quote>per
 user basis</quote>. This module is built around the
 <application>rlpr</application> utility <ulink
diff --git a/doc/tdeprint/tech-overview.docbook b/doc/tdeprint/tech-overview.docbook
index 51e7cc988..e15652aa0 100644
--- a/doc/tdeprint/tech-overview.docbook
+++ b/doc/tdeprint/tech-overview.docbook
@@ -263,18 +263,3 @@ drawing)</para></caption>
 </sect1>
 
 </chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:"index.docbook" "book"
-End:
--->
diff --git a/doc/tdeprint/theory.docbook b/doc/tdeprint/theory.docbook
index 909cd19bb..4722ec366 100644
--- a/doc/tdeprint/theory.docbook
+++ b/doc/tdeprint/theory.docbook
@@ -17,7 +17,7 @@ needs extra theory to solve a practical problem.</para>
 
 
 <para>Earlier on in history, every developer of a program that was
-capable of producing printable output had to write his own printer
+capable of producing printable output had to write their own printer
 drivers too.  That was quite complicated, because different programs
 have different file formats.  Even programs with the same purpose, for
 example: word processors, often do not understand each other's formats.
@@ -41,8 +41,8 @@ paper (or other output devices, like monitors, photo typesetters, &etc;)
 in a common way, was a move that filled a big gap. <!-- FIXME --></para>
 
 <para>One such development was &PostScript; by Adobe.  It meant that an
-application programmer could concentrate on making his program generate
-a &PostScript; language description of his printable page, while
+application programmer could concentrate on making their program generate
+a &PostScript; language description of their printable page, while
 printing device developers could focus on making their devices
 &PostScript; literate.</para>
 
diff --git a/doc/tdesu/index.docbook b/doc/tdesu/index.docbook
index b8199ba5a..c2f61a8d9 100644
--- a/doc/tdesu/index.docbook
+++ b/doc/tdesu/index.docbook
@@ -310,11 +310,3 @@ have a suggestion, feel free to contact me.</para>
 </chapter>
 
 </book>
-<!--
-Local Variables:
-mode: sgml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/tdm/index.docbook b/doc/tdm/index.docbook
index 78f74486a..505652714 100644
--- a/doc/tdm/index.docbook
+++ b/doc/tdm/index.docbook
@@ -1522,11 +1522,3 @@ unpredictability. This is used during the generation of random numbers.</para></
 
 </glossary>
 </book>
-<!--
-Local Variables:
-mode: xml
-sgml-omittag: nil
-sgml-shorttag: t
-End:
--->
-
diff --git a/doc/userguide/burning-cds.docbook b/doc/userguide/burning-cds.docbook
deleted file mode 100644
index 901709ff4..000000000
--- a/doc/userguide/burning-cds.docbook
+++ /dev/null
@@ -1,38 +0,0 @@
-<sect1 id="burning">
-<!-- Uncomment the <*info> below and add your name to be -->
-<!-- credited for writing this section. -->
-
-<!--
-<sect1info>
-<authorgroup>
-<author>
-<firstname>Your First Name here</firstname>
-<surname>Your Surname here </surname>
-</author>
-</authorgroup>
-</sect1info>
--->
-
-<title>Burning CDs and DVDs</title>
-
-<para>Brief overview of k3b</para>
-
-</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/pdf-files.docbook b/doc/userguide/pdf-files.docbook
deleted file mode 100644
index 0dd83c2e3..000000000
--- a/doc/userguide/pdf-files.docbook
+++ /dev/null
@@ -1,40 +0,0 @@
-<sect1 id="pdfs">
-<!-- Uncomment the <*info> below and add your name to be -->
-<!-- credited for writing this section. -->
-
-<!--
-<sect1info>
-<authorgroup>
-<author>
-<firstname>Your First Name here</firstname>
-<surname>Your Surname here </surname>
-</author>
-</authorgroup>
-</sect1info>
--->
-
-<title>PDF Files</title>
-
-<para>How to print to a pdf file</para>
-
-<para>Viewing pdf files</para>
-
-</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/screen-captures.docbook b/doc/userguide/screen-captures.docbook
deleted file mode 100644
index 35d1a726a..000000000
--- a/doc/userguide/screen-captures.docbook
+++ /dev/null
@@ -1,38 +0,0 @@
-<sect1 id="screen-captures">
-<!-- Uncomment the <*info> below and add your name to be -->
-<!-- credited for writing this section. -->
-
-<!--
-<sect1info>
-<authorgroup>
-<author>
-<firstname>Your First Name here</firstname>
-<surname>Your Surname here </surname>
-</author>
-</authorgroup>
-</sect1info>
--->
-
-<title>Screen Captures</title>
-
-<para>Grabbing screen caps</para>
-
-</sect1>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/doc/userguide/where-next.docbook b/doc/userguide/where-next.docbook
deleted file mode 100644
index 2da8d3e84..000000000
--- a/doc/userguide/where-next.docbook
+++ /dev/null
@@ -1,40 +0,0 @@
-<chapter id="where-next">
-<!-- Uncomment the <*info> below and add your name to be -->
-<!-- credited for writing this section. -->
-
-<!--
-<chapterinfo>
-<authorgroup>
-<author>
-<firstname>Your First Name here</firstname>
-<surname>Your Surname here </surname>
-</author>
-</authorgroup>
-</chapterinfo>
--->
-
-<title>Where To Next?</title>
-
-<para>Web Sites</para>
-
-<para>Books</para>
-
-</chapter>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: xml
-sgml-omittag:nil
-sgml-shorttag:nil
-sgml-namecase-general:nil
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:0
-sgml-indent-data:true
-sgml-parent-document:("index.docbook" "book" "sect1")
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt
index a2b643909..080dda686 100644
--- a/drkonqi/CMakeLists.txt
+++ b/drkonqi/CMakeLists.txt
@@ -33,9 +33,9 @@ tde_add_executable( drkonqi AUTOMOC
   SOURCES
     krashdcopinterface.skel main.cpp debugger.cpp
     bugdescription.cpp bugdescriptiondialog.cpp
-    sha1.cc krashconf.cpp drbugreport.cpp
+    sha1.cpp krashconf.cpp drbugreport.cpp
     backtrace.cpp toplevel.cpp
-  LINK tdeio-shared ${LIBR_LIBRARIES}
+  LINK tdeio-shared ${TDEHW_LIBRARIES} ${LIBR_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index 70bb35fa7..813020190 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -36,7 +36,7 @@
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 #include <tdetempfile.h>
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #endif
 
@@ -89,7 +89,7 @@ void BackTrace::start()
   {
     TQObject * o = parent();
 
-    if (o && !o->inherits(TQWIDGET_OBJECT_NAME_STRING))
+    if (o && !o->inherits("TQWidget"))
     {
       o = NULL;
     }
@@ -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 );
 }
@@ -358,7 +358,7 @@ void BackTrace::processBacktrace()
 	}
 #endif // HAVE_ELFICON
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 	// Append potentially important hardware information
 	m_strBt.append("\n==== (tdehwlib) hardware information ====\n");
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h
index 94f5bcf9f..5bcd1822e 100644
--- a/drkonqi/backtrace.h
+++ b/drkonqi/backtrace.h
@@ -36,7 +36,7 @@ class KTempFile;
 
 class BackTrace : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   BackTrace(const KrashConfig *krashconf, TQObject *parent,
diff --git a/drkonqi/bugdescriptiondialog.cpp b/drkonqi/bugdescriptiondialog.cpp
index 6d6b2d75a..32c7b4b2d 100644
--- a/drkonqi/bugdescriptiondialog.cpp
+++ b/drkonqi/bugdescriptiondialog.cpp
@@ -94,7 +94,7 @@ BugDescriptionDialog::BugDescriptionDialog( TQWidget * parentw, bool modal, cons
 	lay->addWidget( m_descriptionLabel );
 	
 	// The multiline-edit
-	m_lineedit = new TQMultiLineEdit( parent, TQMULTILINEEDIT_OBJECT_NAME_STRING );
+	m_lineedit = new TQMultiLineEdit( parent, "TQMultiLineEdit" );
 	m_lineedit->setMinimumHeight( 180 ); // make it big
 	m_lineedit->setWordWrap(TQMultiLineEdit::WidgetWidth);
 	lay->addWidget( m_lineedit, 10 /*stretch*/ );
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/crashtest.h b/drkonqi/crashtest.h
index a3fe0cb2a..d2a769a1b 100644
--- a/drkonqi/crashtest.h
+++ b/drkonqi/crashtest.h
@@ -31,7 +31,7 @@
 
 class WorkerObject : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public slots:
 		void run();
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index 4e3622e12..2de6fb3f8 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -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 );
 }
 
@@ -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/debugger.h b/drkonqi/debugger.h
index 0604d5fcf..64276b2c8 100644
--- a/drkonqi/debugger.h
+++ b/drkonqi/debugger.h
@@ -38,7 +38,7 @@ class BackTrace;
 
 class KrashDebugger : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KrashDebugger(const KrashConfig *krashconf, TQWidget *parent = 0, const char *name = 0);
diff --git a/drkonqi/drbugreport.h b/drkonqi/drbugreport.h
index a76740416..17585c321 100644
--- a/drkonqi/drbugreport.h
+++ b/drkonqi/drbugreport.h
@@ -34,7 +34,7 @@ class TDEAboutData;
 
 class DrKBugReport : public KBugReport
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h
index d3d27e160..be823cba1 100644
--- a/drkonqi/krashconf.h
+++ b/drkonqi/krashconf.h
@@ -36,7 +36,7 @@
 
 class KrashConfig : public TQObject, public KrashDCOPInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KrashConfig();
diff --git a/drkonqi/sha1.cc b/drkonqi/sha1.cpp
index 86dd30a99..86dd30a99 100644
--- a/drkonqi/sha1.cc
+++ b/drkonqi/sha1.cpp
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index a4ad27603..0e3a38a49 100644
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@@ -89,8 +89,8 @@ 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() );
@@ -156,12 +156,12 @@ void Toplevel :: slotUser1()
   m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData());
 
   if (i == KMessageBox::Yes) {
-    TQApplication::setOverrideCursor ( tqwaitCursor );
+    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();
 
@@ -195,12 +195,12 @@ void Toplevel :: slotNewDebuggingApp(const TQString& launchName)
 void Toplevel :: slotUser3()
 {
 	enableButton(User3, false);
-	TQApplication::setOverrideCursor ( tqwaitCursor );
+	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/drkonqi/toplevel.h b/drkonqi/toplevel.h
index 06b23173b..c3179e907 100644
--- a/drkonqi/toplevel.h
+++ b/drkonqi/toplevel.h
@@ -42,7 +42,7 @@ class BugDescription;
 
 class Toplevel : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Toplevel(KrashConfig *krash, TQWidget *parent = 0, const char * name = 0);
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index fd6fd1283..a5290e531 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -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(), kapp, TQ_SLOT( quit() ) );
   bbox->layout();
 
   layout->addWidget( bbox );
 
-	connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) );
+	connect( kapp, TQ_SIGNAL( lastWindowClosed() ), kapp, 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 ), kapp, TQ_SLOT( quit() ) );
 
   TDEAcceleratorManager::manage( this );
 }
diff --git a/kappfinder/toplevel.h b/kappfinder/toplevel.h
index 69e83eb5a..9e3dd2422 100644
--- a/kappfinder/toplevel.h
+++ b/kappfinder/toplevel.h
@@ -35,7 +35,7 @@ class TQPushButton;
 
 class TopLevel : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TopLevel( const TQString &destDir, TQWidget *parent = 0, const char *name = 0 );
diff --git a/kate/README b/kate/README
index 67eb04be6..6d0d7d04d 100644
--- a/kate/README
+++ b/kate/README
@@ -19,6 +19,6 @@ Licensing:
 The Kate app/utils/interfaces and KWrite app are licensed under the LGPL VERSION 2.
 
                 *** Undocumented features in Kate version 2.5.2 ***
-* The KateApplication DCOP interface has a function QString session() that
+* The KateApplication DCOP interface has a function TQString session() that
 returns the name of the active session (which might be an empty string).
 (but hey, documentation of the DCOP interface is missing completely)
\ No newline at end of file
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 57c274636..0e4c18121 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -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();
@@ -479,5 +479,3 @@ KateMainWindow *KateApp::mainWindow (uint n)
 
   return 0;
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h
index f421df5a7..47918a46f 100644
--- a/kate/app/kateapp.h
+++ b/kate/app/kateapp.h
@@ -41,7 +41,7 @@ class TDECmdLineArgs;
  */
 class KDE_EXPORT KateApp : public TDEApplication
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   /**
    * constructors & accessor to app object + plugin interface for it
diff --git a/kate/app/kateappIface.cpp b/kate/app/kateappIface.cpp
index bc06f1b78..9214c3c05 100644
--- a/kate/app/kateappIface.cpp
+++ b/kate/app/kateappIface.cpp
@@ -101,5 +101,3 @@ const TQString& KateAppDCOPIface::session() const
 {
   return m_app->sessionManager()->getActiveSessionName();
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 883730c08..1d3cfd5aa 100644
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@@ -102,7 +102,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   config->setGroup("General");
 
   // GROUP with the one below: "Appearance"
-  TQButtonGroup *bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Appearance"), frGeneral );
+  TQButtonGroup *bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("&Appearance"), frGeneral );
   lo->addWidget( bgStartup );
 
   // show full path in title
@@ -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,10 +124,10 @@ 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, Qt::Horizontal, i18n("&Behavior"), frGeneral );
+  bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("&Behavior"), frGeneral );
   lo->addWidget( bgStartup );
 
   // number of recent files
@@ -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,11 +172,11 @@ 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, Qt::Horizontal, i18n("Meta-Information"), frGeneral );
+  bgStartup = new TQButtonGroup( 2, TQt::Horizontal, i18n("Meta-Information"), frGeneral );
   lo->addWidget( bgStartup );
 
   // save meta infos
@@ -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
@@ -214,7 +214,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
   lo->setSpacing(KDialog::spacingHint());
 
   // GROUP with the one below: "Startup"
-  bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Elements of Sessions"), frSessions );
+  bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Elements of Sessions"), frSessions );
   lo->addWidget( bgStartup );
 
   // restore view  config
@@ -224,11 +224,11 @@ 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;
 
-  sessions_start = new TQButtonGroup( 1, Qt::Horizontal, i18n("Behavior on Application Startup"), frSessions );
+  sessions_start = new TQButtonGroup( 1, TQt::Horizontal, i18n("Behavior on Application Startup"), frSessions );
   lo->add (sessions_start);
 
   sessions_start->setRadioButtonExclusive( true );
@@ -245,11 +245,11 @@ 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, Qt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions );
+  sessions_exit = new TQButtonGroup( 1, TQt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions );
   lo->add (sessions_exit);
 
   sessions_exit->setRadioButtonExclusive( true );
@@ -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/kateconfigdialog.h b/kate/app/kateconfigdialog.h
index a90cdd1c0..91b84ee5d 100644
--- a/kate/app/kateconfigdialog.h
+++ b/kate/app/kateconfigdialog.h
@@ -43,7 +43,7 @@ struct PluginPageListItem
 
 class KateConfigDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateConfigDialog (KateMainWindow *parent, Kate::View *view);
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/kateconfigplugindialogpage.h b/kate/app/kateconfigplugindialogpage.h
index 009f30739..018c97dfa 100644
--- a/kate/app/kateconfigplugindialogpage.h
+++ b/kate/app/kateconfigplugindialogpage.h
@@ -31,7 +31,7 @@ class KatePluginListItem;
 
 class KatePluginListView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KatePluginListItem;
 
@@ -47,7 +47,7 @@ class KatePluginListView : public TDEListView
 
 class KateConfigPluginPage: public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateConfigPluginPage(TQWidget *parent, class KateConfigDialog *dialog);
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/kateconsole.h b/kate/app/kateconsole.h
index dabfda38d..77fa455a4 100644
--- a/kate/app/kateconsole.h
+++ b/kate/app/kateconsole.h
@@ -44,7 +44,7 @@ class KateMainWindow;
  */
 class KateConsole : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 6cca9efe0..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();
 
@@ -597,7 +597,7 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
   {
     KMD5 md5;
 
-    if (!md5.update(TQT_TQIODEVICE_OBJECT(f)))
+    if (!md5.update(f))
       return false;
 
     md5.hexDigest(result);
@@ -608,5 +608,3 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
 
   return true;
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h
index 1eaef7f99..81ff7a5c8 100644
--- a/kate/app/katedocmanager.h
+++ b/kate/app/katedocmanager.h
@@ -52,11 +52,11 @@ class KateDocumentInfo
     unsigned char modifiedOnDiscReason;
 };
 
-typedef QPair<KURL,TQDateTime> TPair;
+typedef TQPair<KURL,TQDateTime> TPair;
 
 class KateDocManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateDocManager (TQObject *parent);
@@ -154,4 +154,3 @@ class KateDocManager : public TQObject
 };
 
 #endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index 3bb21c934..e93e758ea 100644
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@@ -185,12 +185,12 @@ void KateExternalToolsCommand::reload () {
 }
 
 bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQString &) {
-	TQWidget *wv=tqt_dynamic_cast<TQWidget*>(view);
+	TQWidget *wv=dynamic_cast<TQWidget*>(view);
 	if (!wv) {
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
 		return false;
 	}
-  KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
+  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
 	if (!dmw) {
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
 		return false;
@@ -200,7 +200,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
 	if (actionName.isEmpty()) return false;
 // 	kdDebug(13001)<<"actionName is not empty:"<<actionName<<endl;
 	KateExternalToolsMenuAction *a=
-		tqt_dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
+		dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
 	if (!a) return false;
 // 	kdDebug(13001)<<"trying to find action"<<endl;
 	TDEAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8()));
@@ -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();
 }
@@ -389,7 +389,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
     TDEActionPtrList actions = m_actionCollection->actions();
     for (TDEActionPtrList::iterator it = actions.begin(); it != actions.end(); ++it )
     {
-      KateExternalToolAction *action = tqt_dynamic_cast<KateExternalToolAction*>(*it);
+      KateExternalToolAction *action = dynamic_cast<KateExternalToolAction*>(*it);
       if ( action )
       {
         l = action->tool->mimetypes;
@@ -438,7 +438,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leName = new TQLineEdit( w );
   lo->addWidget( leName, 1, 2 );
   l = new TQLabel( leName, i18n("&Label:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 1, 1 );
   if ( tool ) leName->setText( tool->name );
   TQWhatsThis::add( leName, i18n(
@@ -453,7 +453,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   teCommand = new TQTextEdit( w );
   lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
   l = new TQLabel( teCommand, i18n("S&cript:"), w );
-  l->setAlignment( Qt::AlignTop|Qt::AlignRight );
+  l->setAlignment( TQt::AlignTop|TQt::AlignRight );
   lo->addWidget( l, 2, 1 );
   if ( tool ) teCommand->setText( tool->command );
   TQWhatsThis::add( teCommand, i18n(
@@ -476,7 +476,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leExecutable = new TQLineEdit( w );
   lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
   l = new TQLabel( leExecutable, i18n("&Executable:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 3, 1 );
   if ( tool ) leExecutable->setText( tool->tryexec );
   TQWhatsThis::add( leExecutable, i18n(
@@ -487,7 +487,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leMimetypes = new TQLineEdit( w );
   lo->addWidget( leMimetypes, 4, 2 );
   l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 4, 1 );
   if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
   TQWhatsThis::add( leMimetypes, i18n(
@@ -498,14 +498,14 @@ 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.") );
 
   cmbSave = new TQComboBox(w);
   lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
   l = new TQLabel( cmbSave, i18n("&Save:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 5, 1 );
   TQStringList sl;
   sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@@ -520,7 +520,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
   leCmdLine = new TQLineEdit( w );
   lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
   l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
-  l->setAlignment( l->alignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|TQt::AlignRight );
   lo->addWidget( l, 6, 1 );
   if ( tool ) leCmdLine->setText( tool->cmdname );
   TQWhatsThis::add( leCmdLine, i18n(
@@ -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 );
@@ -869,4 +869,3 @@ void KateExternalToolsConfigWidget::slotMoveDown()
   m_changed = true;
 }
 //END KateExternalToolsConfigWidget
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index ef3a9e9fd..aeefb0aa5 100644
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@@ -55,7 +55,7 @@ class KateExternalToolsMenuAction : public TDEActionMenu
 {
   friend class KateExternalToolAction;
 
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateExternalToolsMenuAction( const TQString &text=TQString::null, TQObject *parent=0, const char* name=0, class KateMainWindow *mw=0 );
     ~KateExternalToolsMenuAction() {};
@@ -80,7 +80,7 @@ class KateExternalToolsMenuAction : public TDEActionMenu
  */
 class KateExternalToolAction : public TDEAction, public KWordMacroExpander
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateExternalToolAction( TQObject *parent, const char *name, class KateExternalTool *t );
     ~KateExternalToolAction();
@@ -142,7 +142,7 @@ class KateExternalTool
  */
 class KateExternalToolsConfigWidget : public Kate::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateExternalToolsConfigWidget( TQWidget *parent, const char* name);
     virtual ~KateExternalToolsConfigWidget();
@@ -201,7 +201,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage
  */
 class KateExternalToolServiceEditor : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 9cf4b172d..b33d0149b 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -94,7 +94,7 @@ KateFileList::KateFileList (KateMainWindow *main,
   m_editShade = TQColor( 255, 102, 153 );
   m_enableBgShading = false;
 
-  setFocusPolicy ( TQ_NoFocus  );
+  setFocusPolicy ( TQWidget::NoFocus  );
 
   viewManager = _viewManager;
 
@@ -107,7 +107,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 +115,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 +136,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 ()
@@ -227,9 +227,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();
@@ -267,7 +267,7 @@ void KateFileList::slotActivateView( TQListViewItem *item )
   if (info && info->modifiedOnDisc) {
     // Simulate mouse button release, otherwise the paused DND operation
     // will reactivate as soon as the mouse re-enters the list view!
-    TQMouseEvent e(TQEvent::MouseButtonRelease, m_lastMouseDownPos, Qt::LeftButton, 0);
+    TQMouseEvent e(TQEvent::MouseButtonRelease, m_lastMouseDownPos, TQt::LeftButton, 0);
     contentsMouseReleaseEvent(&e);
   }
 
@@ -659,7 +659,7 @@ KFLConfigPage::KFLConfigPage( TQWidget* parent, const char *name, KateFileList *
   int spacing = KDialog::spacingHint();
   lo1->setSpacing( spacing );
 
-  TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Background Shading"), this );
+  TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Background Shading"), this );
   lo1->addWidget( gb );
 
   TQWidget *g = new TQWidget( gb );
@@ -707,11 +707,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()
@@ -756,6 +756,3 @@ void KFLConfigPage::slotMyChanged()
 }
 
 //END KFLConfigPage
-
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index 75d93915c..1112c1235 100644
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@@ -76,7 +76,7 @@ class KateFileListItem : public TQListViewItem
 
 class KateFileList : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KFLConfigPage;
 
@@ -172,7 +172,7 @@ class KateFileList : public TDEListView
 };
 
 class KFLConfigPage : public Kate::ConfigPage {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KFLConfigPage( TQWidget* parent=0, const char *name=0, KateFileList *fl=0 );
     virtual ~KFLConfigPage() {};
@@ -198,4 +198,3 @@ class KFLConfigPage : public Kate::ConfigPage {
 
 
 #endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index a57115774..a9c9d2c16 100644
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@@ -113,14 +113,14 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
 {
   mActionCollection = new TDEActionCollection( this );
 
-  TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
+  TQtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
 
   KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this);
   toolbar = new KateFileSelectorToolBar(tbp);
   tbp->setToolBar(toolbar);
   toolbar->setMovingEnabled(false);
   toolbar->setFlat(true);
-  tqInstallMsgHandler( oldHandler );
+  qInstallMsgHandler( oldHandler );
 
   cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
   cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
@@ -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;
 
@@ -234,7 +234,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name)
     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 );
     }
   }
@@ -485,7 +485,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e )
       And the popup is rather useless, if the paths are only partly visible.
   */
   TQListBox *lb = cmbPath->listBox();
-  if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) {
+  if ( o == lb && e->type() == TQEvent::Show ) {
     int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
     int w = TQMIN( mainwin->width(), lb->contentsWidth() + add );
     lb->resize( w, lb->height() );
@@ -532,23 +532,23 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect
   lo->setSpacing( spacing );
 
   // Toolbar - a lot for a little...
-  TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this );
+  TQGroupBox *gbToolbar = new TQGroupBox( 1, TQt::Vertical, i18n("Toolbar"), this );
   acSel = new TDEActionSelector( gbToolbar );
   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, Qt::Horizontal, i18n("Auto Synchronization"), this );
+  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, Qt::Horizontal, i18n("Session"), this );
+  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 );
@@ -718,4 +718,3 @@ void KFSConfigPage::slotMyChanged()
   slotChanged();
 }
 //END KFSConfigPage
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index 33482faba..09ea07a76 100644
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@@ -48,7 +48,7 @@ class KFileView;
 /* I think this fix for not moving toolbars is better */
 class KateFileSelectorToolBar: public TDEToolBar
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KateFileSelectorToolBar(TQWidget *parent);
 	virtual ~KateFileSelectorToolBar();
@@ -58,7 +58,7 @@ public:
 
 class KateFileSelectorToolBarParent: public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KateFileSelectorToolBarParent(TQWidget *parent);
 	~KateFileSelectorToolBarParent();
@@ -71,7 +71,7 @@ protected:
 
 class KateFileSelector : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KFSConfigPage;
 
@@ -144,7 +144,7 @@ class KateFileSelector : public TQVBox
     user closed session.
 */
 class KFSConfigPage : public Kate::ConfigPage {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KFSConfigPage( TQWidget* parent=0, const char *name=0, KateFileSelector *kfs=0);
     virtual ~KFSConfigPage() {};
@@ -169,4 +169,3 @@ class KFSConfigPage : public Kate::ConfigPage {
 
 
 #endif //__KATE_FILESELECTOR_H__
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 70f067100..00bd1dcd6 100644
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@@ -101,7 +101,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
 
   TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
   lPattern->setFixedSize(lPattern->sizeHint());
-  loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter);
+  loInput->addWidget(lPattern, 0, 0, TQt::AlignRight | TQt::AlignVCenter);
 
   TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
   loInput->addLayout( loPattern, 0, 1 );
@@ -128,7 +128,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
 
   TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
   lTemplate->setFixedSize(lTemplate->sizeHint());
-  loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter);
+  loInput->addWidget(lTemplate, 1, 0, TQt::AlignRight | TQt::AlignVCenter);
 
   TQBoxLayout *loTemplate = new TQHBoxLayout(4);
   loInput->addLayout(loTemplate, 1, 1);
@@ -147,13 +147,13 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
 
   TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
   lFiles->setFixedSize(lFiles->sizeHint());
-  loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);
+  loInput->addWidget(lFiles, 2, 0, TQt::AlignRight | TQt::AlignVCenter);
 
   TQBoxLayout *loFiles = new TQHBoxLayout( 2 );
   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);
@@ -168,7 +168,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
 
   TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
   lDir->setFixedSize(lDir->sizeHint());
-  loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter);
+  loInput->addWidget(lDir, 3, 0, TQt::AlignRight | TQt::AlignVCenter);
 
   TQBoxLayout *loDir = new TQHBoxLayout(3);
   loInput->addLayout(loDir, 3, 1);
@@ -189,7 +189,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
   cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
   loDir->addWidget(cbRecursive);
 
-  KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical);
+  KButtonBox *actionbox = new KButtonBox(this, TQt::Vertical);
   layout->addWidget(actionbox, 0, 2);
   actionbox->addStretch();
   btnSearch = static_cast<KPushButton*>(actionbox->addButton(KGuiItem(i18n("Find"),"edit-find")));
@@ -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());
 }
@@ -389,15 +389,15 @@ 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(Qt::WaitCursor) );
+  lbResult->setCursor( TQCursor(TQt::WaitCursor) );
   btnClear->setEnabled( false );
   btnSearch->setGuiItem( KGuiItem(i18n("Cancel"), "button_cancel"));
   childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
@@ -532,8 +532,8 @@ void GrepTool::setDirName(const TQString &dir){
 bool GrepTool::eventFilter( TQObject *o, TQEvent *e )
 {
   if ( e->type() == TQEvent::KeyPress && (
-       ((TQKeyEvent*)e)->key() == Qt::Key_Return ||
-       ((TQKeyEvent*)e)->key() == Qt::Key_Enter ) )
+       ((TQKeyEvent*)e)->key() == TQt::Key_Return ||
+       ((TQKeyEvent*)e)->key() == TQt::Key_Enter ) )
   {
     slotSearch();
     return true;
diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h
index 1bd930735..dbe722f20 100644
--- a/kate/app/kategrepdialog.h
+++ b/kate/app/kategrepdialog.h
@@ -37,7 +37,7 @@ class TQEvent;
 
 class GrepTool : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     GrepTool(TQWidget *parent, const char *name=0);
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/katemailfilesdialog.h b/kate/app/katemailfilesdialog.h
index a2de4e504..4b60a1946 100644
--- a/kate/app/katemailfilesdialog.h
+++ b/kate/app/katemailfilesdialog.h
@@ -36,7 +36,7 @@ class KateMainWindow;
     
 */
 class KateMailDialog : public KDialogBase {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateMailDialog( TQWidget *parent=0,
                           KateMainWindow *mainwin=0 );
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index 8cdd3a52a..2291a8668 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -263,5 +263,3 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
   // execute ourself ;)
   return app.exec();
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 298b455eb..811145182 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -168,13 +168,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();
 
@@ -216,7 +216,7 @@ void KateMainWindow::setupMainWindow ()
 
   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 +226,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 +243,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 +271,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");
+      m_sessionpanel, TQ_SLOT(slotNewSession()), actionCollection(), "session_new");
   new TDEAction(i18n("&Save"), "document-save", 0, 
-      TQT_TQOBJECT(m_sessionpanel), TQT_SLOT(slotSaveSession()), actionCollection(), "session_save");
+      m_sessionpanel, TQ_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");
+      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 +412,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();
 }
 
@@ -514,7 +514,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();
@@ -816,9 +816,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);
 }
@@ -937,7 +937,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,8 +948,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);
   }
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index 48f4129d6..1e8839991 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -47,7 +47,7 @@ class KateExternalToolsMenuAction;
 
 class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateConfigDialog;
   friend class KateViewManager;
@@ -222,7 +222,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
 
 class KateSessionListActionMenu : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSessionListActionMenu(KateMainWindow *mw, const TQString &text, TQObject *parent = NULL, const char *name = NULL);
@@ -236,5 +236,3 @@ class KateSessionListActionMenu : public TDEActionMenu
 };
 
 #endif
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index adf297563..15b4e62d1 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,8 +142,8 @@ 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 ) );
@@ -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_OBJECT_NAME_STRING)) {
-    setFocusProxy (::tqqt_cast<QWidget*>(TQT_TQOBJECT(ev->child())));
+  if (ev->inserted() && ev->child() && ev->child()->tqt_cast("TQWidget")) {
+    setFocusProxy (::tqt_cast<TQWidget*>(ev->child()));
 }
 
   TQVBox::childEvent (ev);
@@ -286,7 +286,7 @@ Sidebar::~Sidebar ()
 void Sidebar::setSplitter (Splitter *sp)
 {
   m_splitter = sp;
-  m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? Qt::Horizontal : Qt::Vertical, m_splitter);
+  m_ownSplit = new Splitter ((position() == KMultiTabBar::Top || position() == KMultiTabBar::Bottom) ? TQt::Horizontal : TQt::Vertical, m_splitter);
   m_ownSplit->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
   m_ownSplit->setChildrenCollapsible( false );
   m_splitter->setResizeMode( m_ownSplit, TQSplitter::KeepSize );
@@ -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;
@@ -449,7 +449,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
   if (ev->type()==TQEvent::ContextMenu)
   {
     TQContextMenuEvent *e = (TQContextMenuEvent *) ev;
-    KMultiTabBarTab *bt = tqt_dynamic_cast<KMultiTabBarTab*>(obj);
+    KMultiTabBarTab *bt = dynamic_cast<KMultiTabBarTab*>(obj);
     if (bt)
     {
       kdDebug()<<"Request for popup"<<endl;
@@ -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
@@ -672,7 +672,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
 
   m_sidebars[KMultiTabBar::Left] = new Sidebar (KMultiTabBar::Left, this, hb);
 
-  m_hSplitter = new Splitter (Qt::Horizontal, hb);
+  m_hSplitter = new Splitter (TQt::Horizontal, hb);
   m_hSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
   m_sidebars[KMultiTabBar::Left]->setSplitter (m_hSplitter);
@@ -682,7 +682,7 @@ MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
 
   m_sidebars[KMultiTabBar::Top] = new Sidebar (KMultiTabBar::Top, this, vb);
 
-  m_vSplitter = new Splitter (Qt::Vertical, vb);
+  m_vSplitter = new Splitter (TQt::Vertical, vb);
   m_vSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
   m_sidebars[KMultiTabBar::Top]->setSplitter (m_vSplitter);
@@ -966,5 +966,3 @@ void MainWindow::saveSession (TDEConfig *config, const TQString &group)
 //END MAIN WINDOW
 
 } // namespace KateMDI
-
-// kate: space-indent on; indent-width 2;
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index a291ebb8c..f9eef3bda 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -40,7 +40,7 @@ namespace KateMDI {
 /** This class is needed because TQSplitter cant return an index for a widget. */
 class Splitter : public TQSplitter
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -60,7 +60,7 @@ class Splitter : public TQSplitter
 
 class ToggleToolViewAction : public TDEToggleAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -79,7 +79,7 @@ class ToggleToolViewAction : public TDEToggleAction
 
 class GUIClient : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -104,7 +104,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
 
 class ToolView : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   friend class Sidebar;
@@ -179,7 +179,7 @@ class ToolView : public TQVBox
 
 class Sidebar : public KMultiTabBar
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -252,7 +252,7 @@ class Sidebar : public KMultiTabBar
 
 class MainWindow : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   friend class ToolView;
@@ -444,5 +444,3 @@ class MainWindow : public KParts::MainWindow
 }
 
 #endif
-
-// kate: space-indent on; indent-width 2;
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 508e0aadc..3babd75e8 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -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;
@@ -216,8 +216,8 @@ void KateMwModOnHdDialog::slotDiff()
   KProcIO *p = new KProcIO();
   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(KProcIO*)), this, TQ_SLOT(slotPRead(KProcIO*)) );
 
   setCursor( WaitCursor );
 
@@ -277,5 +277,3 @@ void KateMwModOnHdDialog::slotPDone( TDEProcess *p )
   delete m_tmpfile;
   m_tmpfile = 0;
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h
index 3ae4d072a..2ca012f84 100644
--- a/kate/app/katemwmodonhddialog.h
+++ b/kate/app/katemwmodonhddialog.h
@@ -33,7 +33,7 @@ class TDEProcess;
  */
 class KateMwModOnHdDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateMwModOnHdDialog( DocVector docs, TQWidget *parent=0, const char *name=0 );
     ~KateMwModOnHdDialog();
@@ -58,4 +58,3 @@ class KateMwModOnHdDialog : public KDialogBase
 };
 
 #endif // _KATE_MW_MODONHD_DIALOG_H_
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katepluginmanager.h b/kate/app/katepluginmanager.h
index 1617c5501..e8fbddcb0 100644
--- a/kate/app/katepluginmanager.h
+++ b/kate/app/katepluginmanager.h
@@ -43,7 +43,7 @@ typedef TQValueList<KatePluginInfo> KatePluginList;
 
 class KatePluginManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KatePluginManager(TQObject *parent);
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/katesavemodifieddialog.h b/kate/app/katesavemodifieddialog.h
index 92036c63c..e66da24d4 100644
--- a/kate/app/katesavemodifieddialog.h
+++ b/kate/app/katesavemodifieddialog.h
@@ -26,7 +26,7 @@ class TQListViewItem;
 class TDEListView;
 
 class KateSaveModifiedDialog: public KDialogBase {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate::Document> documents);
 	virtual ~KateSaveModifiedDialog();
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index 51d52b7c3..d57101310 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -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)
@@ -897,5 +897,3 @@ void KateSessionChooser::slotSelectionChanged()
 //END KateSessionChooser
 
 #include "katesession.moc"
-
-// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/katesession.h b/kate/app/katesession.h
index e4a31f441..fa267e91f 100644
--- a/kate/app/katesession.h
+++ b/kate/app/katesession.h
@@ -175,7 +175,7 @@ class KateSession
 //FIXME add kdDebug statement to ease debugging
 class KateSessionManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
@@ -503,7 +503,7 @@ class KateSessionChooserItem : public TDEListViewItem
 //FIXME create one single KateSessionChooser and reuse it all the time
 class KateSessionChooser : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		enum Result
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/katesessionpanel.h b/kate/app/katesessionpanel.h
index 023de53e2..d8b1e156c 100644
--- a/kate/app/katesessionpanel.h
+++ b/kate/app/katesessionpanel.h
@@ -45,7 +45,7 @@ class TDEActionCollection;
 //FIXME improve string to distinguish between new session and saving an unnamed session
 class KateSessionNameChooser : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 
@@ -72,7 +72,7 @@ class KateSessionNameChooser : public KDialogBase
 //BEGIN KateSessionPanelToolBarParent
 class KateSessionPanelToolBarParent: public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSessionPanelToolBarParent(TQWidget *parent) : TQFrame(parent), m_tbar(0) {}
@@ -109,7 +109,7 @@ class KateSessionPanelItem : public TDEListViewItem
 //BEGIN KateSessionPanel
 class KateSessionPanel : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  	friend class KateMainWindow;
  	
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/katetabwidget.h b/kate/app/katetabwidget.h
index 7e4327595..6bac94e1b 100644
--- a/kate/app/katetabwidget.h
+++ b/kate/app/katetabwidget.h
@@ -24,7 +24,7 @@
 
 class KateTabWidget : public KTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum TabWidgetVisibility {
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 47ece5270..6ae57f2ec 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -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)
   {
@@ -509,5 +509,3 @@ void KateViewManager::restoreViewConfiguration (TDEConfig *config, const TQStrin
 KateMainWindow *KateViewManager::mainWindow() {
         return m_mainWindow;
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewmanager.h b/kate/app/kateviewmanager.h
index d16b59dc2..f67eb4758 100644
--- a/kate/app/kateviewmanager.h
+++ b/kate/app/kateviewmanager.h
@@ -38,7 +38,7 @@ class TQToolButton;
 
 class KateViewManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewManager (KateMainWindow *parent);
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index a4066ee5a..8c552a82f 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -139,8 +139,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 +168,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 );
@@ -311,29 +311,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
 {
   m_lineColLabel = new TQLabel( this );
   addWidget( m_lineColLabel, 0, false );
-  m_lineColLabel->setAlignment( Qt::AlignCenter );
+  m_lineColLabel->setAlignment( TQt::AlignCenter );
   m_lineColLabel->installEventFilter( this );
 
   m_modifiedLabel = new TQLabel( TQString("   "), this );
   addWidget( m_modifiedLabel, 0, false );
-  m_modifiedLabel->setAlignment( Qt::AlignCenter );
+  m_modifiedLabel->setAlignment( TQt::AlignCenter );
   m_modifiedLabel->installEventFilter( this );
 
   m_insertModeLabel = new TQLabel( i18n(" INS "), this );
   addWidget( m_insertModeLabel, 0, false );
-  m_insertModeLabel->setAlignment( Qt::AlignCenter );
+  m_insertModeLabel->setAlignment( TQt::AlignCenter );
   m_insertModeLabel->installEventFilter( this );
 
   m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
   addWidget( m_selectModeLabel, 0, false );
-  m_selectModeLabel->setAlignment( Qt::AlignCenter );
+  m_selectModeLabel->setAlignment( TQt::AlignCenter );
   m_selectModeLabel->installEventFilter( this );
 
   m_fileNameLabel=new KSqueezedTextLabel( this );
   addWidget( m_fileNameLabel, 1, true );
   m_fileNameLabel->setMinimumSize( 0, 0 );
   m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
-  m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
+  m_fileNameLabel->setAlignment( /*TQt::AlignRight*/TQt::AlignLeft );
   m_fileNameLabel->installEventFilter( this );
 
   installEventFilter( this );
@@ -412,7 +412,7 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
     if ( m_viewSpace->currentView() )
       m_viewSpace->currentView()->setFocus();
 
-    if ( ((TQMouseEvent*)e)->button()==Qt::RightButton)
+    if ( ((TQMouseEvent*)e)->button()==TQt::RightButton)
       showMenu();
 
     return true;
@@ -421,4 +421,3 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
   return false;
 }
 //END KateVSStatusBar
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h
index 0407d35fe..3b238beb8 100644
--- a/kate/app/kateviewspace.h
+++ b/kate/app/kateviewspace.h
@@ -39,7 +39,7 @@ class KateViewSpaceContainer;
 
 class KateVSStatusBar : public KStatusBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
    public:
       KateVSStatusBar ( KateViewSpace *parent = 0L, const char *name = 0L );
@@ -73,7 +73,7 @@ class KateViewSpace : public TQVBox
   friend class KateViewSpaceContainer;
   friend class KateVSStatusBar;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewSpace(KateViewSpaceContainer *, TQWidget* parent=0, const char* name=0);
@@ -118,4 +118,3 @@ class KateViewSpace : public TQVBox
 };
 
 #endif
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index de9309f5e..50e0d7ea2 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -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 ();
 }
 
@@ -450,10 +450,10 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
 
   TQValueList<int> psizes;
   if ( ! isFirstTime )
-    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->tqt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
+    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->tqt_cast("TQSplitter")) )
       psizes = ps->sizes();
 
-  Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
+  TQt::Orientation o = isHoriz ? TQt::Vertical : TQt::Horizontal;
   KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
   s->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
@@ -471,7 +471,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
     s->moveToFirst( vsNew );
 
   if (!isFirstTime)
-    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->tqt_cast(TQSPLITTER_OBJECT_NAME_STRING)) )
+    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->tqt_cast("TQSplitter")) )
       ps->setSizes( psizes );
 
   s->show();
@@ -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 );
@@ -716,7 +716,7 @@ void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString
 {
   config->setGroup( group );
 
-  KateMDI::Splitter* s = new KateMDI::Splitter((Qt::Orientation)config->readNumEntry("Orientation"), parent);
+  KateMDI::Splitter* s = new KateMDI::Splitter((TQt::Orientation)config->readNumEntry("Orientation"), parent);
 
   TQStringList children = config->readListEntry( "Children" );
   for (TQStringList::Iterator it=children.begin(); it!=children.end(); ++it)
@@ -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);
@@ -754,5 +754,3 @@ void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString
 KateMainWindow *KateViewSpaceContainer::mainWindow() {
   return m_viewManager->mainWindow();
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspacecontainer.h b/kate/app/kateviewspacecontainer.h
index 2f1fa5372..a5f04f1ee 100644
--- a/kate/app/kateviewspacecontainer.h
+++ b/kate/app/kateviewspacecontainer.h
@@ -34,7 +34,7 @@ class KateMainWindow;
 
 class KateViewSpaceContainer: public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateViewSpace;
   friend class KateVSStatusBar;
diff --git a/kate/app/kbookmarkhandler.h b/kate/app/kbookmarkhandler.h
index 612c15a18..274218e04 100644
--- a/kate/app/kbookmarkhandler.h
+++ b/kate/app/kbookmarkhandler.h
@@ -32,7 +32,7 @@ class TDEPopupMenu;
 
 class KBookmarkHandler : public TQObject, public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KBookmarkHandler( KateFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 5fc602de5..dea6c95b6 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -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 );
@@ -139,41 +139,41 @@ KWrite::~KWrite()
 
 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)."));
 }
 
@@ -299,7 +299,7 @@ void KWrite::editToolbars()
 {
   saveMainWindowSettings( kapp->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;
 }
@@ -713,4 +713,3 @@ void KWriteEditorChooser::slotOk() {
 	m_chooser->writeAppSetting();
 	KDialogBase::slotOk();
 }
-// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h
index fc47c6522..5a4187c3b 100644
--- a/kate/app/kwritemain.h
+++ b/kate/app/kwritemain.h
@@ -37,7 +37,7 @@ class TDERecentFilesAction;
 
 class KWrite : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -122,7 +122,7 @@ class KWrite : public KParts::MainWindow
 
 class KWriteEditorChooser: public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
@@ -137,4 +137,3 @@ class KWriteEditorChooser: public KDialogBase
 };
 
 #endif
-// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/interfaces/application.h b/kate/interfaces/application.h
index 52eb129d5..8cbc9abce 100644
--- a/kate/interfaces/application.h
+++ b/kate/interfaces/application.h
@@ -39,7 +39,7 @@ class KDE_EXPORT Application : public TQObject
 {
   friend class PrivateApplication;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/interfaces/documentmanager.h b/kate/interfaces/documentmanager.h
index 8b5f554af..d3f55fdf5 100644
--- a/kate/interfaces/documentmanager.h
+++ b/kate/interfaces/documentmanager.h
@@ -30,7 +30,7 @@ class KDE_EXPORT DocumentManager : public TQObject
 {
   friend class PrivateDocumentManager;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DocumentManager ( void *documentManager  );
diff --git a/kate/interfaces/mainwindow.cpp b/kate/interfaces/mainwindow.cpp
index 4596cacb5..2a53f5c0f 100644
--- a/kate/interfaces/mainwindow.cpp
+++ b/kate/interfaces/mainwindow.cpp
@@ -78,5 +78,3 @@ ToolViewManager *MainWindow::toolViewManager () const
 }
 
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h
index bb40ffb9c..7e9033ce3 100644
--- a/kate/interfaces/mainwindow.h
+++ b/kate/interfaces/mainwindow.h
@@ -33,7 +33,7 @@ class KDE_EXPORT MainWindow : public TQObject
 {
   friend class PrivateMainWindow;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     MainWindow (void *mainWindow);
@@ -61,5 +61,3 @@ class KDE_EXPORT MainWindow : public TQObject
 }
 
 #endif
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h
index 00932c5ff..bc79a0491 100644
--- a/kate/interfaces/plugin.h
+++ b/kate/interfaces/plugin.h
@@ -36,7 +36,7 @@ class KDE_EXPORT Plugin : public TQObject
 {
   friend class PrivatePlugin;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     Plugin (Application *application = 0, const char *name = 0 );
diff --git a/kate/interfaces/pluginconfiginterfaceextension.h b/kate/interfaces/pluginconfiginterfaceextension.h
index 8a64ec090..d70d35069 100644
--- a/kate/interfaces/pluginconfiginterfaceextension.h
+++ b/kate/interfaces/pluginconfiginterfaceextension.h
@@ -28,7 +28,7 @@ namespace Kate
 
 class KDE_EXPORT PluginConfigPage : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     PluginConfigPage ( TQWidget *parent=0, const char *name=0 );
diff --git a/kate/interfaces/pluginmanager.h b/kate/interfaces/pluginmanager.h
index 0aeb7785e..26d77b26c 100644
--- a/kate/interfaces/pluginmanager.h
+++ b/kate/interfaces/pluginmanager.h
@@ -31,7 +31,7 @@ class KDE_EXPORT PluginManager : public TQObject
 {
   friend class PrivatePluginManager;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     PluginManager ( void *pluginManager  );
diff --git a/kate/interfaces/toolviewmanager.h b/kate/interfaces/toolviewmanager.h
index 88a669476..fec942b2b 100644
--- a/kate/interfaces/toolviewmanager.h
+++ b/kate/interfaces/toolviewmanager.h
@@ -33,7 +33,7 @@ class KDE_EXPORT ToolViewManager : public TQObject
 {
   friend class PrivateToolViewManager;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/interfaces/viewmanager.h b/kate/interfaces/viewmanager.h
index 15eb61312..0ca689680 100644
--- a/kate/interfaces/viewmanager.h
+++ b/kate/interfaces/viewmanager.h
@@ -34,7 +34,7 @@ class KDE_EXPORT ViewManager : public TQObject
 {
   friend class PrivateViewManager;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/utils/dockviewbase.h b/kate/utils/dockviewbase.h
index 73d564e04..1a15c2598 100644
--- a/kate/utils/dockviewbase.h
+++ b/kate/utils/dockviewbase.h
@@ -51,7 +51,7 @@ namespace Kate
 
 
 class DockViewBase : public TQVBox {
-  Q_OBJECT
+  TQ_OBJECT
   public:
   /**
       Create a KateDockViewBase.
diff --git a/kate/utils/listboxview.h b/kate/utils/listboxview.h
index a9194632d..810ace187 100644
--- a/kate/utils/listboxview.h
+++ b/kate/utils/listboxview.h
@@ -27,7 +27,7 @@ namespace Kate
 {
 
 class ListboxView : public DockViewBase {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     ListboxView( TQWidget *parent=0, const char *name=0 );
     ListboxView( const TQString &titlePrefix, const TQString &title, TQWidget *parent=0, const char *name=0 );
diff --git a/kate/utils/messageview.cpp b/kate/utils/messageview.cpp
index 40155f959..a780cc063 100644
--- a/kate/utils/messageview.cpp
+++ b/kate/utils/messageview.cpp
@@ -25,9 +25,9 @@ Kate::MessageView::MessageView( TQWidget *parent, const char *name )
   : Kate::DockViewBase( parent, name )
 {
   m_view = new TQTextBrowser( this );
-  // m_view->setFormat( Qt::richText ); // should be!!
-  connect( m_view, TQT_SIGNAL( linkClicked( const TQString & ) ), 
-           TQT_SIGNAL( linkClicked( const TQString & ) ) );
+  // m_view->setFormat( TQt::richText ); // should be!!
+  connect( m_view, TQ_SIGNAL( linkClicked( const TQString & ) ), 
+           TQ_SIGNAL( linkClicked( const TQString & ) ) );
 }
 
 Kate::MessageView::~MessageView()
diff --git a/kate/utils/messageview.h b/kate/utils/messageview.h
index 1bf406d6a..d13f6b63d 100644
--- a/kate/utils/messageview.h
+++ b/kate/utils/messageview.h
@@ -50,7 +50,7 @@ namespace Kate
 {
 
 class MessageView : public DockViewBase {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     MessageView( TQWidget *parent=0, const char *name=0 );
     ~MessageView();
diff --git a/kcheckpass/CMakeLists.txt b/kcheckpass/CMakeLists.txt
index 5e83ee41e..b2091e0ce 100644
--- a/kcheckpass/CMakeLists.txt
+++ b/kcheckpass/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
 
 tde_add_executable( kcheckpass AUTOMOC
   SOURCES
-    kcheckpass.c checkpass_etcpasswd.c checkpass_pam.c
+    kcheckpass.c checkpass_pam.c
     checkpass_shadow.c checkpass_osfc2passwd.c checkpass_aix.c
   LINK tdefakes-shared ${CRYPT_LIBRARY} ${PAM_LIBRARY}
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/kcheckpass/ConfigureChecks.cmake b/kcheckpass/ConfigureChecks.cmake
index d6d62f55b..902e6628d 100644
--- a/kcheckpass/ConfigureChecks.cmake
+++ b/kcheckpass/ConfigureChecks.cmake
@@ -12,3 +12,7 @@
 if( WITH_PAM AND (NOT DEFINED KCHECKPASS_PAM_SERVICE) )
   set( KCHECKPASS_PAM_SERVICE "kde" CACHE INTERNAL "" )
 endif( )
+
+if( NOT WITH_PAM AND WITH_SHADOW )
+  check_function_exists( pw_encrypt HAVE_PW_ENCRYPT )
+endif( )
diff --git a/kcheckpass/checkpass_etcpasswd.c b/kcheckpass/checkpass_etcpasswd.c
deleted file mode 100644
index 1dbe06f70..000000000
--- a/kcheckpass/checkpass_etcpasswd.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1998 Christian Esken <esken@kde.org> 
- * Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org>
- *
- * 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, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *      Copyright (C) 1998, Christian Esken <esken@kde.org>
- */
-
-#include "kcheckpass.h"
-
-#ifdef HAVE_ETCPASSWD
-
-/*******************************************************************
- * This is the authentication code for /etc/passwd passwords
- *******************************************************************/
-
-#include <string.h>
-#include <stdlib.h>
-
-AuthReturn Authenticate(const char *method,
-        const char *login, char *(*conv) (ConvRequest, const char *))
-{
-  struct passwd *pw;
-  char *passwd;
-
-  if (strcmp(method, "classic"))
-    return AuthError;
-
-  /* Get the password entry for the user we want */
-  if (!(pw = getpwnam(login)))
-    return AuthBad;
-
-  if (!*pw->pw_passwd)
-    return AuthOk;
-
-  if (!(passwd = conv(ConvGetHidden, 0)))
-    return AuthAbort;
-
-  if (!strcmp(pw->pw_passwd, crypt(passwd, pw->pw_passwd))) {
-    dispose(passwd);
-    return AuthOk; /* Success */
-  }
-  dispose(passwd);
-  return AuthBad; /* Password wrong or account locked */
-}
-
-#endif
diff --git a/kcheckpass/checkpass_shadow.c b/kcheckpass/checkpass_shadow.c
index ec3a4e02a..e721582d5 100644
--- a/kcheckpass/checkpass_shadow.c
+++ b/kcheckpass/checkpass_shadow.c
@@ -27,13 +27,14 @@
 #include "kcheckpass.h"
 
 /*******************************************************************
- * This is the authentication code for Shadow-Passwords
+ * This is the authentication code for /etc/passwd and Shadow-Passwords
  *******************************************************************/
 
-#ifdef HAVE_SHADOW
+#if defined(HAVE_SHADOW) || defined(HAVE_ETCPASSWD)
 #include <string.h>
 #include <stdlib.h>
 #include <pwd.h>
+#include <crypt.h>
 
 #ifndef __hpux
 #include <shadow.h>
@@ -46,7 +47,6 @@ AuthReturn Authenticate(const char *method,
   char          *crpt_passwd;
   char          *password;
   struct passwd *pw;
-  struct spwd   *spw;
 
   if (strcmp(method, "classic"))
     return AuthError;
@@ -54,8 +54,12 @@ AuthReturn Authenticate(const char *method,
   if (!(pw = getpwnam(login)))
     return AuthAbort;
 
-  spw = getspnam(login);
+#ifdef HAVE_SHADOW
+  struct spwd *spw = getspnam(login);
   password = spw ? spw->sp_pwdp : pw->pw_passwd;
+#else
+  password = pw->pw_passwd;
+#endif
 
   if (!*password)
     return AuthOk;
@@ -69,11 +73,11 @@ AuthReturn Authenticate(const char *method,
   crpt_passwd = crypt(typed_in_password, password);
 #endif
 
-  if (!strcmp(password, crpt_passwd )) {
-    dispose(typed_in_password);
-    return AuthOk; /* Success */
-  }
   dispose(typed_in_password);
+
+  if (crpt_passwd && !strcmp(password, crpt_passwd))
+    return AuthOk; /* Success */
+
   return AuthBad; /* Password wrong or account locked */
 }
 
diff --git a/kcheckpass/kcheckpass.h b/kcheckpass/kcheckpass.h
index e1351375a..66a242856 100644
--- a/kcheckpass/kcheckpass.h
+++ b/kcheckpass/kcheckpass.h
@@ -43,17 +43,9 @@
 #include <crypt.h>
 #endif
 
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-
 #include <pwd.h>
 #include <sys/types.h>
 
-#ifndef _PATH_TMP
-#define _PATH_TMP "/tmp/"
-#endif
-
 
 #ifdef ultrix
 #include <auth.h>
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index f1fbf8987..de62c9834 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -193,7 +193,7 @@ KCMInit::KCMInit( TDECmdLineArgs* args )
      runModules( 0 );
      kapp->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
diff --git a/kcminit/main.h b/kcminit/main.h
index 9651a8516..5d0bb958a 100644
--- a/kcminit/main.h
+++ b/kcminit/main.h
@@ -27,7 +27,7 @@ class TDECmdLineArgs;
 
 class KCMInit : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     k_dcop:
         void runPhase1();
diff --git a/kcontrol/CMakeLists.txt b/kcontrol/CMakeLists.txt
index d45828d10..724903b5c 100644
--- a/kcontrol/CMakeLists.txt
+++ b/kcontrol/CMakeLists.txt
@@ -76,7 +76,7 @@ if( BUILD_KCONTROL )
     add_subdirectory( joystick )
   endif( )
 
-  if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD" )
+  if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|NetBSD" )
     add_subdirectory( usbview )
   endif( )
 
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 5e506470c..3b79f8ce7 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -96,10 +96,10 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
                                                  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;
@@ -132,7 +132,7 @@ void KAccessApp::readSettings()
   _artsBellFile = config->readPathEntry("ArtsBellFile");
   _visibleBell = config->readBoolEntry("VisibleBell", false);
   _visibleBellInvert = config->readBoolEntry("VisibleBellInvert", false);
-  TQColor def(Qt::red);
+  TQColor def(TQt::red);
   _visibleBellColor = config->readColorEntry("VisibleBellColor", &def);
   _visibleBellPause = config->readNumEntry("VisibleBellPause", 500);
 
@@ -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()));
 }
 
 
@@ -579,7 +579,7 @@ void KAccessApp::createDialogContents() {
          pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
       label1->setPixmap(pixmap);
 
-      lay->addWidget( label1, 0, Qt::AlignCenter );
+      lay->addWidget( label1, 0, TQt::AlignCenter );
       lay->addSpacing(KDialog::spacingHint());
 
       TQVBoxLayout * vlay = new TQVBoxLayout(lay);
@@ -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()));
    }
 }
 
diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h
index 95d8b2559..fbfa0d783 100644
--- a/kcontrol/access/kaccess.h
+++ b/kcontrol/access/kaccess.h
@@ -21,7 +21,7 @@ class KComboBox;
 
 class KAccessApp : public KUniqueApplication
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -88,7 +88,7 @@ private:
 
 class VisualBell : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index ccdb74f81..5c6cc68b4 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -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)));
 	}
 }
 
@@ -245,7 +245,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
       KDialogBase::spacingHint());
 
   TQGroupBox *grp = new TQGroupBox(i18n("Audible Bell"), bell);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
@@ -276,19 +276,19 @@ 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()));
 
   // -----------------------------------------------------
 
   // visible bell ----------------------------------------
   grp = new TQGroupBox(i18n("Visible Bell"), bell);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -326,16 +326,16 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   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();
 
@@ -350,7 +350,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   vbox = new TQVBoxLayout(modifiers, KDialog::marginHint(), KDialog::spacingHint());
 
   grp = new TQGroupBox(i18n("S&ticky Keys"), modifiers);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -374,7 +374,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addWidget(stickyKeysBeep);
 
   grp = new TQGroupBox(i18n("Locking Keys"), modifiers);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -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();
 
@@ -412,7 +412,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   vbox = new TQVBoxLayout(filters, KDialog::marginHint(), KDialog::spacingHint());
 
   grp = new TQGroupBox(i18n("Slo&w Keys"), filters);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -444,7 +444,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addWidget(slowKeysRejectBeep);
 
   grp = new TQGroupBox(i18n("Bounce Keys"), filters);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -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();
 
@@ -488,7 +488,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   vbox = new TQVBoxLayout(features, KDialog::marginHint(), KDialog::spacingHint());
 
   grp = new TQGroupBox(i18n("Activation Gestures"), features);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -518,7 +518,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox->addWidget(timeoutDelay);
 
   grp = new TQGroupBox(i18n("Notification"), features);
-  grp->setColumnLayout( 0, Qt::Horizontal );
+  grp->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(grp);
 
   vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
@@ -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();
 
@@ -614,7 +614,7 @@ void KAccessConfig::load( bool useDefaults )
   visibleBell->setChecked(config->readBoolEntry("VisibleBell", false));
   invertScreen->setChecked(config->readBoolEntry("VisibleBellInvert", true));
   flashScreen->setChecked(!invertScreen->isChecked());
-  TQColor def(Qt::red);
+  TQColor def(TQt::red);
   colorButton->setColor(config->readColorEntry("VisibleBellColor", &def));
 
   durationSlider->setValue(config->readNumEntry("VisibleBellPause", 500));
diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h
index 4eb8af45d..1f59badbc 100644
--- a/kcontrol/access/kcmaccess.h
+++ b/kcontrol/access/kcmaccess.h
@@ -26,7 +26,7 @@ class TDEAboutData;
 
 class ExtendedIntNumInput : public KIntNumInput
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
     /**
@@ -59,7 +59,7 @@ class ExtendedIntNumInput : public KIntNumInput
 
 class KAccessConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 388776bc1..5f78072a1 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -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;
@@ -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/arts/arts.h b/kcontrol/arts/arts.h
index 5eebd4ba1..97b834d47 100644
--- a/kcontrol/arts/arts.h
+++ b/kcontrol/arts/arts.h
@@ -48,7 +48,7 @@ class DeviceManager;
 
 class KArtsModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -118,7 +118,7 @@ private:
 
 class KStartArtsProgressDialog : public KProgressDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KStartArtsProgressDialog(KArtsModule *parent, const char *name,
                           const TQString &caption, const TQString &text);
diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h
index 18cba5a32..28f15cf99 100644
--- a/kcontrol/arts/krichtextlabel.h
+++ b/kcontrol/arts/krichtextlabel.h
@@ -33,7 +33,7 @@
  * QLabel
  */
 class TDEUI_EXPORT KRichTextLabel : public TQLabel {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/kcontrol/background/CMakeLists.txt b/kcontrol/background/CMakeLists.txt
index a62259b8d..5e3670616 100644
--- a/kcontrol/background/CMakeLists.txt
+++ b/kcontrol/background/CMakeLists.txt
@@ -29,7 +29,7 @@ if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_TDM )
   ##### bgnd (static) #############################
 
   tde_add_library( bgnd STATIC_PIC AUTOMOC
-    SOURCES bgrender.cpp bgsettings.cpp KCrossBGRender.cc
+    SOURCES bgrender.cpp bgsettings.cpp KCrossBGRender.cpp
     LINK ${LIBART_LIBRARIES}
   )
 
diff --git a/kcontrol/background/KCrossBGRender.cc b/kcontrol/background/KCrossBGRender.cpp
index 489e98d1b..489e98d1b 100644
--- a/kcontrol/background/KCrossBGRender.cc
+++ b/kcontrol/background/KCrossBGRender.cpp
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 697836797..03be761d7 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
 
    This file is part of the KDE project, module kcmbackground.
 
@@ -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)
@@ -175,7 +175,7 @@ void BGAdvancedDialog::setTextBackgroundColor(const TQColor &color)
     else
     {
         dlg->m_cbSolidTextBackground->setChecked(false);
-        dlg->m_colorTextBackground->setColor(Qt::white);
+        dlg->m_colorTextBackground->setColor(TQt::white);
         dlg->m_colorTextBackground->setEnabled(false);
     }
     dlg->m_colorTextBackground->blockSignals(false);
@@ -434,7 +434,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent
     m_RefreshEdit->setSuffix(i18n(" min"));
     m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
     lbl->setBuddy(m_RefreshEdit);
-    grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft);
+    grid->addWidget(m_RefreshEdit, 5, 1, TQt::AlignLeft);
 
     m_Program = program;
     if (m_Program.isEmpty()) {
diff --git a/kcontrol/background/bgadvanced.h b/kcontrol/background/bgadvanced.h
index cc1ba7bf1..71dfa61ac 100644
--- a/kcontrol/background/bgadvanced.h
+++ b/kcontrol/background/bgadvanced.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
 
    This file is part of the KDE project, module kcmbackground.
 
@@ -38,7 +38,7 @@ class KBackgroundProgram;
 
 class BGAdvancedDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    BGAdvancedDialog(KBackgroundRenderer *_r, TQWidget *parent, bool m_multidesktop);
 
@@ -95,7 +95,7 @@ private:
  */
 class KProgramEditDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KProgramEditDialog(const TQString &program=TQString::null, TQWidget *parent=0L,
diff --git a/kcontrol/background/bgdefaults.h b/kcontrol/background/bgdefaults.h
index d64c6e546..e6ece1cfe 100644
--- a/kcontrol/background/bgdefaults.h
+++ b/kcontrol/background/bgdefaults.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -24,12 +24,10 @@
 #define _defMinOptimizationDepth 1
 
 // Per desktop defaults
-// Before you change this get in touch with me (kb9vqf@pearsoncomputing.net)
-// Thanks!!
 #define _defColorA  TQColor("#003082")
 #define _defColorB  TQColor("#C0C0C0")
 #define _defBackgroundMode KBackgroundSettings::Flat
-#define _defWallpaperMode KBackgroundSettings::Scaled
+#define _defWallpaperMode KBackgroundSettings::ScaleAndCrop
 #define _defMultiMode KBackgroundSettings::NoMulti
 #define _defBlendMode KBackgroundSettings::NoBlending
 #define _defBlendBalance 100
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index e903b7bc2..c5d56af0f 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -1,6 +1,4 @@
 /*
-   kate: space-indent on; indent-width 3; indent-mode cstyle;
-   
    This file is part of the KDE libraries
 
    Copyright (c) 2005 David Saxton <david@bluehaze.org>
@@ -75,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;
@@ -124,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
@@ -148,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);
@@ -200,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)) );
          }
       }
    }
@@ -227,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)));
       }
    }
 
@@ -246,10 +244,36 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop)
       m_slideShowRandom = KBackgroundSettings::InOrder;
 
    // Wallpaper Position
+   m_prevWallpaperPos = KBackgroundSettings::ScaleAndCrop;
+   m_prevTilePos      = KBackgroundSettings::Tiled;
+
    m_wallpaperPos = eRenderer()->wallpaperMode();
    if (m_wallpaperPos == KBackgroundSettings::NoWallpaper)
       m_wallpaperPos = KBackgroundSettings::Centred; // Default
 
+   const TQString path = eRenderer()->wallpaper();
+   KFileMetaInfo metaInfo(path);
+   if (metaInfo.isValid() && metaInfo.item("Dimensions").isValid())
+   {
+      // If the image is greater than 800x600 default to using the user selected mode
+      // for a normal wallpaper, otherwise default to user selection for tiles.
+      TQSize s = metaInfo.item("Dimensions").value().toSize();
+      m_isTile = (s.width() < 800 || s.height() < 600);
+      if (m_isTile)
+      {
+         m_prevTilePos = m_wallpaperPos;
+      }
+      else
+      {
+         m_prevWallpaperPos = m_wallpaperPos;
+      }
+   }
+   else if (KMimeType::findByPath(path)->is("image/svg+xml"))
+   {
+      m_prevWallpaperPos = m_wallpaperPos;
+   }
+
+   // Restrictions
    if (TDEGlobal::dirs()->isRestrictedResource("wallpaper"))
    {
       m_urlWallpaperButton->hide();
@@ -261,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
 }
 
@@ -419,11 +443,11 @@ void BGDialog::slotIdentifyScreens()
       screenLabel->setFrameStyle(TQFrame::Panel);
       screenLabel->setFrameShadow(TQFrame::Plain);
 
-      screenLabel->setAlignment(Qt::AlignCenter);
+      screenLabel->setAlignment(TQt::AlignCenter);
       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());
@@ -475,7 +499,7 @@ void BGDialog::initUI()
 
    loadWallpaperFilesList();
 
-   // Wallpaper tilings: again they must match the ones from bgrender.cc
+   // Wallpaper tilings: again they must match the ones from bgrender.cpp
    m_comboWallpaperPos->insertItem(i18n("Centered"));
    m_comboWallpaperPos->insertItem(i18n("Tiled"));
    m_comboWallpaperPos->insertItem(i18n("Center Tiled"));
@@ -485,7 +509,7 @@ void BGDialog::initUI()
    m_comboWallpaperPos->insertItem(i18n("Centered Auto Fit"));
    m_comboWallpaperPos->insertItem(i18n("Scale & Crop"));
 
-   // Blend modes: make sure these match with kdesktop/bgrender.cc !!
+   // Blend modes: make sure these match with kdesktop/bgrender.cpp !!
    m_comboBlend->insertItem(i18n("No Blending"));
    m_comboBlend->insertItem(i18n("Flat"));
    m_comboBlend->insertItem(i18n("Horizontal"));
@@ -504,7 +528,7 @@ void BGDialog::loadWallpaperFilesList() {
    // Wallpapers
    // the following TQMap is lower cased names mapped to cased names and URLs
    // this way we get case insensitive sorting
-   TQMap<TQString, QPair<TQString, TQString> > papers;
+   TQMap<TQString, TQPair<TQString, TQString> > papers;
 
    //search for .desktop files before searching for images without .desktop files
    TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true);
@@ -596,7 +620,7 @@ void BGDialog::loadWallpaperFilesList() {
    comboWallpaper->clear();
    m_wallpaper.clear();
    int i = 0;
-   for (TQMap<TQString, QPair<TQString, TQString> >::Iterator it = papers.begin();
+   for (TQMap<TQString, TQPair<TQString, TQString> >::Iterator it = papers.begin();
         it != papers.end();
         ++it)
    {
@@ -941,18 +965,22 @@ void BGDialog::slotWallpaperTypeChanged(int i)
       KFileMetaInfo metaInfo(path);
       if (metaInfo.isValid() && metaInfo.item("Dimensions").isValid())
       {
-         // If the image is greater than 800x600 default to using scaled mode,
-         // otherwise default to tiled.
-
+         // If the image is greater than 800x600 default to using the user selected mode
+         // for a normal wallpaper, otherwise default to user selection for tiles.
          TQSize s = metaInfo.item("Dimensions").value().toSize();
-         if (s.width() >= 800 && s.height() >= 600)
-            m_wallpaperPos = KBackgroundSettings::Scaled;
+         m_isTile = (s.width() < 800 || s.height() < 600);
+         if (m_isTile)
+         {
+            m_wallpaperPos = m_prevTilePos;
+         }
          else
-            m_wallpaperPos = KBackgroundSettings::Tiled;
+         {
+            m_wallpaperPos = m_prevWallpaperPos;
+         }
       }
       else if (KMimeType::findByPath(path)->is("image/svg+xml"))
       {
-         m_wallpaperPos = KBackgroundSettings::Scaled;         
+         m_wallpaperPos = m_prevWallpaperPos;
       }
 
       r->setWallpaperMode(m_wallpaperPos);
@@ -999,6 +1027,15 @@ void BGDialog::slotWallpaperPos(int mode)
    if (mode == r->wallpaperMode())
       return;
 
+   if (m_isTile)
+   {
+      m_prevTilePos = mode;
+   }
+   else
+   {
+      m_prevWallpaperPos = mode;
+   }
+
    r->stop();
    r->setWallpaperMode(mode);
    r->start(true);
@@ -1257,7 +1294,7 @@ void BGDialog::slotGetNewStuff()
    config->writeEntry( "StandardResource", "wallpaper" );
    config->sync();
 
-   KNS::DownloadDialog::open("wallpaper", i18n("Get New Wallpapers"));
+   KNS::DownloadDialog::open("Wallpapers", i18n("Get New Wallpapers"));
    loadWallpaperFilesList();
 }
 
diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h
index 6b33d8999..a2e7bfea6 100644
--- a/kcontrol/background/bgdialog.h
+++ b/kcontrol/background/bgdialog.h
@@ -34,7 +34,7 @@ class TDEStandardDirs;
 
 class BGDialog : public BGDialog_UI
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop = true);
    ~BGDialog();
@@ -99,8 +99,11 @@ protected:
    TQValueVector< TQPtrVector<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen]
    TQMap<TQString,int> m_wallpaper;
    TQStringList m_patterns;
-   int m_slideShowRandom; // Remembers last Slide Show setting
-   int m_wallpaperPos; // Remembers last wallpaper pos
+   int m_slideShowRandom;  // Remembers last Slide Show setting
+   int m_wallpaperPos;     // Remembers last wallpaper pos
+   int m_prevWallpaperPos; // Previous normal wallpaper pos
+   int m_prevTilePos;      // Previous tile wallpaper pos
+   bool m_isTile;          // Whether the wallpaper is a tile (800x600 or smaller)
 
    BGMonitorArrangement * m_pMonitorArrangement;
 
diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui
index f35e19f78..4334cbbaf 100644
--- a/kcontrol/background/bgdialog_ui.ui
+++ b/kcontrol/background/bgdialog_ui.ui
@@ -719,15 +719,9 @@
 <includes>
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
     <include location="global" impldecl="in declaration">kcombobox.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index c05e70e5f..c75d42f6c 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
-   kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
 
    This file is part of the KDE project, module kcmbackground.
 
@@ -48,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/bgmonitor.h b/kcontrol/background/bgmonitor.h
index 4a86ea3d2..95608261b 100644
--- a/kcontrol/background/bgmonitor.h
+++ b/kcontrol/background/bgmonitor.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
-   kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
 
    This file is part of the KDE project, module kcmbackground.
 
@@ -39,7 +38,7 @@ class KPixmap;
  */
 class BGMonitorArrangement : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BGMonitorArrangement(TQWidget *parent, const char *name=0L);
     
@@ -95,7 +94,7 @@ protected:
  */
 class BGMonitor : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BGMonitor(TQWidget *parent, const char *name=0L);
 
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index d8cc53c9a..12455b608 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -64,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()));
 }
 
 
@@ -240,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;
@@ -385,7 +384,7 @@ wp_load:
 	    wpmode = NoWallpaper;
 	    goto wp_out;
 	}
-	m_Wallpaper = m_Wallpaper.convertDepth(32, Qt::DiffuseAlphaDither);
+	m_Wallpaper = m_Wallpaper.convertDepth(32, TQt::DiffuseAlphaDither);
 
 	// If we're previewing, scale the wallpaper down to make the preview
 	// look more like the real desktop.
@@ -629,7 +628,7 @@ void KBackgroundRenderer::fullWallpaperBlend()
 	m_Image = m_Background.copy();
 
 	if (m_Image.depth() < 32)
-	    m_Image = m_Image.convertDepth(32, Qt::DiffuseAlphaDither);
+	    m_Image = m_Image.convertDepth(32, TQt::DiffuseAlphaDither);
 
     } else {
 	m_Image.create(w, h, 32);
@@ -1161,7 +1160,7 @@ void KVirtualBGRenderer::desktopResized()
     {
         delete m_pPixmap;
         m_pPixmap = new TQPixmap(m_size);
-        m_pPixmap->fill(Qt::black);
+        m_pPixmap->fill(TQt::black);
     }
 
     initRenderers();
@@ -1229,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)) );
     }
 }
 
@@ -1318,7 +1317,7 @@ void KVirtualBGRenderer::start()
         // If are screen sizes do not properly tile the overall virtual screen
         // size, then we want the untiled parts to be black for use in desktop
         // previews, etc
-        m_pPixmap->fill(Qt::black);
+        m_pPixmap->fill(TQt::black);
     }
 
     m_bFinished.fill(false);
diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h
index 5ab1cc6c3..f9042dd56 100644
--- a/kcontrol/background/bgrender.h
+++ b/kcontrol/background/bgrender.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -40,7 +39,7 @@ class KBackgroundRenderer:
 	public TQObject,
 	public KBackgroundSettings
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0);
@@ -121,9 +120,9 @@ private:
  * images. Usage is similar to KBackgroundRenderer: connect to the imageDone
  * signal.
  */
-class KVirtualBGRenderer : public QObject
+class KVirtualBGRenderer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KVirtualBGRenderer(int desk, TDEConfig *config=0l);
     ~KVirtualBGRenderer();
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 1ee452ac2..278a250c9 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h
index a49873af2..348446c82 100644
--- a/kcontrol/background/bgsettings.h
+++ b/kcontrol/background/bgsettings.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; indent-width 4; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index 5e43caa4d..bc7de3e63 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
 
    This file is part of the KDE project, module kcmbackground.
 
@@ -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/bgwallpaper.h b/kcontrol/background/bgwallpaper.h
index dfee2066e..6a61516ee 100644
--- a/kcontrol/background/bgwallpaper.h
+++ b/kcontrol/background/bgwallpaper.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
 
    This file is part of the KDE project, module kcmbackground.
 
@@ -44,7 +44,7 @@ public:
 
 class BGMultiWallpaperDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    BGMultiWallpaperDialog(KBackgroundSettings *settings, TQWidget *parent, const char *name=0);
 
diff --git a/kcontrol/background/crossfade.h b/kcontrol/background/crossfade.h
index da589aac4..4a9bc2b30 100644
--- a/kcontrol/background/crossfade.h
+++ b/kcontrol/background/crossfade.h
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 2f6832dcc..e27aa50ac 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  * This file is part of the KDE project, module kcmbackground.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
  * Copyright (C) 2003 Waldo Bastian <bastian@kde.org>
@@ -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"),
diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h
index 9fdba57b8..d4442b340 100644
--- a/kcontrol/background/main.h
+++ b/kcontrol/background/main.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kcmdisplay.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -20,7 +20,7 @@ class BGDialog;
  */
 class KBackground: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KBackground(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index 5022ab420..8abc606db 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -71,7 +71,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name):
 
   int row = 0;
   TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this );
-  box->setColumnLayout( 0, Qt::Horizontal );
+  box->setColumnLayout( 0, TQt::Horizontal );
   layout->addWidget(box);
   layout->addStretch();
   TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
@@ -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"),
diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h
index 844698e9e..ea539e528 100644
--- a/kcontrol/bell/bell.h
+++ b/kcontrol/bell/bell.h
@@ -29,7 +29,7 @@ class TQPushButton;
 
 class KBellConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   KBellConfig(TQWidget *parent, const char *name);
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index a492c9deb..3e45b3b19 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -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();
 
diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h
index 74680d579..ed8819502 100644
--- a/kcontrol/clock/dtime.h
+++ b/kcontrol/clock/dtime.h
@@ -39,7 +39,7 @@ class Kclock;
 
 class HMSTimeWidget : public KIntSpinBox
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   HMSTimeWidget(TQWidget *parent=0, const char *name=0);
  protected:
@@ -48,7 +48,7 @@ class HMSTimeWidget : public KIntSpinBox
 
 class Dtime : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   Dtime( TQWidget *parent=0, const char* name=0 );
 
@@ -97,7 +97,7 @@ private:
 
 class Kclock : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Kclock( TQWidget *parent=0, const char *name=0 ) 
@@ -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..7d791b9f7 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();
 
diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h
index 7754da34f..01c846f92 100644
--- a/kcontrol/clock/main.h
+++ b/kcontrol/clock/main.h
@@ -30,7 +30,7 @@ class TQTabWidget;
 
 class KclockModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KclockModule(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 518c6663d..593b9ca1d 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -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 1ecfc225e..8508c9ee0 100644
--- a/kcontrol/clock/tzone.h
+++ b/kcontrol/clock/tzone.h
@@ -31,7 +31,7 @@ class TQLabel;
 
 class Tzone : public TQVGroupBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Tzone( TQWidget *parent=0, const char* name=0 );
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index b1cc2616a..aa5703fbb 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -35,7 +35,7 @@
 #include <kstandarddirs.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,7 +160,7 @@ 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"
@@ -168,14 +168,14 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
 
     removeBt = new TQPushButton(i18n("R&emove Scheme"), group);
     removeBt->setEnabled(FALSE);
-    connect(removeBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
+    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"));
@@ -254,10 +254,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     groupLayout = new TQHBoxLayout;
     groupLayout2->addLayout(groupLayout);
 
-    sb = new TQSlider( Qt::Horizontal,group,"Slider" );
+    sb = new TQSlider( TQt::Horizontal,group,"Slider" );
     sb->setRange( 0, 10 );
-    sb->setFocusPolicy( TQ_StrongFocus );
-    connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
+    sb->setFocusPolicy( TQWidget::StrongFocus );
+    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."));
@@ -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 );
@@ -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)
     {
@@ -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);
 }
 
@@ -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);
 	}
 }
diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h
index ca8718f74..228204556 100644
--- a/kcontrol/colors/colorscm.h
+++ b/kcontrol/colors/colorscm.h
@@ -36,7 +36,7 @@ class KColorSchemeList;
  */
 class KColorScheme: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KColorScheme(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index b08ef6135..d83b821bd 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -315,7 +315,7 @@ void WidgetCanvas::drawSampleWidgets()
     // Create a scrollbar and redirect drawing into a temp. pixmap to save a
     // lot of fiddly drawing later.
 
-    TQScrollBar *vertScrollBar = new TQScrollBar( Qt::Vertical, this );
+    TQScrollBar *vertScrollBar = new TQScrollBar( TQt::Vertical, this );
     // TODO: vertScrollBar->setStyle( new TQMotifStyle() );
     vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height());
     vertScrollBar->setRange( 0,  0 );
@@ -435,7 +435,7 @@ void WidgetCanvas::drawSampleWidgets()
     // Menu bar
 
     //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
-    kapp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
+    kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, 
 			TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
 
     paint.setFont( menuFont );
@@ -443,7 +443,7 @@ void WidgetCanvas::drawSampleWidgets()
 	TQString file = i18n("File");
     textLen = paint.fontMetrics().width( file );
     //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
-	kapp->style().tqdrawPrimitive(TQStyle::PE_Panel, &paint,
+	kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
 			TQRect(30, 59, textLen + 10, 21), cg);
     paint.drawText( 35, 74, file );
 
@@ -528,7 +528,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().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint,
+	kapp->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,
diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h
index 60898622b..220b244cc 100644
--- a/kcontrol/colors/widgetcanvas.h
+++ b/kcontrol/colors/widgetcanvas.h
@@ -61,7 +61,7 @@ public:
 
 class WidgetCanvas : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     WidgetCanvas( TQWidget *parent=0, const char *name=0 );
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 c084c2fce..b469fc001 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -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() {
@@ -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() {
@@ -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() {
@@ -431,7 +431,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
 	}
 	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));
 
@@ -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());
 	}
 	
@@ -570,5 +570,3 @@ void ComponentChooser::restoreDefault() {
 	emitChanged(false);
 */
 }
-
-// vim: sw=4 ts=4 noet
diff --git a/kcontrol/componentchooser/componentchooser.h b/kcontrol/componentchooser/componentchooser.h
index 3649ca218..7eec4d152 100644
--- a/kcontrol/componentchooser/componentchooser.h
+++ b/kcontrol/componentchooser/componentchooser.h
@@ -47,7 +47,7 @@ public:
 
 class CfgComponent: public ComponentConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgComponent(TQWidget *parent);
 	virtual ~CfgComponent();
@@ -67,7 +67,7 @@ signals:
 
 class CfgEmailClient: public EmailClientConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgEmailClient(TQWidget *parent);
 	virtual ~CfgEmailClient();
@@ -87,7 +87,7 @@ signals:
 
 class CfgFileManager: public FileManagerConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgFileManager(TQWidget *parent);
 	virtual ~CfgFileManager();
@@ -105,7 +105,7 @@ signals:
 
 class CfgTerminalEmulator: public TerminalEmulatorConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgTerminalEmulator(TQWidget *parent);
 	virtual ~CfgTerminalEmulator();
@@ -123,7 +123,7 @@ signals:
 
 class CfgBrowser: public BrowserConfig_UI,public CfgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	CfgBrowser(TQWidget *parent);
 	virtual ~CfgBrowser();
@@ -146,7 +146,7 @@ private:
 class ComponentChooser : public ComponentChooser_UI
 {
 
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	ComponentChooser(TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui
index c810f1e31..9abdeec12 100644
--- a/kcontrol/componentchooser/componentchooser_ui.ui
+++ b/kcontrol/componentchooser/componentchooser_ui.ui
@@ -123,11 +123,8 @@
 </widget>
 <includes>
     <include location="global" impldecl="in declaration">tdelistbox.h</include>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
+    <include location="local"  impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
 </UI>
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..6c71f8a42 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 =
diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h
index 001306506..5d93fbb9b 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.h
+++ b/kcontrol/componentchooser/kcm_componentchooser.h
@@ -24,7 +24,7 @@ class TDEAboutData;
 
 class KCMComponentChooser : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KCMComponentChooser( TQWidget *parent = 0, const char *name = 0 );
  
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/certexport.h b/kcontrol/crypto/certexport.h
index 54511e04c..aeca9aaa9 100644
--- a/kcontrol/crypto/certexport.h
+++ b/kcontrol/crypto/certexport.h
@@ -31,7 +31,7 @@ class KSSLCertificate;
 
 class KCertExport : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KCertExport(TQWidget *parent = 0L, const char *name = 0L);
   virtual ~KCertExport();
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index f8558c866..53a73f4a1 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -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"
@@ -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
@@ -1540,7 +1540,7 @@ TQString iss = TQString();
          TQPalette cspl;
          iss = cert->getIssuer();
          cspl = validFrom->palette();
-         if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+         if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1548,7 +1548,7 @@ TQString iss = TQString();
          validFrom->setPalette(cspl);
 
          cspl = validUntil->palette();
-         if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+         if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1558,7 +1558,7 @@ TQString iss = TQString();
          validFrom->setText(cert->getNotBefore());
          validUntil->setText(cert->getNotAfter());
          untilDate->setText(x ? TDEGlobal::locale()->formatDateTime(x->getExpires())
-                              : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
+                              : TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(TQt::UTC)));
          untilDate->setEnabled(x && !x->isPermanent());
          pHash->setText(cert->getMD5DigestText());
          delete cert;
@@ -1778,7 +1778,7 @@ TQString iss;
    TQPalette cspl;
    KSSLCertificate *cert = pkcs->getCertificate();
    cspl = yValidFrom->palette();
-   if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+   if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
    } else {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1786,7 +1786,7 @@ TQString iss;
    yValidFrom->setPalette(cspl);
 
    cspl = yValidUntil->palette();
-   if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+   if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
    } else {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1818,7 +1818,7 @@ TQString iss;
          KSSLCertificate *cert = pkcs->getCertificate();
          iss = cert->getIssuer();
          cspl = yValidFrom->palette();
-         if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+         if (TQDateTime::currentDateTime(TQt::UTC) < cert->getQDTNotBefore()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1826,7 +1826,7 @@ TQString iss;
          yValidFrom->setPalette(cspl);
 
          cspl = yValidUntil->palette();
-         if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+         if (TQDateTime::currentDateTime(TQt::UTC) > cert->getQDTNotAfter()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h
index 8a353ae04..f468a473a 100644
--- a/kcontrol/crypto/crypto.h
+++ b/kcontrol/crypto/crypto.h
@@ -217,7 +217,7 @@ private:
 
 class KCryptoConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KCryptoConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList &list = TQStringList());
   virtual ~KCryptoConfig();
diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp
index f7cd9d1cb..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()));
 
 }
 
@@ -107,7 +107,7 @@ void KDateTimeDlg::setTime(const TQTime& qtime) {
 
 
 void KDateTimeDlg::setDateTime(const TQDateTime& qdatetime) {
-   _date->setDate(TQT_TQDATE_OBJECT(qdatetime.date()));
+   _date->setDate(qdatetime.date());
    _hours->setValue(qdatetime.time().hour());
    _mins->setValue(qdatetime.time().minute());
    _secs->setValue(qdatetime.time().second());
diff --git a/kcontrol/crypto/kdatetimedlg.h b/kcontrol/crypto/kdatetimedlg.h
index 92b62193b..ddc0531b8 100644
--- a/kcontrol/crypto/kdatetimedlg.h
+++ b/kcontrol/crypto/kdatetimedlg.h
@@ -34,7 +34,7 @@ class KDateTimeDlgPrivate;
 
 class KDateTimeDlg : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDateTimeDlg(TQWidget *parent = 0L, const char *name = 0L);
   virtual ~KDateTimeDlg();
diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui
index f0baacb79..4566ba5c0 100644
--- a/kcontrol/css/cssconfig.ui
+++ b/kcontrol/css/cssconfig.ui
@@ -229,16 +229,12 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<includes>
-    <include location="global" impldecl="in implementation">kdialog.h</include>
-</includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui
index 5074b8bab..cc69769b7 100644
--- a/kcontrol/css/csscustom.ui
+++ b/kcontrol/css/csscustom.ui
@@ -547,8 +547,4 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp
index e2e043f76..d22c90e3e 100644
--- a/kcontrol/css/kcmcss.cpp
+++ b/kcontrol/css/kcmcss.cpp
@@ -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);
@@ -342,13 +342,13 @@ void CSSConfig::slotPreview()
 
   if (customDialog->blackOnWhite->isChecked())
     {
-      back = Qt::white;
-      fore = Qt::black;
+      back = TQt::white;
+      fore = TQt::black;
     }
   else if (customDialog->whiteOnBlack->isChecked())
     {
-      back = Qt::black;
-      fore = Qt::white;
+      back = TQt::black;
+      fore = TQt::white;
     }
   else
     {
diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h
index da93fcdf5..b1b944416 100644
--- a/kcontrol/css/kcmcss.h
+++ b/kcontrol/css/kcmcss.h
@@ -31,7 +31,7 @@ class KDialogBase;
 
 class CSSConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 	  
diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui
index 51bd26ad1..a4557c845 100644
--- a/kcontrol/css/preview.ui
+++ b/kcontrol/css/preview.ui
@@ -89,7 +89,4 @@ people.&lt;/p&gt;
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kseparator.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp
index b3e15d021..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
@@ -85,7 +85,7 @@ void KCMDisplay::save()
 
 void KCMDisplay::moduleChanged( bool isChanged )
 {
-  TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())))));
+  TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(const_cast<TQObject*>(sender())));
   Q_ASSERT(currentModule != m_modules.end());
   if (currentModule.data() == isChanged)
     return;
diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h
index 42373a42f..84b30c79e 100644
--- a/kcontrol/display/display.h
+++ b/kcontrol/display/display.h
@@ -26,7 +26,7 @@ class TQTabWidget;
 
 class KCMDisplay : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KCMDisplay( TQWidget *parent, const char *name, const TQStringList& );
diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt
index fe83c0941..1b94c2c74 100644
--- a/kcontrol/displayconfig/CMakeLists.txt
+++ b/kcontrol/displayconfig/CMakeLists.txt
@@ -39,6 +39,6 @@ set_property( SOURCE displayconfig.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_C
 tde_add_kpart( kcm_displayconfig AUTOMOC
   SOURCES
     monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel
-  LINK tdeio-shared tderandr-shared tdeutils-shared
+  LINK tdeio-shared tderandr-shared tdeutils-shared ${TDEHW_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index dacb5cc88..af1744692 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -18,6 +18,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
@@ -56,11 +60,6 @@
 
 #include "displayconfig.h"
 
-using namespace std;
-#ifdef __OpenBSD__
-#define abs __gnu_cxx::abs
-#endif
-
 /**** DLL Interface ****/
 typedef KGenericFactory<KDisplayConfig, TQWidget> KDisplayCFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_displayconfig, KDisplayCFactory("kcmdisplayconfig") )
@@ -435,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 (::tqqt_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);
@@ -449,8 +448,7 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
 		return;
 	}
 
-	TQString rotationDesired = *screendata->rotations.at(screendata->current_rotation_index);
-	bool isvisiblyrotated = ((rotationDesired == ROTATION_90_DEGREES_STRING) || (rotationDesired == ROTATION_270_DEGREES_STRING));
+	bool isvisiblyrotated = (screendata->current_rotation_index == ROTATION_90_DEGREES_INDEX) || (screendata->current_rotation_index == ROTATION_270_DEGREES_INDEX);
 
 	if (screendata->is_extended) {
 		moved_monitor->show();
@@ -477,8 +475,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
 	primary_monitor = NULL;
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_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;
@@ -550,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 (::tqqt_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()));
 				}
@@ -594,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 (::tqqt_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()));
 						}
@@ -643,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 (::tqqt_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,9 +743,9 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) {
 KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &)
   : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
 {
-#ifdef __TDE_HAVE_TDEHWLIB
+#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();
@@ -771,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());
@@ -794,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();
 
@@ -864,7 +862,7 @@ KDisplayConfig::~KDisplayConfig()
 }
 
 void KDisplayConfig::deviceChanged (TDEGenericDevice* device) {
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 	if (device->type() == TDEGenericDeviceType::Monitor) {
 		if (base->rescanHardware->isEnabled()) {
 			base->rescanHardware->setEnabled(false);
@@ -916,19 +914,19 @@ void KDisplayConfig::identifyMonitors () {
 		if (!randr_screen_info->outputs[i]->cur_crtc) {
 			continue;
 		}
-		idWidget = new TQLabel(TQString("Screen\n%1").arg(i+1), (TQWidget*)0, "", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WX11BypassWM | Qt::WDestructiveClose);
+		idWidget = new TQLabel(TQString("Screen\n%1").arg(i+1), (TQWidget*)0, "", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WX11BypassWM | TQt::WDestructiveClose);
 		widgetList.append(idWidget);
 		idWidget->resize(150, 100);
-		idWidget->setAlignment(Qt::AlignCenter);
+		idWidget->setAlignment(TQt::AlignCenter);
 		TQFont font = idWidget->font();
 		font.setBold( true );
 		font.setPointSize(24);
 		idWidget->setFont( font );
-		idWidget->setPaletteForegroundColor(Qt::white);
-		idWidget->setPaletteBackgroundColor(Qt::black);
+		idWidget->setPaletteForegroundColor(TQt::white);
+		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);
@@ -987,7 +985,7 @@ void KDisplayConfig::loadProfileFromDiskHelper(bool forceReload) {
 
 void KDisplayConfig::selectProfile (int slotNumber) {
 	TQString selectedProfile = base->displayProfileList->currentText();
-	if (selectedProfile == "<default>") {
+	if (selectedProfile == i18n("<default>")) {
 		selectedProfile = "";
 	}
 	activeProfileName = selectedProfile;
@@ -1142,7 +1140,7 @@ void KDisplayConfig::updateStartupProfileLabel()
 {
 	TQString friendlyName = startupProfileName;
 	if (friendlyName == "") {
-		friendlyName = "<default>";
+		friendlyName = i18n("<default>");
 	}
 
 	base->startupDisplayProfileList->setCurrentItem(friendlyName, false);
@@ -1151,7 +1149,7 @@ void KDisplayConfig::updateStartupProfileLabel()
 void KDisplayConfig::selectDefaultProfile(int slotNumber)
 {
 	TQString selectedProfile = base->startupDisplayProfileList->currentText();
-	if (selectedProfile == "<default>") {
+	if (selectedProfile == i18n("<default>")) {
 		selectedProfile = "";
 	}
 
@@ -1233,11 +1231,10 @@ void KDisplayConfig::updateDisplayedInformation () {
 		base->orientationVFlip->setChecked(screendata->has_y_flip);
 	}
 	else {
-		base->rotationSelectDD->insertItem(ROTATION_0_DEGREES_STRING, 0);
+		base->rotationSelectDD->insertItem(screendata->rotations[ROTATION_0_DEGREES_INDEX], ROTATION_0_DEGREES_INDEX);
 		base->rotationSelectDD->setCurrentItem(0);
 		base->orientationHFlip->hide();
 		base->orientationVFlip->hide();
-
 	}
 	base->rotationSelectDD->blockSignals(false);
 	base->orientationHFlip->blockSignals(false);
@@ -1332,8 +1329,8 @@ void KDisplayConfig::updateDragDropDisplay() {
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) {
-				TQWidget *monitor = TQT_TQWIDGET(monitors.at( i ));
+			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!");
 				}
@@ -1350,12 +1347,11 @@ void KDisplayConfig::updateDragDropDisplay() {
 		for (i=0;i<numberOfScreens;i++) {
 			screendata = m_screenInfoArray[activeProfileName].at(i);
 			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
-				TQString rotationDesired = *screendata->rotations.at(screendata->current_rotation_index);
-				bool isvisiblyrotated = ((rotationDesired == ROTATION_90_DEGREES_STRING) || (rotationDesired == ROTATION_270_DEGREES_STRING));
+				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);
@@ -1385,8 +1381,8 @@ void KDisplayConfig::layoutDragDropDisplay() {
 	monitors = base->monitorPhyArrange->childrenListObject();
 	if ( monitors.count() ) {
 		for ( i = 0; i < int(monitors.count()); ++i ) {
-			if (::tqqt_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);
 			}
@@ -1674,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();
@@ -1697,8 +1693,8 @@ 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()));
-		combo->insertItem("<default>");
+		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);
 		}
@@ -1707,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++;
@@ -1716,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();
 }
@@ -1803,8 +1799,8 @@ void KDisplayConfig::profileListChanged() {
 	// Clear and reload the combo boxes
 	base->displayProfileList->clear();
 	base->startupDisplayProfileList->clear();
-	base->displayProfileList->insertItem("<default>");
-	base->startupDisplayProfileList->insertItem("<default>");
+	base->displayProfileList->insertItem(i18n("<default>"));
+	base->startupDisplayProfileList->insertItem(i18n("<default>"));
 	for (TQStringList::Iterator it = availableProfileNames.begin(); it != availableProfileNames.end(); ++it) {
 		base->displayProfileList->insertItem(*it);
 		base->startupDisplayProfileList->insertItem(*it);
@@ -1925,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;
 	}
@@ -2024,7 +2020,7 @@ void KDisplayConfig::save()
 	else {
 		// Signal that settings were NOT applied
 		TQTimer *t = new TQTimer( this );
-		connect(t, SIGNAL(timeout()), SLOT(changed()) );
+		connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(changed()) );
 		t->start( 100, FALSE );
 	}
 }
diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h
index 78b033f14..259c31391 100644
--- a/kcontrol/displayconfig/displayconfig.h
+++ b/kcontrol/displayconfig/displayconfig.h
@@ -21,10 +21,6 @@
 #ifndef _KCM_DisplayCONFIG_H
 #define _KCM_DisplayCONFIG_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <tqptrlist.h>
 #include <tqslider.h>
 #include <tqworkspace.h>
@@ -34,7 +30,7 @@
 
 #include <dcopobject.h>
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #else
 #define TDEGenericDevice void
@@ -54,7 +50,7 @@ typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap;
 class KDisplayConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
 
 public:
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/displayconfig/monitorworkspace.h b/kcontrol/displayconfig/monitorworkspace.h
index 8384d090b..10df2378a 100644
--- a/kcontrol/displayconfig/monitorworkspace.h
+++ b/kcontrol/displayconfig/monitorworkspace.h
@@ -50,7 +50,7 @@ private:
 
 class DraggableMonitor: public TQLabel
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	DraggableMonitor( TQWidget* parent, const char* name, int wflags );
@@ -77,7 +77,7 @@ private:
 
 class MonitorWorkspace : public TQWorkspace
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	MonitorWorkspace( TQWidget* parent, const char* name );
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 4a2ac2809..ce03182e0 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -84,9 +84,6 @@
                             <property name="text">
                                 <string>&amp;Wide area network</string>
                             </property>
-                            <property name="accel">
-                                <string>Alt+W</string>
-                            </property>
                             <property name="whatsThis" stdset="0">
                                 <string>Advertise services on Internet domain using public IP. To have this option working you need to configure wide area operation in using administrator mode</string>
                             </property>
@@ -106,9 +103,6 @@
                             <property name="text">
                                 <string>Loc&amp;al network</string>
                             </property>
-                            <property name="accel">
-                                <string>Alt+A</string>
-                            </property>
                             <property name="checked">
                                 <bool>false</bool>
                             </property>
@@ -124,9 +118,6 @@
                         <property name="text">
                             <string>Browse local networ&amp;k</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+K</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Browse local network (domain .local) using multicast DNS.</string>
                         </property>
@@ -138,9 +129,6 @@
                         <property name="text">
                             <string>Enable &amp;Zeroconf network browsing</string>
                         </property>
-                        <property name="accel">
-                            <string>Alt+Z</string>
-                        </property>
                         <property name="whatsThis" stdset="0">
                             <string>Browse local network (domain .local) using multicast DNS.</string>
                         </property>
@@ -312,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 d1fe3269c..08ca18e95 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -68,10 +68,10 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 	domain = new KSimpleConfig( 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
@@ -84,7 +84,7 @@ KCMDnssd::~KCMDnssd()
 
 void KCMDnssd::save()
 {
-	setCursor(TQCursor(Qt::BusyCursor));
+	setCursor(TQCursor(TQt::BusyCursor));
 	TDECModule::save();
 	if (geteuid()==0 && m_wdchanged) saveMdnsd(); 
 	domain->setFileWriteMode(0644); // this should be readable for everyone
@@ -112,14 +112,14 @@ void KCMDnssd::save()
 	    proc->start(TDEProcess::Block);
 	  }
 	}
-	setCursor(TQCursor(Qt::ArrowCursor));
+	setCursor(TQCursor(TQt::ArrowCursor));
 }
 
 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();
diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h
index b408ca3f6..03699af04 100644
--- a/kcontrol/dnssd/kcmdnssd.h
+++ b/kcontrol/dnssd/kcmdnssd.h
@@ -29,7 +29,7 @@
 class KSimpleConfig;
 class KCMDnssd: public ConfigDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KCMDnssd( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h
index 3ea140ffc..ccc26cc91 100644
--- a/kcontrol/ebrowsing/filteropts.h
+++ b/kcontrol/ebrowsing/filteropts.h
@@ -29,7 +29,7 @@ class TQListBox;
 
 class FilterOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FilterOptions(TQWidget *parent = 0, const char *name = 0);
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/main.h b/kcontrol/ebrowsing/main.h
index 4234ffe3e..3b4b83985 100644
--- a/kcontrol/ebrowsing/main.h
+++ b/kcontrol/ebrowsing/main.h
@@ -30,7 +30,7 @@
 class KURIFilter;
 
 class KURIFilterModule : public TDECModule {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index eb96f682a..507af5993 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -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 );
 }
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
index be82459b6..661a3abb0 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
@@ -32,7 +32,7 @@ class SearchProviderItem;
 
 class FilterOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FilterOptions(TDEInstance *instance, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
index abf3fe255..add958f41 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.h
@@ -32,7 +32,7 @@ class TDEInstance;
 class KAutoWebSearch : public KURIFilterPlugin, public DCOPObject
 {
     K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KAutoWebSearch(TQObject *parent = 0, const char *name = 0,
                    const TQStringList &args = TQStringList() );
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
index f72d38340..2f2284e5a 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h
@@ -31,7 +31,7 @@ class TDEInstance;
 
 class KURISearchFilter : public KURIFilterPlugin, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 public:
     KURISearchFilter(TQObject *parent = 0, const char *name = 0, 
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index a1f6ca619..b6029cf36 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -45,9 +45,9 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider,
 
     m_dlg->leQuery->setMinimumWidth(kapp->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/ikws/searchproviderdlg.h b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
index 2a23cbf05..a698ee626 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.h
@@ -27,7 +27,7 @@ class SearchProviderDlgUI;
 
 class SearchProviderDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SearchProviderDialog(SearchProvider *provider, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index c2e3af8fa..0fb8b8149 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -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/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
index 9d0c5f26d..04274f601 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h
@@ -41,7 +41,7 @@ class TDEProcess;
 class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject
 {
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     LocalDomainURIFilter( TQObject* parent, const char* name, const TQStringList& args );
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
index 46499f2b6..cae4c5abb 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp
@@ -1,4 +1,4 @@
-/*  -*- c-basic-offset: 2 -*-
+/*
 
     tdeshorturifilter.h
 
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
index 1d48e7c2a..be2ba2fd9 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.h
@@ -40,7 +40,7 @@ class TDEInstance;
 class TDEShortURIFilter : public KURIFilterPlugin , public DCOPObject
 {
     K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 60be2cc1f..f967387e8 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -1,7 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- *
- *
- *
+/*
  * This file is part of the KDE project, module kcontrol.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
  *
@@ -179,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"
@@ -201,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);
@@ -213,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"
@@ -224,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"
@@ -236,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"
@@ -250,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/energy/energy.h b/kcontrol/energy/energy.h
index 765fdb2b9..c49b12b9c 100644
--- a/kcontrol/energy/energy.h
+++ b/kcontrol/energy/energy.h
@@ -1,7 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- *
- *
- *
+/*
  * This file is part of the KDE project, module kcontrol.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
  *
@@ -28,7 +25,7 @@ extern "C" void init_energy();
  */
 class KEnergy: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KEnergy(TQWidget *parent, const char *name);
diff --git a/kcontrol/energy/pics/energybig.png b/kcontrol/energy/pics/energybig.png
index 0bf01274d..eb5f48dbe 100644
--- a/kcontrol/energy/pics/energybig.png
+++ b/kcontrol/energy/pics/energybig.png
diff --git a/kcontrol/energy/pics/lo-energy.png b/kcontrol/energy/pics/lo-energy.png
index 850b4ab00..ca82ba1b5 100644
--- a/kcontrol/energy/pics/lo-energy.png
+++ b/kcontrol/energy/pics/lo-energy.png
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/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h
index 6563c5ed1..e5eb2d225 100644
--- a/kcontrol/filetypes/filegroupdetails.h
+++ b/kcontrol/filetypes/filegroupdetails.h
@@ -28,7 +28,7 @@ class TQButtonGroup;
  */
 class FileGroupDetails : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileGroupDetails(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index c4f3ce7bb..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.") );
@@ -76,10 +76,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   gb = new TQGroupBox(i18n("Description"), firstWidget);
   firstLayout->addWidget(gb);
 
-  gb->setColumnLayout(1, Qt::Horizontal);
+  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/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h
index 936e1c535..23c8c63b6 100644
--- a/kcontrol/filetypes/filetypedetails.h
+++ b/kcontrol/filetypes/filetypedetails.h
@@ -20,7 +20,7 @@ class KServiceListWidget;
  */
 class FileTypeDetails : public TQTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileTypeDetails(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 58bbbbd09..43b53540a 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -57,7 +57,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
   leftLayout->setSpacing( KDialog::spacingHint() );
   leftLayout->setColStretch(1, 1);
 
-  l->addLayout( TQT_TQLAYOUT(leftLayout) );
+  l->addLayout( leftLayout );
 
   TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this);
   leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2);
@@ -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()
diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h
index 16e7bff3e..2c684ca4c 100644
--- a/kcontrol/filetypes/filetypesview.h
+++ b/kcontrol/filetypes/filetypesview.h
@@ -23,7 +23,7 @@ class TQWidgetStack;
 
 class FileTypesView : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileTypesView(TQWidget *p = 0, const char *name = 0);
   ~FileTypesView();
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 19aa01a59..8c6c06931 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -29,7 +29,7 @@
 #include <tdesycoca.h>
 #include <kstandarddirs.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/keditfiletype.h b/kcontrol/filetypes/keditfiletype.h
index 3ae7c0e35..f4abc8d3a 100644
--- a/kcontrol/filetypes/keditfiletype.h
+++ b/kcontrol/filetypes/keditfiletype.h
@@ -27,7 +27,7 @@ class FileTypeDetails;
 // A dialog for ONE file type to be edited.
 class FileTypeDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileTypeDialog( KMimeType::Ptr mime );
   FileTypeDialog( KMimeType::Ptr mime, bool newItem );
diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp
index d0463d7ad..16669168a 100644
--- a/kcontrol/filetypes/kservicelistwidget.cpp
+++ b/kcontrol/filetypes/kservicelistwidget.cpp
@@ -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/kservicelistwidget.h b/kcontrol/filetypes/kservicelistwidget.h
index 0e4a3e3a3..5c16fa07f 100644
--- a/kcontrol/filetypes/kservicelistwidget.h
+++ b/kcontrol/filetypes/kservicelistwidget.h
@@ -45,7 +45,7 @@ public:
  */
 class KServiceListWidget : public TQGroupBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   enum { SERVICELIST_APPLICATIONS, SERVICELIST_SERVICES };
   KServiceListWidget(int kind, TQWidget *parent = 0, const char *name = 0);
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/kserviceselectdlg.h b/kcontrol/filetypes/kserviceselectdlg.h
index 3b3ea87e7..3365fbffe 100644
--- a/kcontrol/filetypes/kserviceselectdlg.h
+++ b/kcontrol/filetypes/kserviceselectdlg.h
@@ -23,7 +23,7 @@
 
 class KServiceSelectDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Create a dialog to select a service (not application) for a given service type.
diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp
index dbb37344c..e2a9b28a7 100644
--- a/kcontrol/filetypes/newtypedlg.cpp
+++ b/kcontrol/filetypes/newtypedlg.cpp
@@ -19,7 +19,7 @@ NewTypeDialog::NewTypeDialog(TQStringList groups,
 
   TQGridLayout *grid = new TQGridLayout(2, 2);
   grid->setColStretch(1, 1);
-  topl->addLayout(TQT_TQLAYOUT(grid));
+  topl->addLayout(grid);
 
   TQLabel *l = new TQLabel(i18n("Group:"), main);
   grid->addWidget(l, 0, 0);
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index c5b4c3353..5913662ce 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -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,33 +627,30 @@ 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 );
    comboForceDpi = new TQComboBox( this );
    label->setBuddy( comboForceDpi );
-   comboForceDpi->insertItem( i18n( "Disabled" )); // change DPISetti ng type if order changes
-   comboForceDpi->insertItem( i18n( "96 DPI" ));
-   comboForceDpi->insertItem( i18n( "120 DPI" ));
+   comboForceDpi->insertItem( i18n( "Disabled" ));
+   comboForceDpi->insertItem( i18n( "Enabled" ));
    TQString whatsthis = i18n(
        "<p>This option forces a specific DPI value for fonts. It may be useful"
        " when the real DPI of the hardware is not detected properly and it"
        " 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>"
-       "<p>The use of this option is generally discouraged. For selecting proper DPI"
-       " value a better option is explicitly configuring it for the whole X server if"
-       " possible (e.g. DisplaySize in xorg.conf or adding <i>-dpi value</i> to"
-       " ServerLocalArgs= in $TDEDIR/share/config/tdm/tdmrc). When fonts do not render"
-       " properly with real DPI value better fonts should be used or configuration"
-       " of font hinting should be checked.</p>" );
+       " look well with DPI values other than 96 or 120 DPI.</p>");
    TQWhatsThis::add(comboForceDpi, whatsthis);
-   connect( comboForceDpi, TQT_SIGNAL( activated( int )), TQT_SLOT( changed()));
+   connect(comboForceDpi, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseFontDPI()));
+   sbDpiValue = new KIntSpinBox(64, 512, 1, 96, 10, this);
+   TQWhatsThis::add(sbDpiValue, whatsthis);
+   connect(sbDpiValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed()));
    lay->addWidget( comboForceDpi, 1, 1 );
+   lay->addWidget( sbDpiValue, 1, 2 );
 
    layout->addStretch(1);
 
@@ -695,10 +692,22 @@ void TDEFonts::load( bool useDefaults )
 
   TDEConfig cfgfonts("kcmfonts", true);
   cfgfonts.setGroup("General");
-  int dpicfg = cfgfonts.readNumEntry( "forceFontDPI", 0 );
-  DPISetting dpi = dpicfg == 120 ? DPI120 : dpicfg == 96 ? DPI96 : DPINone;
-  comboForceDpi->setCurrentItem( dpi );
-  dpi_original = dpi;
+  int dpicfg = cfgfonts.readNumEntry("forceFontDPI", 0);
+  // "forceFontDPIEnable" must be read after "forceFontDPI" to make sure it is
+  // correctly initialized on the first run when upgrading to the new format,
+  // without the user even noticying it. The first time "forceFontDPIEnable"
+  // will not exist and its correct value will be deduced by the existing value
+  // of "forceFontDPI", which contains the value prior to the update.
+  bool dpiEnable = cfgfonts.readBoolEntry("forceFontDPIEnable", dpicfg > 0);
+  dpi_original = dpiEnable ? DPIValue : DPINone;
+  dpi_value_original = dpicfg;
+  if (dpi_value_original < 64 || dpi_value_original > 512)
+  {
+    dpi_value_original = 96;
+  }
+  comboForceDpi->setCurrentItem(dpi_original);
+  sbDpiValue->setValue(dpi_value_original);
+  sbDpiValue->setEnabled(dpi_original != DPINone);
   if( cfgfonts.readBoolEntry( "dontChangeAASettings", true )) {
       useAA_original = useAA = AASystem;
       cbAA->setCurrentItem( useAA );
@@ -717,14 +726,16 @@ void TDEFonts::save()
 
   TDEConfig cfgfonts("kcmfonts");
   cfgfonts.setGroup("General");
-  DPISetting dpi = static_cast< DPISetting >( comboForceDpi->currentItem());
-  const int dpi2value[] = { 0, 96, 120 };
-  cfgfonts.writeEntry( "forceFontDPI", dpi2value[ dpi ] );
+  DPISetting dpi = (DPISetting)comboForceDpi->currentItem();
+  int dpival = sbDpiValue->value();
+  cfgfonts.writeEntry( "forceFontDPIEnable", dpi != DPINone );
+  cfgfonts.writeEntry( "forceFontDPI", dpival );
   cfgfonts.writeEntry( "dontChangeAASettings", cbAA->currentItem() == AASystem );
   cfgfonts.sync();
   // if the setting is reset in the module, remove the dpi value,
   // otherwise don't explicitly remove it and leave any possible system-wide value
-  if( dpi == DPINone && dpi_original != DPINone ) {
+  if(dpi == DPINone)
+  {
       KProcIO proc;
       proc << "xrdb" << "-quiet" << "-remove" << "-nocpp";
       proc.writeStdin( TQCString( "Xft.dpi" ), true );
@@ -755,11 +766,11 @@ void TDEFonts::save()
   if( cbAA->currentItem() != AASystem )
       aaSave = aaSettings->save( useAA == AAEnabled );
 
-  if( aaSave || (useAA != useAA_original) || dpi != dpi_original) {
+  if( aaSave || (useAA != useAA_original) || dpival != dpi_value_original || dpi != dpi_original)
+  {
     KMessageBox::information(this,
-      i18n(
-        "<p>Some changes such as anti-aliasing will only affect newly started applications.</p>"
-      ), i18n("Font Settings Changed"), "FontSettingsChanged", false);
+      i18n( "<p>Some changes such as anti-aliasing will only affect newly started applications.</p>"),
+      i18n("Font Settings Changed"), "FontSettingsChanged", false);
     useAA_original = useAA;
     dpi_original = dpi;
   }
@@ -791,6 +802,13 @@ void TDEFonts::slotUseAntiAliasing()
     emit changed(true);
 }
 
+void TDEFonts::slotUseFontDPI()
+{
+    DPISetting dpi = (DPISetting)(comboForceDpi->currentItem());
+    sbDpiValue->setEnabled(dpi != DPINone);
+    emit changed(true);
+}
+
 void TDEFonts::slotCfgAa()
 {
   if(aaSettings->exec())
@@ -798,5 +816,3 @@ void TDEFonts::slotCfgAa()
     emit changed(true);
   }
 }
-
-// vim:ts=2:sw=2:tw=78
diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h
index 65a1266cb..c8b3f9919 100644
--- a/kcontrol/fonts/fonts.h
+++ b/kcontrol/fonts/fonts.h
@@ -20,11 +20,12 @@
 class TQCheckBox;
 class TQComboBox;
 class KDoubleNumInput;
+class KIntSpinBox;
 class FontAASettings;
 
 class FontUseItem : public TDEFontRequester
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     FontUseItem(TQWidget * parent, const TQString &name, const TQString &grp, 
@@ -49,7 +50,7 @@ private:
 
 class FontAASettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -91,7 +92,7 @@ private:
  */
 class TDEFonts : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEFonts(TQWidget *parent, const char *name, const TQStringList &);
@@ -107,15 +108,18 @@ protected slots:
     void slotApplyFontDiff(); 
     void slotUseAntiAliasing();
     void slotCfgAa();
+    void slotUseFontDPI();
 
 private:
     enum AASetting { AAEnabled, AASystem, AADisabled };
-    enum DPISetting { DPINone, DPI96, DPI120 };
+    enum DPISetting { DPINone, DPIValue };
     AASetting useAA, useAA_original;
     DPISetting dpi_original;
+    int dpi_value_original;
     TQComboBox *cbAA;
     TQComboBox* comboForceDpi;
     TQPushButton *aaSettingsButton;
+    KIntSpinBox *sbDpiValue;
     TQPtrList <FontUseItem> fontUseList;
     FontAASettings *aaSettings;
 };
diff --git a/kcontrol/hwmanager/CMakeLists.txt b/kcontrol/hwmanager/CMakeLists.txt
index be8d3f2cb..d48e65320 100644
--- a/kcontrol/hwmanager/CMakeLists.txt
+++ b/kcontrol/hwmanager/CMakeLists.txt
@@ -48,8 +48,8 @@ set_property( SOURCE hwmanager.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFD
 tde_add_kpart( kcm_hwmanager AUTOMOC
   SOURCES
     hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp devicepropsdlgbase.ui hwmanagerbase.ui
-    cryptpassworddlg.cpp cryptpassworddlgbase.ui hwmanager.skel
-  LINK tdeio-shared
+    cryptpassworddlg.cpp unlockdialog.ui passworddlg.cpp cryptpassworddlgbase.ui hwmanager.skel
+  LINK tdeio-shared ${TDEHW_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -58,7 +58,7 @@ tde_add_kpart( kcm_hwmanager AUTOMOC
 tde_add_executable( tdehwdevicetray AUTOMOC
   SOURCES
     hwdevicetray_main.cpp hwdevicetray.cpp hwdevicetray_app.cpp
-    hwdevicetray_configdialog.cpp
-  LINK tdeio-shared tdeutils-shared tdeui-shared
+    hwdevicetray_configdialog.cpp unlockdialog.ui passworddlg.cpp
+  LINK tdeio-shared tdeutils-shared tdeui-shared ${TDEHW_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
-)
\ No newline at end of file
+)
diff --git a/kcontrol/hwmanager/cryptpassworddlg.cpp b/kcontrol/hwmanager/cryptpassworddlg.cpp
index b0f0e1cd8..c7cd083af 100644
--- a/kcontrol/hwmanager/cryptpassworddlg.cpp
+++ b/kcontrol/hwmanager/cryptpassworddlg.cpp
@@ -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/cryptpassworddlg.h b/kcontrol/hwmanager/cryptpassworddlg.h
index d595c4a73..f155df968 100644
--- a/kcontrol/hwmanager/cryptpassworddlg.h
+++ b/kcontrol/hwmanager/cryptpassworddlg.h
@@ -35,7 +35,7 @@ class KSSLCertificate;
 
 class TDEUI_EXPORT CryptPasswordDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Create a dialog that allows a user to enter LUKS passwords or password files
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 7ccb93daf..a5e41ba83 100644
--- a/kcontrol/hwmanager/deviceiconview.cpp
+++ b/kcontrol/hwmanager/deviceiconview.cpp
@@ -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)
@@ -73,7 +73,8 @@ void DeviceIconView::slotItemDoubleClicked(TQListViewItem* item)
 		delete propsDlg;
 	}
 	else {
-		KMessageBox::sorry(this, "Detailed information is not available for this device", "Information Unavailable");
+		KMessageBox::sorry(this, i18n("Detailed information is not available for this device"),
+		                   i18n("Information Unavailable"));
 	}
 }
 
diff --git a/kcontrol/hwmanager/deviceiconview.h b/kcontrol/hwmanager/deviceiconview.h
index 913c4c9ef..6460beb0a 100644
--- a/kcontrol/hwmanager/deviceiconview.h
+++ b/kcontrol/hwmanager/deviceiconview.h
@@ -32,36 +32,30 @@ class ConfigModuleList;
 class DeviceIconItem : public TDEListViewItem
 {
 public:
-	DeviceIconItem(TQListViewItem *parent, const TQString& text, const TQPixmap& pm, TDEGenericDevice *d = 0)
+	DeviceIconItem(TQListViewItem *parent, const TQString& text, const TQPixmap& pm, TQString deviceUid)
 		: TDEListViewItem(parent, text)
-		, _tag(TQString::null)
-		, _device(d)
+		, _deviceUid(deviceUid)
 		{
 			setPixmap(0, pm);
 		}
-	DeviceIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, TDEGenericDevice *d = 0)
+	DeviceIconItem(TQListView *parent, const TQString& text, const TQPixmap& pm, TQString deviceUid)
 		: TDEListViewItem(parent, text)
-		, _tag(TQString::null)
-		, _device(d)
+		, _deviceUid(deviceUid)
 		{
 			setPixmap(0, pm);
 		}
 		
-		void setDevice(TDEGenericDevice* d) { _device = d; }
-		void setTag(const TQString& t) { _tag = t; }
+		void setDevice(TQString deviceUid) { _deviceUid = deviceUid; }
 		
-		TDEGenericDevice* device() { return _device; }
-		TQString tag() { return _tag; }
-	
+		TDEGenericDevice* device() { return TDEGlobal::hardwareDevices()->findByUniqueID(_deviceUid); }
 	
 private:
-		TQString _tag;
-		TDEGenericDevice *_device;
+		TQString _deviceUid;  // device unique id
 };
 
 class DeviceIconView : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	DeviceIconView(TQWidget * parent = 0, const char * name = 0);
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp
index 18ac13f7a..4baabe29a 100644
--- a/kcontrol/hwmanager/devicepropsdlg.cpp
+++ b/kcontrol/hwmanager/devicepropsdlg.cpp
@@ -29,6 +29,9 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 #include <tqinternal_p.h>
+#include <kprocess.h>
+#include <dcopclient.h>
+#include <dcopref.h>
 #undef Unsorted // Required for --enable-final (tqdir.h)
 #include <tqfiledialog.h>
 
@@ -45,6 +48,7 @@
 #include <ksslcertificate.h>
 
 #include "cryptpassworddlg.h"
+#include "passworddlg.h"
 
 #include "devicepropsdlg.h"
 
@@ -295,16 +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->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();
@@ -324,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());
@@ -337,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();
 }
@@ -367,7 +375,49 @@ static TQString formatDisplayString(TQString input) {
 	return TQStyleSheet::escape(input);
 }
 
-void DevicePropertiesDialog::populateDeviceInformation() {
+bool DevicePropertiesDialog::isMonitoredDevice(TDEStorageDevice *sdevice)
+{
+	// Type selection logic largely duplicated from the media manager tdeioslave
+	return ((sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+	         sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) ||
+	         sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) &&
+	        !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden) &&
+	        (sdevice->isDiskOfType(TDEDiskDeviceType::HDD) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDROM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDMO) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRWW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDROM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDRAM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDRDL) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDRWDL) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRDL) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRWDL) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::BDROM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::BDR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::BDRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDROM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDVideo) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDVideo) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::BDVideo) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::Floppy) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::Zip) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::Jaz) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::Camera)));
+}
+
+void DevicePropertiesDialog::populateDeviceInformation()
+{
 	if (m_device) {
 		base->labelDeviceType->setText(m_device->friendlyDeviceType());
 		base->iconDeviceType->setPixmap(m_device->icon(TDEIcon::SizeSmall));
@@ -416,48 +466,88 @@ void DevicePropertiesDialog::populateDeviceInformation() {
 			if (volUUID == "") volUUID = i18n("<none>");
 			base->labelDiskUUID->setText(formatDisplayString(volUUID));
 
+			TQString mappedName = sdevice->mappedName();
+			if (mappedName == "") mappedName = i18n("<none>");
+			base->labelMappedName->setText(formatDisplayString(mappedName));
+
 			// Show status
 			TQString status_text = "<qt>";
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable)) {
-				status_text += "Mountable<br>";
+				status_text += i18n("Mountable") + "<br>";
 			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) {
-				status_text += "Removable<br>";
+				status_text += i18n("Removable") + "<br>";
 			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Inserted)) {
-				status_text += "Inserted<br>";
+				status_text += i18n("Inserted") + "<br>";
 			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
-				status_text += "Blank<br>";
+				status_text += i18n("Blank") + "<br>";
 			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)) {
-				status_text += "In use<br>";
+				status_text += i18n("In use") + "<br>";
 			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsesDevice)) {
-				status_text += "Uses other device<br>";
+				status_text += i18n("Uses other device") + "<br>";
 			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem)) {
-				status_text += "Contains a filesystem<br>";
-			}
-			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
-				status_text += "Hotpluggable<br>";
+				status_text += i18n("Contains a filesystem") + "<br>";
 			}
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) {
-				status_text += "Hidden<br>";
+				status_text += i18n("Hidden") + "<br>";
 			}
 			if (status_text == "<qt>") {
-				status_text += "<i>Unavailable</i>";
+				status_text += "<i>" + i18n("Unknown") + "</i>";
 			}
 			status_text += "</qt>";
 			base->labelDiskStatus->setText(status_text);
 
-			// Update mount/unmount button status
-			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable)) {
-				base->groupDiskActions->show();
+			// Update action button status
+			base->buttonDiskMount->setEnabled(false);
+			base->buttonDiskUnmount->setEnabled(false);
+			base->buttonDiskUnlock->setEnabled(false);
+			base->buttonDiskLock->setEnabled(false);
+			base->buttonDiskEject->setEnabled(false);
+			base->buttonDiskSafeRemove->setEnabled(false);
+			base->buttonDiskMount->setHidden(true);
+			base->buttonDiskUnmount->setHidden(true);
+			base->buttonDiskUnlock->setHidden(true);
+			base->buttonDiskLock->setHidden(true);
+			base->buttonDiskEject->setHidden(true);
+			base->buttonDiskSafeRemove->setHidden(true);
+			bool showGroup = false;
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable))
+			{
 				base->buttonDiskMount->setEnabled((sdevice->mountPath() == ""));
 				base->buttonDiskUnmount->setEnabled((sdevice->mountPath() != ""));
+				base->buttonDiskMount->setHidden(false);
+				base->buttonDiskUnmount->setHidden(false);
+				showGroup = true;
 			}
-			else {
+			else if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+					     sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted))
+			{
+				base->buttonDiskUnlock->setEnabled(!sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
+				base->buttonDiskLock->setEnabled(sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
+				base->buttonDiskUnlock->setHidden(false);
+				base->buttonDiskLock->setHidden(false);
+				showGroup = true;
+			}
+			if (isMonitoredDevice(sdevice) &&
+			    sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
+			{
+				base->buttonDiskEject->setEnabled(true);
+				base->buttonDiskSafeRemove->setEnabled(true);
+				base->buttonDiskEject->setHidden(false);
+				base->buttonDiskSafeRemove->setHidden(false);
+				showGroup = true;
+			}
+			if (showGroup)
+			{
+				base->groupDiskActions->show();
+			}
+			else
+			{
 				base->groupDiskActions->hide();
 			}
 		}
@@ -659,7 +749,7 @@ void DevicePropertiesDialog::populateDeviceInformation() {
 			}
 
 			// RandR warning
-			base->labelRandrWarning->setText("<qt><b>NOTE: Any further integration of displays into TDE <i>REQUIRES</i> multi GPU support and other features slated for RandR 2.0.</b><p>Development on such features has been sorely lacking for well over a year as of 2012; if you want to see Linux come up to Windows and Macintosh standards in this area <i>please tell the Xorg developers</i> at http://www.x.org/wiki/XorgMailingLists<p>The TDE project badly needs these features before it can proceed with graphical monitor configuration tools:<br> * GPU object support<br> * The ability to query the active driver name for any Xorg output<p><b>To recap, this is <i>not a TDE shortcoming</i>, but rather is the result of a lack of fundamental Linux support for graphics configuration!</b></qt>");
+			base->labelRandrWarning->setText(i18n("<qt><b>NOTE: Any further integration of displays into TDE <i>REQUIRES</i> multi GPU support and other features slated for RandR 2.0.</b><p>Development on such features has been sorely lacking for well over a year as of 2012; if you want to see Linux come up to Windows and Macintosh standards in this area <i>please tell the Xorg developers</i> at http://www.x.org/wiki/XorgMailingLists<p>The TDE project badly needs these features before it can proceed with graphical monitor configuration tools:<br> * GPU object support<br> * The ability to query the active driver name for any Xorg output<p><b>To recap, this is <i>not a TDE shortcoming</i>, but rather is the result of a lack of fundamental Linux support for graphics configuration!</b></qt>"));
 		}
 
 		if (m_device->type() == TDEGenericDeviceType::RootSystem) {
@@ -791,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();
 		}
@@ -879,49 +969,74 @@ void DevicePropertiesDialog::setHibernationMethod(int value) {
 
 void DevicePropertiesDialog::mountDisk() {
 	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
-	TQString qerror;
-	TQString diskLabel = sdevice->diskLabel();
-	if (diskLabel.isNull()) {
-		diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
+
+	TDEProcess proc;
+	proc << "tdeio_media_mounthelper" << "-m" << sdevice->deviceNode();
+	if (!proc.start(TDEProcess::DontCare))
+	{
+		KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
+				i18n("Device monitor"));
 	}
-	TDEStorageMountOptions mountOptions;
-	TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, mountOptions);
-	TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
-	if (mountedPath.isEmpty()) {
-		qerror = i18n("<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper device and/or user privilege level<br>Corrupt data on storage device");
-		TQString errStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : TQString::null;
-		if (!errStr.isEmpty()) {
-			qerror.append(i18n("<p>Technical details:<br>").append(errStr));
-		}
-		qerror.append("</qt>");
+}
+
+void DevicePropertiesDialog::unmountDisk() {
+	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
+
+	TDEProcess proc;
+	proc << "tdeio_media_mounthelper" << "-u" << sdevice->deviceNode();
+	if (!proc.start(TDEProcess::DontCare))
+	{
+		KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
+				i18n("Device monitor"));
 	}
-	else {
-		qerror = "";
+}
+
+void DevicePropertiesDialog::unlockDisk() {
+	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
+
+	TDEProcess proc;
+	proc << "tdeio_media_mounthelper" << "-k" << sdevice->deviceNode();
+	if (!proc.start(TDEProcess::DontCare))
+	{
+		KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
+				i18n("Device monitor"));
 	}
+}
 
-	if (qerror != "") KMessageBox::error(this, qerror, i18n("Mount Failed"));
+void DevicePropertiesDialog::lockDisk() {
+	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
 
-	populateDeviceInformation();
+	TDEProcess proc;
+	proc << "tdeio_media_mounthelper" << "-l" << sdevice->deviceNode();
+	if (!proc.start(TDEProcess::DontCare))
+	{
+		KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
+				i18n("Device monitor"));
+	}
 }
 
-void DevicePropertiesDialog::unmountDisk() {
+void DevicePropertiesDialog::ejectDisk() {
 	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
 
-	TQString qerror;
-	TQStringVariantMap unmountResult = sdevice->unmountDevice();
-	if (unmountResult["result"].toBool() == false) {
-		// Unmount failed!
-		qerror = "<qt>" + i18n("Unfortunately, the device could not be unmounted.");
-		TQString errStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : TQString::null;
-		if (!errStr.isEmpty()) {
-			qerror.append(i18n("<p>Technical details:<br>").append(errStr));
-		}
-		qerror.append("</qt>");
+	TDEProcess proc;
+	proc << "tdeio_media_mounthelper" << "-e" << sdevice->deviceNode();
+	if (!proc.start(TDEProcess::DontCare))
+	{
+		KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
+				i18n("Device monitor"));
 	}
+}
 
-	if (qerror != "") KMessageBox::error(this, qerror, i18n("Unmount Failed"));
+void DevicePropertiesDialog::safeRemoveDisk() {
+	TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device);
 
-	populateDeviceInformation();
+	TDEProcess proc;
+	proc << "tdeio_media_mounthelper" << "-s" << sdevice->deviceNode();
+	if (!proc.start(TDEProcess::DontCare))
+	{
+		KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
+				i18n("Device monitor"));
+	}
 }
 
 void DevicePropertiesDialog::cryptLUKSAddKey() {
diff --git a/kcontrol/hwmanager/devicepropsdlg.h b/kcontrol/hwmanager/devicepropsdlg.h
index e958d39ba..e961e689f 100644
--- a/kcontrol/hwmanager/devicepropsdlg.h
+++ b/kcontrol/hwmanager/devicepropsdlg.h
@@ -20,13 +20,13 @@
 #define __devicepropsdlg_h__
 
 #include <tqprogressbar.h>
-
 #include <kdialogbase.h>
-
 #include <tdehardwaredevices.h>
 
 #include "devicepropsdlgbase.h"
 
+class PasswordDlg;
+
 /**
  *
  * Simple sensor name and text label value display widget
@@ -37,7 +37,7 @@
 
 class TDEUI_EXPORT SensorDisplayLabelsWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Create a simple sensor name and value display widget
@@ -65,7 +65,7 @@ private:
 
 class TDEUI_EXPORT SensorBar : public TQProgressBar
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SensorBar(TQWidget* parent=0, const char* name=0, WFlags f=0) : TQProgressBar(parent, name, f) {}
 	SensorBar(int totalSteps, TQWidget* parent=0, const char* name=0, WFlags f=0): TQProgressBar(totalSteps, parent, name, f) {}
@@ -93,7 +93,7 @@ public:
 
 class TDEUI_EXPORT SensorDisplayWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Simple sensor information display widget
@@ -167,7 +167,7 @@ typedef TQMap<TDESystemHibernationMethod::TDESystemHibernationMethod, int> Hiber
 
 class TDEUI_EXPORT DevicePropertiesDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Create a dialog that allows a user to view and edit hardware device properties
@@ -190,6 +190,10 @@ private slots:
 
 	void mountDisk();
 	void unmountDisk();
+	void unlockDisk();
+	void lockDisk();
+	void ejectDisk();
+	void safeRemoveDisk();
 
 	void cryptLUKSAddKey();
 	void cryptLUKSDelKey();
@@ -202,12 +206,11 @@ private slots:
 	void processLockouts();
 
 private:
+	static bool isMonitoredDevice(TDEStorageDevice *sdevice);
+
 	TDEGenericDevice* m_device;
 	DevicePropertiesDialogBase* base;
 
-	class DevicePropertiesDialogPrivate;
-	DevicePropertiesDialogPrivate* d;
-
 	TQGridLayout* m_sensorDataGrid;
 	SensorDisplayWidgetList m_sensorDataGridWidgets;
 
diff --git a/kcontrol/hwmanager/devicepropsdlgbase.ui b/kcontrol/hwmanager/devicepropsdlgbase.ui
index 48fcf7d75..dce403fe7 100644
--- a/kcontrol/hwmanager/devicepropsdlgbase.ui
+++ b/kcontrol/hwmanager/devicepropsdlgbase.ui
@@ -302,13 +302,26 @@
 							    <cstring>unnamed</cstring>
 						    </property>
 						    <property name="text">
+							    <string>Mapped name:</string>
+						    </property>
+					    </widget>
+					    <widget class="KActiveLabel" row="3" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>labelMappedName</cstring>
+						    </property>
+					    </widget>
+					    <widget class="TQLabel" row="4" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>unnamed</cstring>
+						    </property>
+						    <property name="text">
 							    <string>Status:</string>
 						    </property>
 						    <property name="alignment">
 							    <set>AlignTop|AlignLeft</set>
 						    </property>
 					    </widget>
-					    <widget class="KActiveLabel" row="3" column="1" colspan="1">
+					    <widget class="KActiveLabel" row="4" column="1" colspan="1">
 						    <property name="name">
 							    <cstring>labelDiskStatus</cstring>
 						    </property>
@@ -342,6 +355,38 @@
 							    <string>Unmount</string>
 						    </property>
 					    </widget>
+					    <widget class="KPushButton" row="0" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>buttonDiskUnlock</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Unlock</string>
+						    </property>
+					    </widget>
+					    <widget class="KPushButton" row="0" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>buttonDiskLock</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Lock</string>
+						    </property>
+					    </widget>
+					    <widget class="KPushButton" row="1" column="0" colspan="1">
+						    <property name="name">
+							    <cstring>buttonDiskEject</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Eject</string>
+						    </property>
+					    </widget>
+					    <widget class="KPushButton" row="1" column="1" colspan="1">
+						    <property name="name">
+							    <cstring>buttonDiskSafeRemove</cstring>
+						    </property>
+						    <property name="text">
+							    <string>Safe Remove</string>
+						    </property>
+					    </widget>
 				    </grid>
 			    </widget>
 			    <spacer row="8" column="0">
@@ -1714,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 18ef3d5e9..6c8949275 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- * 
+ *
  * This file is part of hwdevicetray, the TDE Hardware Device Monitor System Tray Application
- * 
+ *
  * hwdevicetray 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
@@ -17,55 +17,148 @@
  * License along with cryptocardwatcher. If not, see http://www.gnu.org/licenses/.
  */
 
-#include <tqtimer.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <cstdlib>
+#include <unistd.h>
+
+#include <tqfileinfo.h>
 #include <tqimage.h>
+#include <tqtimer.h>
 #include <tqtooltip.h>
-#include <tqfileinfo.h>
+#include <tqvaluevector.h>
 
+#include <kcmultidialog.h>
+#include <kglobalaccel.h>
+#include <khelpmenu.h>
+#include "kprocess.h"
+#include <kpropertiesdialog.h>
 #include <krun.h>
+#include <ksimpleconfig.h>
+#include <kstandarddirs.h>
+
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <kcmultidialog.h>
-#include <kdebug.h>
-#include <khelpmenu.h>
-#include <kiconloader.h>
-#include <tdelocale.h>
-#include <tdepopupmenu.h>
-#include <kstdaction.h>
-#include <kstdguiitem.h>
 #include <tdeglobal.h>
+#include <tdehardwaredevices.h>
+#include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kpassivepopup.h>
-#include <kstandarddirs.h>
+#include "tdepassivepopupstack.h"
+#include <tdepopupmenu.h>
 
 #include <dcopclient.h>
+#include <dcopref.h>
 
-#include <cstdlib>
-#include <unistd.h>
-
+#include "hwdevicetray.h"
 #include "hwdevicetray_configdialog.h"
 
-#include "hwdevicetray.h"
 
-HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name)
-	: KSystemTray(parent, name) {
+// Storage Device Action
+namespace SDActions
+{
+	// use 'int' as underlying type to avoid exposing a bunch of unnecessary
+	// enums/structs in the class header file private methods' signature
+	// Note: must start from 0 because the Type value is also used as index
+	// of a TQValueVector
+	enum Type : int
+	{
+		Open = 0,
+		Mount,
+		Unmount,
+		Unlock,
+		Lock,
+		Eject,
+		SafeRemove,
+		Properties
+	};
+
+	struct Details
+	{
+		const char *iconName;
+		const char *actionName;
+		const char *collectionName;
+	};
+
+	// Allows to use a for loop to iterate over all action types
+	static const Type All[] = { Open, Mount, Unmount, Unlock, Lock, Eject, SafeRemove, Properties };
+
+	static const TQMap<Type, Details> populateMap()
+	{
+		TQMap<Type, Details> map;
+		map[Open] = { "window-new", I18N_NOOP("Open"), "open_menu" };
+		map[Mount] = { "drive-harddisk-mounted", I18N_NOOP("Mount"), "mount_menu" };
+		map[Unmount] = { "drive-harddisk-unmounted", I18N_NOOP("Unmount"), "unmount_menu" };
+		map[Unlock] = { "decrypted", I18N_NOOP("Unlock"), "unlock_menu" };
+		map[Lock] = { "encrypted", I18N_NOOP("Lock"), "lock_menu" };
+		map[Eject] = { "player_eject", I18N_NOOP("Eject"), "eject_menu" };
+		map[SafeRemove] = { "player_safe_removal", I18N_NOOP("Safe remove"), "safe_remove_menu" };
+		map[Properties] = { "edit", I18N_NOOP("Properties"), "properties_menu" };
+		return map;
+	}
+
+	static const TQMap<Type, Details> Data = populateMap();
+}
+
+// Storage Device Action Menu Entry, representing an action
+// and the storage device on which to perform it
+struct SDActionMenuEntry
+{
+	SDActions::Type actionType;
+	TQString uuid;
+};
 
+struct KnownDiskDeviceInfo
+{
+	TQString deviceLabel;
+	TQString node;
+};
+
+
+class HwDeviceSystemTrayPrivate
+{
+public:
+	HwDeviceSystemTrayPrivate()
+	{
+	}
+
+	~HwDeviceSystemTrayPrivate()
+	{
+	}
+
+	// Members
+	TDEAction *m_deviceManagerAction;
+	TDEAction *m_quitAction;
+	TDEAction *m_shortcutKeysAction;
+	KHelpMenu *m_helpMenu;
+	TDEPopupMenu *m_LMBMenu;
+	TDEPopupMenu *m_RMBMenu;
+
+	TQMap<int, SDActionMenuEntry> m_actionMenuEntryMap;
+	TQMap<SDActions::Type, TDEActionMenu*> m_RMBActionMenuMap;
+
+	TQMap<TQString, KnownDiskDeviceInfo> m_knownDiskDevices;
+
+	TDEPassivePopupStackContainer *m_hardwareNotifierContainer;
+};
+
+
+HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name)
+	: KSystemTray(parent, name), d(new HwDeviceSystemTrayPrivate())
+{
 	// Create notifier
-	m_hardwareNotifierContainer = new TDEPassivePopupStackContainer();
-	connect(m_hardwareNotifierContainer, TQT_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQT_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString)));
+	d->m_hardwareNotifierContainer = new TDEPassivePopupStackContainer();
+	connect(d->m_hardwareNotifierContainer, TQ_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQ_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString)));
 
-	// Create help submenu
-	m_help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection());
-	TDEPopupMenu *help = m_help->menu();
-	help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
+	initMenus();
 
 	setPixmap(KSystemTray::loadIcon("hwinfo"));
-	setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-	connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
+	setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
+	connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitApp()));
 	TQToolTip::add(this, i18n("Device monitor"));
-	m_parent = parent;
 
-	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
@@ -73,36 +166,35 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name)
 	globalKeys->setEnabled(true);
 	globalKeys->updateConnections();
 
-	connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+	connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
 
-	new TDEActionMenu(i18n("Open Device"), SmallIcon("connect_creating",  TQIconSet::Automatic), actionCollection(), "mount_menu");
-	new TDEActionMenu(i18n("Eject Device"), SmallIcon("connect_no",  TQIconSet::Automatic), actionCollection(), "unmount_menu");
-
-#ifdef __TDE_HAVE_TDEHWLIB
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-	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*)));
-#endif
+	doDiskNotifications(true);
+	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() {
-	delete m_hardwareNotifierContainer;
+HwDeviceSystemTray::~HwDeviceSystemTray()
+{
+	delete d->m_hardwareNotifierContainer;
+	delete d;
 }
 
 /*!
- * \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::_quit () {
-	r_config = new KSimpleConfig("tdehwdevicetrayrc");
+void HwDeviceSystemTray::quitApp()
+{
+	KSimpleConfig *config = new KSimpleConfig("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"));
-	r_config->setGroup("General");
-	r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes);
-	r_config->sync ();
+	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"));
+	config->setGroup("General");
+	config->writeEntry("Autostart", tmp2 == KMessageBox::Yes);
+	config->sync();
 
 	exit(0);
 }
@@ -129,185 +221,373 @@ void HwDeviceSystemTray::showEvent (TQShowEvent *) {
 	resizeTrayIcon();
 }
 
-void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e) {
-	// Popup the context menu with left-click
-	if (e->button() == Qt::LeftButton) {
-		contextMenuAboutToShow(contextMenu());
-		contextMenu()->popup(e->globalPos());
-		e->accept();
-		return;
+void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e)
+{
+	switch (e->button())
+	{
+		case TQt::LeftButton:
+			populateLMBMenu();
+			d->m_LMBMenu->popup(e->globalPos());
+			break;
+
+		case TQt::MidButton:
+			TQTimer::singleShot(0, this, TQ_SLOT(slotHardwareConfig()));
+			break;
+
+		case TQt::RightButton:
+			contextMenuAboutToShow(d->m_RMBMenu);
+			d->m_RMBMenu->popup(e->globalPos());
+			break;
+
+		default:
+			// do nothing
+			break;
 	}
-
-	KSystemTray::mousePressEvent(e);
 }
 
-bool HwDeviceSystemTray::isMonitoredDevice(TDEStorageDevice* sdevice) {
+bool HwDeviceSystemTray::isMonitoredDevice(TDEStorageDevice* sdevice)
+{
 	// Type selection logic largely duplicated from the media manager tdeioslave
-	if (((sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)
-		|| sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem)
-		|| sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio)
-		|| sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
-		&& !sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)
-		&& !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)
-		&& (sdevice->isDiskOfType(TDEDiskDeviceType::HDD)
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDROM))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDR))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDRW))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDMO))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRW))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRWW))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDROM))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRAM))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDR))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRW))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRDL))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRWDL))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSR))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRW))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRDL))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRWDL))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::BDROM))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::BDR))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::BDRW))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDROM))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDR))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDRW))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::CDVideo))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::DVDVideo))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::BDVideo))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::Floppy))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::Zip))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::Jaz))))
-		|| (sdevice->isDiskOfType(TDEDiskDeviceType::Camera))) {
-		return true;
-	}
-	else {
-		return false;
-	}
+	return ((sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+	         sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) ||
+	         sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) &&
+	        !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden) &&
+	        (sdevice->isDiskOfType(TDEDiskDeviceType::HDD) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDROM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDMO) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRWW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDROM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDRAM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDRDL) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDRWDL) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRDL) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRWDL) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::BDROM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::BDR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::BDRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDROM) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDR) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDRW) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::CDVideo) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::DVDVideo) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::BDVideo) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::Floppy) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::Zip) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::Jaz) ||
+	         sdevice->isDiskOfType(TDEDiskDeviceType::Camera)));
 }
 
-void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) {
-	menu->clear();
-	menu->setCheckable(true);
+void HwDeviceSystemTray::initMenus()
+{
+	// RMB menu
+	d->m_RMBMenu = contextMenu();
+
+	// Device actions
+	for (const SDActions::Type &actionType : SDActions::All)
+	{
+		SDActions::Details ad = SDActions::Data[actionType];
+		d->m_RMBActionMenuMap.insert(actionType, new TDEActionMenu(i18n(ad.actionName),
+	        SmallIcon(ad.iconName, TQIconSet::Automatic), actionCollection(), ad.collectionName));
+	}
 
-	populateMenu(menu);
+	// Global Configuration
+	d->m_deviceManagerAction = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"),
+	        TDEShortcut(), this, TQ_SLOT(slotHardwareConfig()), actionCollection());
+	d->m_shortcutKeysAction = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"),
+	        TDEShortcut(), this, TQ_SLOT(slotEditShortcutKeys()), actionCollection());
 
-	menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration"));
+	// Help & Quit
+	d->m_helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection());
+	d->m_helpMenu->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents()));
+	d->m_quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
+
+	// LMB menu
+	d->m_LMBMenu = new TDEPopupMenu(this);
+}
+
+TQString HwDeviceSystemTray::getDeviceLabel(TDEStorageDevice *sdevice)
+{
+	if (!sdevice)
+	{
+		return TQString::null;
+	}
 
-	TDEAction *actHardwareConfig = new TDEAction(i18n("Configure Devices..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection());
-	actHardwareConfig->plug(menu);
+	DCOPRef mediamanager("kded", "mediamanager");
+	DCOPReply reply = mediamanager.call("properties", sdevice->deviceNode());
+	TQString deviceLabel = TQString::null;
+	if (reply.isValid())
+	{
+		// TODO R14.2.0: make sure the reply is a valid Medium
+		// once the media library is part of tdelibs
+		TQStringList properties = reply;
+		if (properties.size() >= 4)
+		{
+			deviceLabel = properties[3]; // medium label
+		}
+	}
 
-	TDEAction *actShortcutKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditShortcutKeys()), actionCollection());
-	actShortcutKeys->plug(menu);
+	if (deviceLabel.isEmpty())
+	{
+		deviceLabel = !sdevice->diskLabel().isEmpty() ? sdevice->diskLabel() : sdevice->friendlyName();
+		deviceLabel += " (" + sdevice->deviceNode() + ")";
+	}
 
-	menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), m_help->menu());
-	TDEAction *quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit));
-	quitAction->plug(menu);
+	return deviceLabel;
+}
 
-	m_menu = menu;
+void HwDeviceSystemTray::addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int type,
+        TDEActionMenu *actionMenu, int &actionMenuIdx)
+{
+	TQString uuid = !sdevice->diskUUID().isEmpty() ? sdevice->diskUUID() : sdevice->systemPath();
+	SDActions::Type actionType = (SDActions::Type)type;
+	SDActions::Details ad = SDActions::Data[actionType];
+	actionMenu->popupMenu()->insertItem(SmallIcon(ad.iconName), i18n(ad.actionName), actionMenuIdx);
+	actionMenu->popupMenu()->connectItem(actionMenuIdx, this,
+	        TQ_SLOT(slotExecuteDeviceAction(int)));
+	d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid };
 }
 
-void HwDeviceSystemTray::configChanged() {
-	//
+void HwDeviceSystemTray::addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int type, int &actionMenuIdx)
+{
+	TQString uuid = !sdevice->diskUUID().isEmpty() ? sdevice->diskUUID() : sdevice->systemPath();
+	SDActions::Type actionType = (SDActions::Type)type;
+	TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType];
+	actionMenu->popupMenu()->insertItem(sdevice->icon(TDEIcon::SizeSmall),
+	        getDeviceLabel(sdevice), actionMenuIdx);
+	actionMenu->popupMenu()->connectItem(actionMenuIdx, this,
+	        TQ_SLOT(slotExecuteDeviceAction(int)));
+	actionMenu->setEnabled(true);
+	d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid };
 }
 
-void HwDeviceSystemTray::populateMenu(TDEPopupMenu* menu) {
-	int lastMountIndex;
-	int lastUnmountIndex;
-	TDEGenericDevice *hwdevice;
+void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
+{
+	d->m_RMBMenu = menu;
+	menu->clear();
 
-	TDEActionMenu* mountDiskActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("mount_menu"));
-	mountDiskActionMenu->popupMenu()->clear();
-	m_mountMenuIndexMap.clear();
-	TDEActionMenu* unmountDiskActionMenu = static_cast<TDEActionMenu*>(actionCollection()->action("unmount_menu"));
-	unmountDiskActionMenu->popupMenu()->clear();
-	m_mountMenuIndexMap.clear();
+	for (const SDActions::Type &actionType : SDActions::All)
+	{
+		TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType];
+		actionMenu->popupMenu()->clear();
+		actionMenu->setEnabled(false);
+		actionMenu->unplug(d->m_RMBMenu);
+	}
 
-	menu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices"));
+	d->m_actionMenuEntryMap.clear();
 
-	// Find all storage devices and add them to the popup menu
-	lastMountIndex = 1;
-	lastUnmountIndex = 1;
+	// Find all storage devices, sort them by label and add them to the popup menus
+	TQValueVector<TQMap<TQString, TDEStorageDevice*>*> rmbMenuEntries(sizeof(SDActions::All) / sizeof(SDActions::Type), nullptr);
+	for (size_t idx = 0; idx < rmbMenuEntries.size(); ++idx)
+	{
+		rmbMenuEntries[idx] = new TQMap<TQString, TDEStorageDevice*>();
+	}
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-	for (hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) {
-		TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-		if (isMonitoredDevice(sdevice)) {
-			lastMountIndex = mountDiskActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()));
-			mountDiskActionMenu->popupMenu()->connectItem(lastMountIndex, this, TQT_SLOT(slotMountDevice(int)));
-			m_mountMenuIndexMap[lastMountIndex] = sdevice->diskUUID();
-			if (m_mountMenuIndexMap[lastMountIndex] == "") {
-				m_mountMenuIndexMap[lastMountIndex] = sdevice->systemPath();
+	for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
+	{
+		TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
+		if (isMonitoredDevice(sdevice))
+		{
+			TQString deviceLabel = getDeviceLabel(sdevice);
+			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+			    sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted))
+			{
+				if (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt))
+				{
+					(*rmbMenuEntries[SDActions::Lock])[deviceLabel] = sdevice;
+				}
+				else
+				{
+					(*rmbMenuEntries[SDActions::Unlock])[deviceLabel] = sdevice;
+				}
 			}
-			if (sdevice->mountPath() != TQString::null) {
-				lastUnmountIndex = unmountDiskActionMenu->popupMenu()->insertItem(hwdevice->icon(TDEIcon::SizeSmall), i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()));
-				unmountDiskActionMenu->popupMenu()->connectItem(lastUnmountIndex, this, TQT_SLOT(slotUnmountDevice(int)));
-				m_unmountMenuIndexMap[lastUnmountIndex] = sdevice->diskUUID();
-				if (m_unmountMenuIndexMap[lastMountIndex] == "") {
-					m_unmountMenuIndexMap[lastMountIndex] = sdevice->systemPath();
+
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable))
+			{
+				if (sdevice->mountPath().isEmpty())
+				{
+					(*rmbMenuEntries[SDActions::Mount])[deviceLabel] = sdevice;
+				}
+				else
+				{
+					(*rmbMenuEntries[SDActions::Unmount])[deviceLabel] = sdevice;
 				}
+
+				// Mounted and unmounted disks can also be opened
+				(*rmbMenuEntries[SDActions::Open])[deviceLabel] = sdevice;
+			}
+
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
+			{
+				(*rmbMenuEntries[SDActions::Eject])[deviceLabel] = sdevice;
+
+				(*rmbMenuEntries[SDActions::SafeRemove])[deviceLabel] = sdevice;
 			}
+
+			(*rmbMenuEntries[SDActions::Properties])[deviceLabel] = sdevice;
 		}
 	}
 
-	if (lastMountIndex == 0) {
-		mountDiskActionMenu->setEnabled(false);
-	}
-	else {
-		mountDiskActionMenu->setEnabled(true);
-	}
-	if (lastUnmountIndex == 0) {
-		unmountDiskActionMenu->setEnabled(false);
-	}
-	else {
-		unmountDiskActionMenu->setEnabled(true);
+	// Plug in meaningful action menus
+	d->m_RMBMenu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Device Actions"), 0);
+	int actionMenuIdx = 0;
+	for (const SDActions::Type &actionType : SDActions::All)
+	{
+		TDEActionMenu *actionMenu = d->m_RMBActionMenuMap[actionType];
+		for (TDEStorageDevice *sdevice : *rmbMenuEntries[actionType])
+		{
+			addDeviceToRMBMenu(sdevice, actionType, actionMenuIdx);
+		}
+		if (actionMenu->isEnabled())
+		{
+			actionMenu->plug(d->m_RMBMenu);
+		}
+		delete rmbMenuEntries[actionType];
+		rmbMenuEntries[actionType] = nullptr;
 	}
 
-	mountDiskActionMenu->plug(menu);
-	unmountDiskActionMenu->plug(menu);
+	// Global Configuration
+	menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration"));
+
+	d->m_deviceManagerAction->plug(menu);
+	d->m_shortcutKeysAction->plug(menu);
+
+	// Help & Quit
+	menu->insertSeparator();
+	menu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), d->m_helpMenu->menu());
+	d->m_quitAction->plug(menu);
 }
 
-void HwDeviceSystemTray::slotMountDevice(int parameter)
+void HwDeviceSystemTray::populateLMBMenu()
 {
-	TDEGenericDevice *hwdevice;
-	TQString uuid = m_mountMenuIndexMap[parameter];
-	if (uuid != "") {
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) {
-			TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) {
-				if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera)) {
-					new KRun(TQString("media:/%1").arg(sdevice->friendlyName()));
+	d->m_LMBMenu->clear();
+	d->m_LMBMenu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices"), 0);
+
+	d->m_actionMenuEntryMap.clear();
+	int actionMenuIdx = 0;
+
+	// Find all storage devices and add them to the popup menus
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+	TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
+	TQMap<TQString, TDEActionMenu*> lmbMenuEntries;
+	for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
+	{
+		TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
+		if (isMonitoredDevice(sdevice) &&
+		    (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+		     sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) ||
+		     sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable) ||
+		     sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)))
+		{
+			TQString deviceLabel = getDeviceLabel(sdevice);
+			TDEActionMenu *actionMenu = new TDEActionMenu(deviceLabel,
+					sdevice->icon(TDEIcon::SizeSmall));
+
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Mountable))
+			{
+				// Mounted and unmounted disks can also be opened
+				addDeviceToLMBMenu(sdevice, SDActions::Open, actionMenu, actionMenuIdx);
+
+				if (sdevice->mountPath().isEmpty())
+				{
+					addDeviceToLMBMenu(sdevice, SDActions::Mount, actionMenu, actionMenuIdx);
 				}
-				else {
-					new KRun(TQString("system:/media/%1").arg(TQFileInfo(sdevice->deviceNode()).baseName(true)));
+				else
+				{
+					addDeviceToLMBMenu(sdevice, SDActions::Unmount, actionMenu, actionMenuIdx);
 				}
-				return;
 			}
+
+			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) ||
+					sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted))
+			{
+				if (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt))
+				{
+					addDeviceToLMBMenu(sdevice, SDActions::Lock, actionMenu, actionMenuIdx);
+				}
+				else
+				{
+					addDeviceToLMBMenu(sdevice, SDActions::Unlock, actionMenu, actionMenuIdx);
+				}
+			}
+
+
+			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable))
+			{
+				addDeviceToLMBMenu(sdevice, SDActions::Eject, actionMenu, actionMenuIdx);
+
+				addDeviceToLMBMenu(sdevice, SDActions::SafeRemove, actionMenu, actionMenuIdx);
+			}
+
+			addDeviceToLMBMenu(sdevice, SDActions::Properties, actionMenu, actionMenuIdx);
+
+			lmbMenuEntries[deviceLabel] = actionMenu;
 		}
 	}
+	// Insert menu entries in sorted order
+	for (TDEActionMenu *am : lmbMenuEntries)
+	{
+		am->plug(d->m_LMBMenu);
+	}
 }
 
-void HwDeviceSystemTray::slotUnmountDevice(int parameter)
+void HwDeviceSystemTray::slotExecuteDeviceAction(int parameter)
 {
-	TDEGenericDevice *hwdevice;
-	TQString uuid = m_unmountMenuIndexMap[parameter];
-	if (uuid != "") {
+	TQString uuid = d->m_actionMenuEntryMap[parameter].uuid;
+	int actionType = d->m_actionMenuEntryMap[parameter].actionType;
+	if (!uuid.isEmpty())
+	{
 		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 		TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
-		for (hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next()) {
-			TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) {
-				if (!sdevice->mountPath().isEmpty()) {
-					TQStringVariantMap unmountResult = sdevice->unmountDevice();
-					if (unmountResult["result"].toBool() == false) {
-						TQString errStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : TQString::null;
-						TQString retcodeStr = unmountResult.contains("retCode") ? unmountResult["retCode"].toString() : "not available";
-						KMessageBox::error(0, i18n("<qt><b>Unable to eject device</b><p>Detailed error information:<br>%1 (error code %2)</qt>").arg(errStr).arg(retcodeStr), i18n("Eject Failed"));
+		for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
+		{
+			TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
+			if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid))
+			{
+				if (actionType == SDActions::Open)
+				{
+					if (sdevice->isDiskOfType(TDEDiskDeviceType::Camera))
+					{
+						new KRun(TQString("media:/%1").arg(sdevice->friendlyName()));
+					}
+					else
+					{
+						new KRun(TQString("system:/media/%1").arg(TQFileInfo(sdevice->deviceNode()).baseName(true)));
+					}
+				}
+				else if (actionType == SDActions::Properties)
+				{
+					new KPropertiesDialog(KURL(TQString("media:/%1").arg(sdevice->deviceNode())));
+				}
+				else
+				{
+					TQString opType = TQString::null;
+					if (actionType == SDActions::Mount)           { opType = "-m"; }
+					else if (actionType == SDActions::Unmount)    { opType = "-u"; }
+					else if (actionType == SDActions::Unlock)     { opType = "-k"; }
+					else if (actionType == SDActions::Lock)       { opType = "-l"; }
+					else if (actionType == SDActions::Eject)      { opType = "-e"; }
+					else if (actionType == SDActions::SafeRemove) { opType = "-s"; }
+
+					if (!opType.isEmpty())
+					{
+						TDEProcess proc;
+						proc << "tdeio_media_mounthelper" << opType << sdevice->deviceNode();
+						if (!proc.start(TDEProcess::DontCare))
+						{
+							KMessageBox::error(this, i18n("Could not start tdeio_media_mounthelper process."),
+									i18n("Device monitor"));
+						}
 					}
-					return;
 				}
 			}
 		}
@@ -341,63 +621,117 @@ void HwDeviceSystemTray::slotEditShortcutKeys() {
 	delete dlg;
 }
 
-void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) {
-#ifdef __TDE_HAVE_TDEHWLIB
-	if (device->type() == TDEGenericDeviceType::Disk) {
-		TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
-		if (isMonitoredDevice(sdevice)) {
-			TQString uuid = sdevice->diskUUID();
-			if (uuid == "") {
-				uuid = sdevice->systemPath();
+void HwDeviceSystemTray::doDiskNotifications(bool scanOnly)
+{
+	TDEConfig config("mediamanagerrc");
+	config.setGroup("Global");
+	bool popupEnable = config.readBoolEntry("DeviceMonitorPopupsEnabled", true);
+
+	// Scan devices for changes and notify new devices if needed.
+	// This is necessary because the device information may not be available
+	// at the time the hardwareAdded signal is emitted
+	TQMap<TQString, KnownDiskDeviceInfo> oldKnownDevices = d->m_knownDiskDevices;
+	d->m_knownDiskDevices.clear();
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+	TDEGenericHardwareList diskDeviceList = hwdevices->listByDeviceClass(TDEGenericDeviceType::Disk);
+	for (TDEGenericDevice *hwdevice = diskDeviceList.first(); hwdevice; hwdevice = diskDeviceList.next())
+	{
+		TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(hwdevice);
+		if (isMonitoredDevice(sdevice))
+		{
+			TQString sysPath = sdevice->systemPath();
+			if (oldKnownDevices.contains(sysPath))
+			{
+				d->m_knownDiskDevices[sysPath] = oldKnownDevices[sysPath];
+				oldKnownDevices.remove(sysPath);
+			}
+			else
+			{
+				TQString deviceLabel = getDeviceLabel(sdevice);
+				d->m_knownDiskDevices[sysPath] = { deviceLabel, sdevice->deviceNode() };
+				if (!scanOnly && popupEnable)
+				{
+					d->m_hardwareNotifierContainer->displayMessage(
+							i18n("A disk device has been added!"), deviceLabel,
+							SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath);
+				}
 			}
-			m_hardwareNotifierContainer->displayMessage(
-				i18n("A disk device has been added!"),
-				i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk-unmounted"),
-				0, 0, "ADD: " + uuid);
 		}
 	}
-#endif
+	// Notify devices which have been removed, if necessary
+	if (!scanOnly && popupEnable)
+	{
+		TQMap<TQString, KnownDiskDeviceInfo>::ConstIterator delIt;
+		for (delIt = oldKnownDevices.begin(); delIt != oldKnownDevices.end(); delIt++)
+		{
+			d->m_hardwareNotifierContainer->displayMessage(
+					i18n("A disk device has been removed!"), delIt.data().deviceLabel,
+					SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + delIt.key());
+		}
+	}
 }
 
-void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) {
-#ifdef __TDE_HAVE_TDEHWLIB
-	if (device->type() == TDEGenericDeviceType::Disk) {
-		TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
-		if (isMonitoredDevice(sdevice)) {
-			TQString uuid = sdevice->diskUUID();
-			if (uuid == "") {
-				uuid = sdevice->systemPath();
+void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device)
+{
+	if (device->type() == TDEGenericDeviceType::Disk)
+	{
+		TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(device);
+		// The device information may not be available at the time the hardwareAdded signal is emitted.
+		// In such case ignore the event and handle that at the subsequent hardwareUpdate signal emission.
+		TQString sysPath = sdevice->systemPath();
+		if (isMonitoredDevice(sdevice) && !d->m_knownDiskDevices.contains(sysPath))
+		{
+			TQString deviceLabel = getDeviceLabel(sdevice);
+			d->m_knownDiskDevices[sysPath] = { deviceLabel, sdevice->deviceNode() };
+			TDEConfig config("mediamanagerrc");
+			config.setGroup("Global");
+			if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
+			{
+				d->m_hardwareNotifierContainer->displayMessage(
+						i18n("A disk device has been added!"), deviceLabel,
+						SmallIcon("drive-harddisk-unmounted"), 0, 0, "ADD: " + sysPath);
 			}
-			m_hardwareNotifierContainer->displayMessage(
-				i18n("A disk device has been removed!"),
-				i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk-unmounted"),
-				0, 0, "REMOVE: " + uuid);
 		}
 	}
-#endif
 }
 
-void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device) {
-#ifdef __TDE_HAVE_TDEHWLIB
-	if (device->type() == TDEGenericDeviceType::Disk) {
-		TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
-		if (isMonitoredDevice(sdevice)) {
-			TQString uuid = sdevice->diskUUID();
-			if (uuid == "") {
-				uuid = sdevice->systemPath();
+void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device)
+{
+	if (device->type() == TDEGenericDeviceType::Disk)
+	{
+		TDEStorageDevice *sdevice = static_cast<TDEStorageDevice*>(device);
+		TQString sysPath = sdevice->systemPath();
+		if (isMonitoredDevice(sdevice) && d->m_knownDiskDevices.contains(sysPath))
+		{
+			TDEConfig config("mediamanagerrc");
+			config.setGroup("Global");
+			if (config.readBoolEntry("DeviceMonitorPopupsEnabled", true))
+			{
+				TQString deviceLabel = getDeviceLabel(sdevice);
+				d->m_hardwareNotifierContainer->displayMessage(
+						i18n("A disk device has been removed!"), deviceLabel,
+						SmallIcon("drive-harddisk-unmounted"), 0, 0, "REMOVE: " + sysPath);
 			}
-			m_hardwareNotifierContainer->displayMessage(
-				i18n("A disk device has been changed!"),
-				i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk-unmounted"),
-				0, 0, "CHANGE: " + uuid);
+			d->m_knownDiskDevices.remove(sysPath);
 		}
 	}
-#endif
+}
+
+void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device)
+{
+	doDiskNotifications(false);
 }
 
 void HwDeviceSystemTray::devicePopupClicked(KPassivePopup* popup, TQPoint point, TQString uuid) {
 	TDEGenericDevice *hwdevice;
 	if (uuid.startsWith("ADD: ")) {
+		TDEConfig config("mediamanagerrc");
+		config.setGroup("Global");
+		if (config.readBoolEntry("NotificationPopupsEnabled", true))
+		{
+			return;
+		}
+
 		uuid = uuid.right(uuid.length() - strlen("ADD: "));
 		if (uuid != "") {
 			TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -429,4 +763,4 @@ void HwDeviceSystemTray::slotHelpContents() {
 	kapp->invokeHelp(TQString::null, "hwdevicetray");
 }
 
-#include "hwdevicetray.moc"
\ No newline at end of file
+#include "hwdevicetray.moc"
diff --git a/kcontrol/hwmanager/hwdevicetray.h b/kcontrol/hwmanager/hwdevicetray.h
index d49f5b4b3..4f019ae58 100644
--- a/kcontrol/hwmanager/hwdevicetray.h
+++ b/kcontrol/hwmanager/hwdevicetray.h
@@ -1,8 +1,8 @@
 /*
  * Copyright 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net>
- * 
+ *
  * This file is part of hwdevicetray, the TDE Hardware Device Monitor System Tray Application
- * 
+ *
  * hwdevicetray 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
@@ -20,76 +20,58 @@
 #ifndef TDEHWDEVICETRAY_H
 #define TDEHWDEVICETRAY_H
 
-#include <tqptrlist.h>
-
 #include <ksystemtray.h>
-#include <kglobalaccel.h>
-#include <ksimpleconfig.h>
-#include <tdepassivepopupstack.h>
-
-#ifdef __TDE_HAVE_TDEHWLIB
-#include <tdehardwaredevices.h>
-#else
-#define TDEGenericDevice void
-#endif
 
-class KHelpMenu;
+class HwDeviceSystemTrayPrivate;
+class KPassivePopup;
+class TDEActionMenu;
+class TDEGenericDevice;
+class TDEGlobalAccel;
 class TDEPopupMenu;
+class TDEStorageDevice;
 
-typedef TQMap<int, TQString> TQStringMap;
-
-class HwDeviceSystemTray :  public KSystemTray
+class HwDeviceSystemTray : public KSystemTray
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	HwDeviceSystemTray(TQWidget* parent = 0, const char *name = 0);
 	~HwDeviceSystemTray();
-	TDEGlobalAccel *globalKeys;
 
-	virtual void contextMenuAboutToShow(TDEPopupMenu* menu);
+	TDEGlobalAccel *globalKeys;
 
-	void configChanged();
+	virtual void contextMenuAboutToShow(TDEPopupMenu *menu);
 
 protected slots:
 	void slotHardwareConfig();
 	void slotEditShortcutKeys();
 	void slotSettingsChanged(int category);
 	void slotHelpContents();
+	void slotExecuteDeviceAction(int parameter);
 
-	void slotMountDevice(int parameter);
-	void slotUnmountDevice(int parameter);
-
-protected:
-	void mousePressEvent(TQMouseEvent *e);
-	void resizeEvent(TQResizeEvent *);
-	void showEvent(TQShowEvent *);
-
-private slots:
-	void _quit();
+	void quitApp();
 	void deviceAdded(TDEGenericDevice*);
 	void deviceRemoved(TDEGenericDevice*);
 	void deviceChanged(TDEGenericDevice*);
-
 	void devicePopupClicked(KPassivePopup*, TQPoint, TQString);
+	void doDiskNotifications(bool scanOnly);
 
-private:
-	bool isMonitoredDevice(TDEStorageDevice* sdevice);
-
-private:
-	void populateMenu(TDEPopupMenu* menu);
+protected:
+	void initMenus();
+	void mousePressEvent(TQMouseEvent *e);
+	void populateLMBMenu();
+	void resizeEvent(TQResizeEvent *);
 	void resizeTrayIcon();
+	void showEvent(TQShowEvent *);
 
-	bool m_popupUp;
-	KHelpMenu* m_help;
+	static bool isMonitoredDevice(TDEStorageDevice *sdevice);
+	static TQString getDeviceLabel(TDEStorageDevice *sdevice);
 
-	TQWidget* m_parent;
-	TDEPassivePopupStackContainer* m_hardwareNotifierContainer;
+	void addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int type, TDEActionMenu *actionMenu,
+	        int &actionMenuIdx);
+	void addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int type, int &actionMenuIdx);
 
-	TQStringMap m_mountMenuIndexMap;
-	TQStringMap m_unmountMenuIndexMap;
-	TDEPopupMenu* m_menu;
-	KSimpleConfig *r_config;
+	HwDeviceSystemTrayPrivate *d;
 };
 
 #endif
diff --git a/kcontrol/hwmanager/hwdevicetray_app.cpp b/kcontrol/hwmanager/hwdevicetray_app.cpp
index 3f96f76a4..0928a399d 100644
--- a/kcontrol/hwmanager/hwdevicetray_app.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_app.cpp
@@ -17,6 +17,10 @@
  * License along with cryptocardwatcher. If not, see http://www.gnu.org/licenses/.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <kdebug.h>
 
 #include "hwdevicetray_app.h"
diff --git a/kcontrol/hwmanager/hwdevicetray_app.h b/kcontrol/hwmanager/hwdevicetray_app.h
index fae4d6cd9..8c4a4ae06 100644
--- a/kcontrol/hwmanager/hwdevicetray_app.h
+++ b/kcontrol/hwmanager/hwdevicetray_app.h
@@ -27,7 +27,7 @@ class HwDeviceSystemTray;
 
 class HwDeviceApp : public KUniqueApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 		HwDeviceApp();
diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
index 08145cb9e..09974ac68 100644
--- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) by Andrew Stanley-Jones
 
@@ -19,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/hwdevicetray_configdialog.h b/kcontrol/hwmanager/hwdevicetray_configdialog.h
index 657b3ee43..823931757 100644
--- a/kcontrol/hwmanager/hwdevicetray_configdialog.h
+++ b/kcontrol/hwmanager/hwdevicetray_configdialog.h
@@ -42,7 +42,7 @@ class ConfigDialog;
 
 class ConfigDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 		ConfigDialog(TDEGlobalAccel *accel, bool isApplet );
diff --git a/kcontrol/hwmanager/hwdevicetray_main.cpp b/kcontrol/hwmanager/hwdevicetray_main.cpp
index dc0704d57..0584c92fd 100644
--- a/kcontrol/hwmanager/hwdevicetray_main.cpp
+++ b/kcontrol/hwmanager/hwdevicetray_main.cpp
@@ -36,8 +36,13 @@ static const TDECmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-	TDEAboutData aboutData("hwdevicetray", I18N_NOOP("Device Monitor"), hwdevicetrayVersion, I18N_NOOP("Device Monitor Tray Application\n\nAllows you not only to get informations about hardware changes on your system,\nbut also to open and eject storage devices if possible."), TDEAboutData::License_GPL_V3,
-	"(c) 2015 Timothy Pearson\n(c) 2019 The Trinity Desktop Project", 0L, "");
+	TDEAboutData aboutData("hwdevicetray", I18N_NOOP("Device Monitor"), hwdevicetrayVersion,
+	I18N_NOOP("Device Monitor Tray Application\n\n"
+	          "Allows you not only to get informations about hardware changes on your system,\n"
+	          "but also to open and eject storage devices if possible."),
+	TDEAboutData::License_GPL_V3,
+	I18N_NOOP("(c) 2015 Timothy Pearson\n"
+              "(c) 2019 The Trinity Desktop Project"), 0L, "");
 	aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Initial developer and maintainer"), "kb9vqf@pearsoncomputing.net");
 	aboutData.setProductName("hwdevices/hwdevicetray");
 	TDEGlobal::locale()->setMainCatalogue("tdehwdevicetray");
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp
index 3258453d0..97251cb89 100644
--- a/kcontrol/hwmanager/hwmanager.cpp
+++ b/kcontrol/hwmanager/hwmanager.cpp
@@ -23,6 +23,7 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
+#include <tqtimer.h>
 
 #include <dcopclient.h>
 
@@ -71,10 +72,13 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
 	systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" ));
 
 	TDEAboutData *about =
-	new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Device Manager\n\nCan be used to get all kind of informations about your devices on your system, shows which drivers are used by them and allows to change device settings."),
-		0, 0, TDEAboutData::License_GPL,
-		I18N_NOOP("(c) 2012 Timothy Pearson\n(c) 2019 The Trinity Desktop Project"));
-	
+	new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Device Manager"), 0,
+	I18N_NOOP("Device Manager\n\n"
+	          "Can be used to get all kind of informations about your devices on your system,\n"
+	          "shows which drivers are used by them and allows to change device settings."),
+	TDEAboutData::License_GPL,
+	I18N_NOOP("(c) 2012 Timothy Pearson\n"
+	          "(c) 2019 The Trinity Desktop Project"));
 	about->addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net");
 	setAboutData( about );
 
@@ -83,18 +87,19 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
 
 	base->deviceFilter->setListView(base->deviceTree);
 
+	deviceUpdateScheduled = false;
+
 	setRootOnlyMsg(i18n("<b>Device settings are system wide, and therefore require administrator access</b><br>To alter the system's device settings, click on the \"Administrator Mode\" button below."));
 	setUseRootOnlyMsg(true);
 
 	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(populateTreeView()));
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView()));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate()));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate()));
 
 	load();
 
@@ -103,6 +108,7 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis
 
 TDEHWManager::~TDEHWManager()
 {
+	TDEGlobal::hardwareDevices()->setTriggerlessHardwareUpdatesEnabled(false);
 	delete config;
 	delete systemconfig;
 }
@@ -127,8 +133,19 @@ void TDEHWManager::defaults()
 	load( true );
 }
 
+void TDEHWManager::scheduleDeviceUpdate()
+{
+	if (!deviceUpdateScheduled)
+	{
+		deviceUpdateScheduled = true;
+		TQTimer::singleShot(1000, this, TQ_SLOT(populateTreeView()));
+	}
+}
+
 void TDEHWManager::populateTreeView()
 {
+	deviceUpdateScheduled = false;
+
 	bool show_by_connection = base->showByConnection->isChecked();
 
 	// Figure out which device, if any, was selected
@@ -149,11 +166,11 @@ 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);
 			}
-			DeviceIconItem* item = new DeviceIconItem(base->deviceTree, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice);
+			DeviceIconItem* item = new DeviceIconItem(base->deviceTree, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice->uniqueID());
 			if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {
 				base->deviceTree->ensureItemVisible(item);
 				base->deviceTree->setSelected(item, true);
@@ -165,17 +182,17 @@ void TDEHWManager::populateTreeView()
 		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 		for (int i=0;i<=TDEGenericDeviceType::Last;i++) {
 			if (i != TDEGenericDeviceType::Root) {
-				DeviceIconItem* rootitem = new DeviceIconItem(base->deviceTree, hwdevices->getFriendlyDeviceTypeStringFromType((TDEGenericDeviceType::TDEGenericDeviceType)i), hwdevices->getDeviceTypeIconFromType((TDEGenericDeviceType::TDEGenericDeviceType)i, base->deviceTree->iconSize()), 0);
+				DeviceIconItem* rootitem = new DeviceIconItem(base->deviceTree, hwdevices->getFriendlyDeviceTypeStringFromType((TDEGenericDeviceType::TDEGenericDeviceType)i), hwdevices->getDeviceTypeIconFromType((TDEGenericDeviceType::TDEGenericDeviceType)i, base->deviceTree->iconSize()), TQString::null);
 				TDEGenericDevice *hwdevice;
 				TDEGenericHardwareList hwlist = hwdevices->listByDeviceClass((TDEGenericDeviceType::TDEGenericDeviceType)i);
 				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);
 					}
-					DeviceIconItem* item = new DeviceIconItem(rootitem, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice);
+					DeviceIconItem* item = new DeviceIconItem(rootitem, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice->uniqueID());
 					if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {
 						base->deviceTree->ensureItemVisible(item);
 						base->deviceTree->setSelected(item, true);
@@ -194,12 +211,12 @@ 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);
 			}
 			if (hwdevice->parentDevice() == parent->device()) {
-				DeviceIconItem* item = new DeviceIconItem(parent, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice);
+				DeviceIconItem* item = new DeviceIconItem(parent, hwdevice->detailedFriendlyName(), hwdevice->icon(base->deviceTree->iconSize()), hwdevice->uniqueID());
 				if ((!selected_syspath.isNull()) && (hwdevice->systemPath() == selected_syspath)) {
 					base->deviceTree->ensureItemVisible(item);
 					base->deviceTree->setSelected(item, true);
@@ -210,24 +227,6 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con
 	}
 }
 
-void TDEHWManager::deviceChanged(TDEGenericDevice* device) {
-	TQListViewItemIterator it(base->deviceTree);
-	while (it.current()) {
-		DeviceIconItem* item = dynamic_cast<DeviceIconItem*>(it.current());
-		if (item) {
-			TDEGenericDevice* candidate = item->device();
-			if (candidate) {
-				if (candidate->systemPath() == device->systemPath()) {
-					if (item->text(0) != device->detailedFriendlyName()) {
-						item->setText(0, device->detailedFriendlyName());
-					}
-				}
-			}
-		}
-		++it;
-	}
-}
-
 void TDEHWManager::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) {
 	TQString password;
 	int result = KPasswordDialog::getPassword(password, prompt);
diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h
index abc05fa54..020a51f22 100644
--- a/kcontrol/hwmanager/hwmanager.h
+++ b/kcontrol/hwmanager/hwmanager.h
@@ -41,7 +41,7 @@ class TDEListViewItem;
 class TDEHWManager : public TDECModule, public DCOPObject
 {
 	K_DCOP
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	//TDEHWManager(TQWidget *parent = 0L, const char *name = 0L);
@@ -58,15 +58,15 @@ public:
 k_dcop:
 
 private slots:
+	void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice);
 	void populateTreeView();
 	void populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath);
-	void deviceChanged(TDEGenericDevice*);
-	void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice);
+	void scheduleDeviceUpdate();
 
 private:
 	TDEHWManagerBase *base;
-
 	TDEConfig *config;
+	bool deviceUpdateScheduled;
 };
 
 #endif
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
new file mode 100644
index 000000000..22b82648f
--- /dev/null
+++ b/kcontrol/hwmanager/passworddlg.cpp
@@ -0,0 +1,66 @@
+/*  This file is part of the KDE project
+ *  Copyright (C) 2007  Jan Klötzke <jan kloetzke at freenet de>
+ *
+ *  Based on kryptomedia- Another KDE cryto media application.
+ *  Copyright (C) 2006  Daniel Gollub <dgollub@suse.de>
+ *
+ *  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 "passworddlg.h"
+
+PasswordDlg::PasswordDlg() :
+        KDialogBase(NULL, "PasswordDlg", true, i18n("Unlock Storage Device"), (Cancel|User1),
+        User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
+{
+	unlockDialog = new UnlockDialog(this);
+	enableButton( User1, false );
+	unlockDialog->encryptedIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("drive-harddisk-locked",
+				  TDEIcon::NoGroup, TDEIcon::SizeLarge));
+	connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &)));
+
+	setMainWidget(unlockDialog);
+}
+
+PasswordDlg::~PasswordDlg()
+{
+	delete unlockDialog;
+}
+
+void PasswordDlg::setDevice(TQString deviceName)
+{
+	unlockDialog->descLabel->setText("<p><b>" + deviceName + "</b> is an encrypted storage device.</p>"
+	        "<p>Please enter the password to unlock the storage device.</p>");
+	unlockDialog->descLabel->adjustSize();
+	unlockDialog->adjustSize();
+}
+
+void PasswordDlg::clearPassword()
+{
+	unlockDialog->passwordEdit->setText(TQString::null);
+}
+
+TQString PasswordDlg::getPassword()
+{
+	return unlockDialog->passwordEdit->text();
+}
+
+void PasswordDlg::slotPasswordChanged(const TQString &text)
+{
+	enableButton( User1, !text.isEmpty() );
+}
+
+#include "passworddlg.moc"
diff --git a/kcontrol/hwmanager/passworddlg.h b/kcontrol/hwmanager/passworddlg.h
new file mode 100644
index 000000000..091b5aa5f
--- /dev/null
+++ b/kcontrol/hwmanager/passworddlg.h
@@ -0,0 +1,62 @@
+/*  This file is part of the KDE project
+ *  Copyright (C) 2007  Jan Klötzke <jan kloetzke at freenet de>
+ *
+ *  Based on kryptomedia- Another KDE cryto media application.
+ *  Copyright (C) 2006  Daniel Gollub <dgollub@suse.de>
+ *
+ *  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 DIALOG_H_
+#define DIALOG_H_
+
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
+#include <kdebug.h>
+#include <kdialogbase.h>
+#include <kiconloader.h>
+
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqgroupbox.h>
+
+#include "unlockdialog.h"
+
+class PasswordDlg : public KDialogBase
+{
+
+	TQ_OBJECT
+
+public:
+	PasswordDlg();
+	~PasswordDlg();
+
+	void setDevice(TQString deviceName);
+	void clearPassword();
+	TQString getPassword();
+
+	int index;
+
+public slots:
+	void slotPasswordChanged(const TQString &text);
+
+private:
+	UnlockDialog *unlockDialog;
+};
+
+#endif // DIALOG_H_
+
diff --git a/kcontrol/hwmanager/unlockdialog.ui b/kcontrol/hwmanager/unlockdialog.ui
new file mode 100644
index 000000000..576de07a4
--- /dev/null
+++ b/kcontrol/hwmanager/unlockdialog.ui
@@ -0,0 +1,160 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>UnlockDialog</class>
+<widget class="TQWidget">
+    <property name="name">
+        <cstring>UnlockDialog</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>207</width>
+            <height>172</height>
+        </rect>
+    </property>
+    <property name="sizePolicy">
+        <sizepolicy>
+            <hsizetype>5</hsizetype>
+            <vsizetype>3</vsizetype>
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+        </sizepolicy>
+    </property>
+    <property name="caption">
+        <string>Decrypting Storage Device</string>
+    </property>
+    <grid>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <widget class="TQLayoutWidget" row="0" column="0">
+            <property name="name">
+                <cstring>layout5</cstring>
+            </property>
+            <hbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="TQLayoutWidget">
+                    <property name="name">
+                        <cstring>layout4</cstring>
+                    </property>
+                    <vbox>
+                        <property name="name">
+                            <cstring>unnamed</cstring>
+                        </property>
+                        <widget class="TQLabel">
+                            <property name="name">
+                                <cstring>encryptedIcon</cstring>
+                            </property>
+                            <property name="sizePolicy">
+                                <sizepolicy>
+                                    <hsizetype>0</hsizetype>
+                                    <vsizetype>0</vsizetype>
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                            <property name="minimumSize">
+                                <size>
+                                    <width>48</width>
+                                    <height>48</height>
+                                </size>
+                            </property>
+                            <property name="maximumSize">
+                                <size>
+                                    <width>32</width>
+                                    <height>32</height>
+                                </size>
+                            </property>
+                            <property name="scaledContents">
+                                <bool>true</bool>
+                            </property>
+                            <property name="alignment">
+                                <set>AlignTop</set>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property name="name">
+                                <cstring>spacer2_2</cstring>
+                            </property>
+                            <property name="orientation">
+                                <enum>Vertical</enum>
+                            </property>
+                            <property name="sizeType">
+                                <enum>Expanding</enum>
+                            </property>
+                            <property name="sizeHint">
+                                <size>
+                                    <width>31</width>
+                                    <height>41</height>
+                                </size>
+                            </property>
+                        </spacer>
+                    </vbox>
+                </widget>
+                <widget class="TQLabel">
+                    <property name="name">
+                        <cstring>descLabel</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>3</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <property name="text">
+                        <string>Dummy placeholder</string>
+                    </property>
+                    <property name="alignment">
+                        <set>WordBreak|AlignTop</set>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget class="TQLayoutWidget" row="1" column="0">
+            <property name="name">
+                <cstring>layout4</cstring>
+            </property>
+            <hbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
+                <widget class="TQLabel">
+                    <property name="name">
+                        <cstring>textLabel1</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Password:</string>
+                    </property>
+                    <property name="buddy" stdset="0">
+                        <cstring>passwordEdit</cstring>
+                    </property>
+                </widget>
+                <widget class="TQLineEdit">
+                    <property name="name">
+                        <cstring>passwordEdit</cstring>
+                    </property>
+                    <property name="enabled">
+                        <bool>true</bool>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>1</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <property name="echoMode">
+                        <enum>Password</enum>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+    </grid>
+</widget>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 2ca108e3f..218c3e615 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -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/iccconfig.h b/kcontrol/iccconfig/iccconfig.h
index 4fd29e4e9..d3681c5bb 100644
--- a/kcontrol/iccconfig/iccconfig.h
+++ b/kcontrol/iccconfig/iccconfig.h
@@ -38,7 +38,7 @@ class TDEListViewItem;
 class KICCConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 
 
 public:
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 56df77a51..57fe2669f 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kcmdisplay.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
@@ -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);
@@ -81,27 +81,27 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
     // Size
     TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
     lbl->setFixedSize(lbl->sizeHint());
-    grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
+    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, Qt::AlignLeft);
+    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)));
-    grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, Qt::AlignLeft);
+    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)));
-    grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, Qt::AlignLeft);
+    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)));
-    grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, Qt::AlignLeft);
+    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)));
-    grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, Qt::AlignLeft);
+    connect(mpActiveEffectCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveEffect(bool)));
+    grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, TQt::AlignLeft);
 
     top->activate();
 
@@ -123,13 +123,13 @@ TDEIconConfig::~TDEIconConfig()
 TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
 {
     TQLabel *lab = new TQLabel(str, parent);
-    lay->addWidget(lab, 1, i, Qt::AlignCenter);
+    lay->addWidget(lab, 1, i, TQt::AlignCenter);
     mpPreview[i] = new TQLabel(parent);
     mpPreview[i]->setAlignment(AlignCenter);
     mpPreview[i]->setMinimumSize(105, 105);
     lay->addWidget(mpPreview[i], 2, i);
     TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
-    lay->addWidget(push, 3, i, Qt::AlignCenter);
+    lay->addWidget(push, 3, i, TQt::AlignCenter);
     return push;
 }
 
@@ -689,7 +689,7 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
 
     lbl = new TQLabel(i18n("&Effect:"), page);
     lbl->setFixedSize(lbl->sizeHint());
-    top->addWidget(lbl, 0, 0, Qt::AlignLeft);
+    top->addWidget(lbl, 0, 0, TQt::AlignLeft);
     mpEffectBox = new TQListBox(page);
     mpEffectBox->insertItem(i18n("No Effect"));
     mpEffectBox->insertItem(i18n("To Gray"));
@@ -698,13 +698,13 @@ 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)));
-    top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, Qt::AlignLeft);
+    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)));
-    top->addWidget(mpSTCheck, 3, 0, Qt::AlignLeft);
+    connect(mpSTCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSTCheck(bool)));
+    top->addWidget(mpSTCheck, 3, 0, TQt::AlignLeft);
 
     frame = new TQGroupBox(i18n("Preview"), page);
     top->addMultiCellWidget(frame, 0, 1, 1, 1);
@@ -724,25 +724,25 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
 
     mpEffectLabel = new TQLabel(i18n("&Amount:"), mpEffectGroup);
     grid->addWidget(mpEffectLabel, 1, 0);
-    mpEffectSlider = new TQSlider(0, 100, 5, 10, Qt::Horizontal, mpEffectGroup);
+    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 1438a9f1a..3fe37a3a4 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kcmdisplay.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
@@ -55,7 +55,7 @@ struct Effect
  */
 class TDEIconConfig: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEIconConfig(TQWidget *parent, const char *name=0);
@@ -123,7 +123,7 @@ private:
 
 class TDEIconEffectSetupDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
      
 public:
     TDEIconEffectSetupDialog(const Effect &, const Effect &,
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 826f6300d..86d782a1b 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -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));
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index ccb914846..424d58630 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -32,7 +32,7 @@ class TQStringList;
 
 class IconThemesConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   IconThemesConfig(TQWidget *parent = 0L, const char *name = 0L);
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/icons/main.h b/kcontrol/icons/main.h
index 840704351..eea944b6b 100644
--- a/kcontrol/icons/main.h
+++ b/kcontrol/icons/main.h
@@ -31,7 +31,7 @@
 
 class IconModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   IconModule(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/info/CMakeLists.txt b/kcontrol/info/CMakeLists.txt
index dbedbfe4d..35064b574 100644
--- a/kcontrol/info/CMakeLists.txt
+++ b/kcontrol/info/CMakeLists.txt
@@ -39,10 +39,14 @@ tde_create_translated_desktop(
 )
 
 
+##### configure checks ##########################
+
+include( ConfigureChecks.cmake )
+
 ##### kcm_info (module) #########################
 
 tde_add_kpart( kcm_info AUTOMOC
   SOURCES main.cpp memory.cpp ${OPENGL_SOURCES}
-  LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES}
+  LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES} ${KSTAT_LIBRARIES} ${DEVINFO_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/info/ConfigureChecks.cmake b/kcontrol/info/ConfigureChecks.cmake
new file mode 100644
index 000000000..ec881f0f2
--- /dev/null
+++ b/kcontrol/info/ConfigureChecks.cmake
@@ -0,0 +1,21 @@
+#################################################
+#
+#  (C) 2023 DilOS Team
+#  denis (AT) tambov (DOT) ru
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+# devinfo
+check_library_exists( devinfo di_init "" HAVE_DEVINFO )
+if( HAVE_DEVINFO )
+  set( DEVINFO_LIBRARIES devinfo )
+else()
+  if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+    tde_message_fatal( "libdevinfo not found on SunOS platform!" )
+  endif()
+  set( DEVINFO_LIBRARIES "" )
+endif( )
diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp
index 9f2b17e1b..f6ab922ea 100644
--- a/kcontrol/info/info_solaris.cpp
+++ b/kcontrol/info/info_solaris.cpp
@@ -45,9 +45,9 @@ bool GetInfo_CPU( TQListView *lBox ) {
 	char		*ptr;
 	uint32_t	i, ncpus;
 	unsigned long	state_begin;
-	QString		state;
-	QString		mhz;
-	QString		inst;
+	TQString	state;
+	TQString	mhz;
+	TQString	inst;
 
 	/*
 	 *  get a kstat handle first and update the user's kstat chain
@@ -167,8 +167,8 @@ bool GetInfo_Partitions( TQListView *lBox ) {
 	struct mnttab	mnt;
 	struct statvfs	statbuf;
 	fsblkcnt_t	tmp;
-	QString		total;
-	QString		avail;
+	TQString	total;
+	TQString	avail;
 	time_t		mnttime;
 	char		*timetxt;
 	char		*ptr;
@@ -315,7 +315,7 @@ bool GetInfo_XServer_and_Video( TQListView *lBox ) {
  */
 TQListViewItem *mktree( TQListViewItem *top, const char *path ) {
 
-	QListViewItem	*parent,
+	TQListViewItem	*parent,
 			*previous,
 			*result;
 	char		*str = strdup( path ),
@@ -380,7 +380,7 @@ TQListViewItem *mktree( TQListViewItem *top, const char *path ) {
 /*
  *  prop_type_str()  -- return the property type as a string
  */
-char *prop_type_str( di_prop_t prop ) {
+const char *prop_type_str( di_prop_t prop ) {
 
 	switch( di_prop_type( prop )) {
 		case DI_PROP_TYPE_UNDEF_IT:
@@ -448,8 +448,8 @@ int prop_type_guess( uchar_t *data, int len ) {
  */
 int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) {
 
-	QListViewItem	*item;
-	QString		majmin;
+	TQListViewItem	*item;
+	TQString	majmin;
 	char		*type;
 	dev_t		dev;
 
@@ -466,7 +466,7 @@ int dump_minor_node( di_node_t node, di_minor_t minor, void *arg ) {
 		(type == NULL) ? "NULL" : type );
 
 	if( (dev = di_minor_devt( minor )) != DDI_DEV_T_NONE ) {
-		majmin.sprintf( "%ld/%ld", major( dev ), minor( dev ));
+		majmin.sprintf( "%u/%u", major( dev ), minor( dev ));
 		new TQListViewItem( item, i18n( "Major/Minor:" ), majmin );
 	}
 
@@ -486,7 +486,7 @@ TQString propvalue( di_prop_t prop ) {
 	char	*strp;
 	int	*intp;
 	uchar_t	*bytep;
-	QString	result;
+	TQString result;
 
 	/*
 	 *  Since a lot of printable strings seem to be tagged as 'byte',
@@ -562,14 +562,14 @@ TQString propvalue( di_prop_t prop ) {
  */
 int dump_node( di_node_t node, void *arg ) {
 
-	QListViewItem	*top = (TQListViewItem *) arg,
+	TQListViewItem	*top = (TQListViewItem *) arg,
 			*parent,
 			*previous;
-	char		*path;
-	char		*drivername;
-	char		*names;
-	QString		compatnames;
-	int		i, n;
+	char *path;
+	char *drivername;
+	char *names;
+	TQString compatnames;
+	int i, n;
 	di_prop_t	prop;
 
 	path = di_devfs_path( node );
@@ -641,7 +641,7 @@ int dump_node( di_node_t node, void *arg ) {
 			/*
 			 *  property type & value
 			 */
-			QListViewItem	*tmp,
+			TQListViewItem	*tmp,
 					*prev;
 			tmp = new TQListViewItem( previous, di_prop_name( prop ));
 			tmp->setExpandable( true );
@@ -668,7 +668,7 @@ int dump_node( di_node_t node, void *arg ) {
 
 bool GetInfo_Devices( TQListView *lBox ) {
 
-	QListViewItem		*top;
+	TQListViewItem		*top;
 	di_node_t		root_node;
 
 	/*
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 76d68d675..93da5ea20 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();
 }
diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h
index 6fd2cd093..7e6285dee 100644
--- a/kcontrol/info/memory.h
+++ b/kcontrol/info/memory.h
@@ -28,7 +28,7 @@ typedef unsigned long t_memsize;
 #define COLOR_FREE_MEMORY TQColor(127,255,212)
 
 class KMemoryWidget:public TDECModule {
-  Q_OBJECT 
+  TQ_OBJECT 
 	  
   public:
     KMemoryWidget(TQWidget * parent, const char *name = 0);
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/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 24b43d829..8e2f4ad43 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -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();
 }
@@ -208,5 +208,3 @@ void ThemePage::fixCursorFile()
 		p.start(TDEProcess::Block);
 	}
 }
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h
index d1060797a..5442e158c 100644
--- a/kcontrol/input/core/themepage.h
+++ b/kcontrol/input/core/themepage.h
@@ -26,7 +26,7 @@ class TQListViewItem;
 
 class ThemePage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
 	public:
@@ -54,5 +54,3 @@ class ThemePage : public TQWidget
 };
 
 #endif // __THEMEPAGE_H
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index 2798ce1de..78c37d717 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -70,8 +70,8 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
         updateResolution();
         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 );
@@ -100,12 +100,12 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
         // 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() ) );
+            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 );
 }
 
diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h
index e50838b72..8c919a601 100644
--- a/kcontrol/input/logitechmouse.h
+++ b/kcontrol/input/logitechmouse.h
@@ -46,7 +46,7 @@
 
 class LogitechMouse : public LogitechMouseBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 0d07e782e..84ec2d263 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -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,16 +149,16 @@ 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];
@@ -172,12 +172,12 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
       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()));
+    connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
+    connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotScrollPolarityChanged()));
 
     // 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 +191,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 +210,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 +231,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 +245,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 +268,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 +280,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 +292,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 +306,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 +366,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();
 }
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index 6d035b8d1..7db5fbf91 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -85,14 +85,13 @@ public:
  bool reverseScrollPolarity;
 
  #ifdef HAVE_LIBUSB
- // TODO: In Qt4, replace with a better container.
  TQPtrList <LogitechMouse> logitechMouseList;
  #endif
 };
 
 class MouseConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MouseConfig(TQWidget *parent=0, const char* name=0);
   ~MouseConfig();
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index 2f0ea6edc..324bb2aeb 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -348,6 +348,3 @@ void PreviewWidget::mouseMoveEvent( TQMouseEvent *e )
 		current = pos;
 	}
 }
-
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/previewwidget.h b/kcontrol/input/xcursor/previewwidget.h
index a6412a907..26ed17bb1 100644
--- a/kcontrol/input/xcursor/previewwidget.h
+++ b/kcontrol/input/xcursor/previewwidget.h
@@ -43,5 +43,3 @@ class PreviewWidget : public TQWidget
 
 
 #endif
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index cdffbd1bd..e575b6cd2 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -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";
@@ -580,7 +580,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		// Calculate the image size
 		int size = kMax( iconSize, kMax( r.width(), r.height() ) );
 
-		// Create the intermediate QImage
+		// Create the intermediate TQImage
 		TQImage image( size, size, 32 );
 		image.setAlphaBuffer( true );
 
@@ -621,7 +621,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 
 		// Scale down the image if we need to
 		if ( image.width() > iconSize || image.height() > iconSize )
-			image = image.smoothScale( iconSize, iconSize, TQ_ScaleMin );
+			image = image.smoothScale( iconSize, iconSize, TQImage::ScaleMin );
 
 		pix.convertFromImage( image );
 		XcursorImageDestroy( xcur );
@@ -639,6 +639,3 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 
 	return pix;
 }
-
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/input/xcursor/themepage.h b/kcontrol/input/xcursor/themepage.h
index 22bca16db..bc284aa48 100644
--- a/kcontrol/input/xcursor/themepage.h
+++ b/kcontrol/input/xcursor/themepage.h
@@ -34,7 +34,7 @@ struct ThemeInfo;
 
 class ThemePage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ThemePage( TQWidget* parent = 0, const char* name = 0 );
@@ -72,5 +72,3 @@ class ThemePage : public TQWidget
 };
 
 #endif // __THEMEPAGE_H
-
-// vim: set noet ts=4 sw=4:
diff --git a/kcontrol/joystick/caldialog.h b/kcontrol/joystick/caldialog.h
index 202296f2b..519e98526 100644
--- a/kcontrol/joystick/caldialog.h
+++ b/kcontrol/joystick/caldialog.h
@@ -31,7 +31,7 @@ class JoyDevice;
 
 class CalDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     CalDialog(TQWidget *parent, JoyDevice *joy);
diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h
index 8ef9e966e..233656537 100644
--- a/kcontrol/joystick/joystick.h
+++ b/kcontrol/joystick/joystick.h
@@ -27,7 +27,7 @@ class JoyWidget;
 
 class joystick: public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     joystick(TQWidget *parent = 0, const char *name = 0, const TQStringList &list = TQStringList());
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/joystick/joywidget.h b/kcontrol/joystick/joywidget.h
index 45291d275..057a8bd9e 100644
--- a/kcontrol/joystick/joywidget.h
+++ b/kcontrol/joystick/joywidget.h
@@ -37,7 +37,7 @@ class TQHBox;
 // the widget which displays all buttons, values, etc.
 class JoyWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     JoyWidget(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/joystick/poswidget.cpp b/kcontrol/joystick/poswidget.cpp
index af8609070..5eb249f58 100644
--- a/kcontrol/joystick/poswidget.cpp
+++ b/kcontrol/joystick/poswidget.cpp
@@ -32,7 +32,7 @@ PosWidget::PosWidget(TQWidget *parent, const char *name)
 {
   setMinimumSize(XY_WIDTH, XY_WIDTH);
   setMaximumSize(XY_WIDTH, XY_WIDTH);
-  setPaletteBackgroundColor(Qt::white);
+  setPaletteBackgroundColor(TQt::white);
 }
 
 //-----------------------------------------------------------------
@@ -42,7 +42,7 @@ void PosWidget::paintEvent(TQPaintEvent *)
   TQPainter paint(this);
 
   paint.drawRect(0, 0, width(), height());
-  paint.setPen(Qt::gray);
+  paint.setPen(TQt::gray);
 
   // draw a center grid
   paint.drawLine(XY_WIDTH/2, 1,
@@ -52,7 +52,7 @@ void PosWidget::paintEvent(TQPaintEvent *)
                  XY_WIDTH - 2, XY_WIDTH/2);
 
   // draw the current position marker
-  paint.setPen(Qt::blue);
+  paint.setPen(TQt::blue);
 
   paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2,
                  x + MARK_WIDTH/2, y + MARK_WIDTH/2);
@@ -111,7 +111,7 @@ void PosWidget::eraseOld()
   //paint.eraseRect(x - MARK_WIDTH/2, y - MARK_WIDTH/2, MARK_WIDTH + 1, MARK_WIDTH + 1);
 
   // erase previous cross (don't use eraseRect() so that trace flags will be not destroyed so much)
-  paint.setPen(Qt::white);
+  paint.setPen(TQt::white);
 
   paint.drawLine(x - MARK_WIDTH/2, y - MARK_WIDTH/2,
                  x + MARK_WIDTH/2, y + MARK_WIDTH/2);
@@ -121,7 +121,7 @@ void PosWidget::eraseOld()
 
   if ( trace )  // show previous position with a smaller black cross
   {
-    paint.setPen(Qt::black);
+    paint.setPen(TQt::black);
 
     paint.drawLine(x - 2, y - 2,
                    x + 2, y + 2);
diff --git a/kcontrol/joystick/poswidget.h b/kcontrol/joystick/poswidget.h
index 324ee1da2..3ee85a912 100644
--- a/kcontrol/joystick/poswidget.h
+++ b/kcontrol/joystick/poswidget.h
@@ -28,7 +28,7 @@
 */
 class PosWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     PosWidget(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kcontrol/about/kcontrol.css b/kcontrol/kcontrol/about/kcontrol.css
index dac9f05bf..9f888528e 100644
--- a/kcontrol/kcontrol/about/kcontrol.css
+++ b/kcontrol/kcontrol/about/kcontrol.css
@@ -48,6 +48,3 @@
 .kcm_link {
   color: #000;
 }
-
-/* vim:set sw=2 et nocindent smartindent: */
-
diff --git a/kcontrol/kcontrol/about/main.html b/kcontrol/kcontrol/about/main.html
index 23343ddda..90e88570f 100644
--- a/kcontrol/kcontrol/about/main.html
+++ b/kcontrol/kcontrol/about/main.html
@@ -62,4 +62,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index c1ba4fecf..485f11442 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -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();
 }
 
diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h
index 97ba32ffd..5d4543b39 100644
--- a/kcontrol/kcontrol/aboutwidget.h
+++ b/kcontrol/kcontrol/aboutwidget.h
@@ -33,7 +33,7 @@ class KURL;
 
 class AboutWidget : public TQHBox
 {  
-  Q_OBJECT    
+  TQ_OBJECT    
   
 public:   
   AboutWidget(TQWidget *parent, const char *name=0, TQListViewItem* category=0, const TQString &caption=TQString::null);
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index dd1835e9d..67584a74d 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -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 );
 }
 
@@ -163,17 +163,17 @@ void DockContainer::setBaseWidget(TQWidget *widget)
 
 ProxyWidget* DockContainer::loadModule( ConfigModule *module )
 {
-  TQApplication::setOverrideCursor( tqwaitCursor );
+  TQApplication::setOverrideCursor( TQt::waitCursor );
 
   ProxyWidget *widget = _modulew->load( 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());
diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h
index ea62495bd..7246691e6 100644
--- a/kcontrol/kcontrol/dockcontainer.h
+++ b/kcontrol/kcontrol/dockcontainer.h
@@ -30,7 +30,7 @@ class TQLabel;
 
 class ModuleWidget : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ModuleWidget( TQWidget *parent, const char *name );
@@ -48,7 +48,7 @@ class ModuleWidget : public TQVBox
 
 class DockContainer : public TQWidgetStack
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   DockContainer(TQWidget *parent=0);
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index ca80619e5..b17581846 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -105,7 +105,7 @@ TQString KCGlobal::baseGroup()
 
 void KCGlobal::repairAccels( TQWidget * tw )
 {
-    TQObjectList * l = tw->queryList( TQACCEL_OBJECT_NAME_STRING );
+    TQObjectList * l = tw->queryList( "TQAccel" );
     TQObjectListIt it( *l );             // iterate over the buttons
     TQObject * obj;
     while ( (obj=it.current()) != 0 ) { // for each found object...
diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp
index 92b9cf0a0..293c5e1d8 100644
--- a/kcontrol/kcontrol/indexwidget.cpp
+++ b/kcontrol/kcontrol/indexwidget.cpp
@@ -60,7 +60,7 @@ void IndexWidget::resizeEvent(TQResizeEvent *e)
 
 void IndexWidget::moduleSelected(ConfigModule *m)
 {
-  const TQObject *obj = TQT_TQOBJECT_CONST(sender());
+  const TQObject *obj = sender();
   if(!m) return;
 
   emit moduleActivated(m);
@@ -69,19 +69,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 +89,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 +121,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 +132,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/indexwidget.h b/kcontrol/kcontrol/indexwidget.h
index 6471e0ec3..a373aafce 100644
--- a/kcontrol/kcontrol/indexwidget.h
+++ b/kcontrol/kcontrol/indexwidget.h
@@ -31,7 +31,7 @@ class ModuleIconView;
 
 class IndexWidget : public TQWidgetStack
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:   
   IndexWidget(ConfigModuleList *list, TQWidget *parent, const char *name=0);
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 25ab4fc4a..aa5227532 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -59,10 +59,10 @@ KControlApp::KControlApp()
   TDEGlobal::setActiveInstance(this);
 
   // KUniqueApplication does dcop regitration for us
-  ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface");
+  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();
diff --git a/kcontrol/kcontrol/main.h b/kcontrol/kcontrol/main.h
index 783e10001..aaeabbe15 100644
--- a/kcontrol/kcontrol/main.h
+++ b/kcontrol/kcontrol/main.h
@@ -27,7 +27,7 @@ class TopLevel;
 
 class KControlApp : public KUniqueApplication
 {
-  Q_OBJECT 
+  TQ_OBJECT 
 
 public:
   KControlApp();
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/moduleIface.h b/kcontrol/kcontrol/moduleIface.h
index 17b4b07ad..00f2d0d39 100644
--- a/kcontrol/kcontrol/moduleIface.h
+++ b/kcontrol/kcontrol/moduleIface.h
@@ -28,7 +28,7 @@
 
 class ModuleIface : public TQObject, public DCOPObject {
 
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 
 public:
diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp
index 45be8a1ac..7c171f676 100644
--- a/kcontrol/kcontrol/moduleiconview.cpp
+++ b/kcontrol/kcontrol/moduleiconview.cpp
@@ -51,8 +51,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)
diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h
index 12cb14d73..daaeaa7ea 100644
--- a/kcontrol/kcontrol/moduleiconview.h
+++ b/kcontrol/kcontrol/moduleiconview.h
@@ -56,7 +56,7 @@ private:
 
 class ModuleIconView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ModuleIconView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index f203e6b57..2d1af0879 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -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/modulemenu.h b/kcontrol/kcontrol/modulemenu.h
index 9ce39b584..890a2d857 100644
--- a/kcontrol/kcontrol/modulemenu.h
+++ b/kcontrol/kcontrol/modulemenu.h
@@ -40,7 +40,7 @@ class ConfigModuleList;
 
 class ModuleMenu : public TDEPopupMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ModuleMenu(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index e40d62568..c419e0d4e 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -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;
     }
@@ -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) )
       {
diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index 63ddee668..16751831e 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -38,7 +38,7 @@ class TQWidgetStack;
 
 class ConfigModule : public TQObject, public TDECModuleInfo
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -124,7 +124,7 @@ protected:
 
 class KControlEmbed : public QXEmbed
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KControlEmbed( TQWidget* w ) : QXEmbed( w ) {}
         virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); }
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index fd0bda8aa..a226cbc89 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -85,8 +85,8 @@ 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()
@@ -340,7 +340,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
     if (offset > 0)
     {
       TQPixmap pixmap(offset, offset);
-      pixmap.fill(Qt::color0);
+      pixmap.fill(TQt::color0);
       pixmap.setMask(pixmap.createHeuristicMask());
       TQBitmap mask( pixmap.size(), true );
       pixmap.setMask( mask );
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index 271214c98..ad21d8715 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -66,7 +66,7 @@ private:
 
 class ModuleTreeView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ModuleTreeView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0);
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index b00741751..05040b3dd 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -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());
@@ -256,12 +256,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 
 ProxyWidget::~ProxyWidget()
 {
-#ifdef USE_QT4
-  #warning Possible memory leak in ProxyWidget::~ProxyWidget()
-#else // USE_QT4
   if (_client) delete _client;
   _client = 0;
-#endif // USE_QT4
 }
 
 TQString ProxyWidget::quickHelp() const
@@ -340,5 +336,3 @@ const TDEAboutData *ProxyWidget::aboutData() const
 {
   return _client->aboutData();
 }
-
-// vim: sw=2 sts=2 et
diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h
index 804803c51..95d8a597d 100644
--- a/kcontrol/kcontrol/proxywidget.h
+++ b/kcontrol/kcontrol/proxywidget.h
@@ -38,7 +38,7 @@ class ProxyView;
 
 class ProxyWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp
index 995d162e3..663a8744c 100644
--- a/kcontrol/kcontrol/searchwidget.cpp
+++ b/kcontrol/kcontrol/searchwidget.cpp
@@ -20,7 +20,6 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <tqsortedlist.h>
 #include <tqregexp.h>
 
 #include <klineedit.h>
@@ -88,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/searchwidget.h b/kcontrol/kcontrol/searchwidget.h
index 2e6306bbc..d0f850218 100644
--- a/kcontrol/kcontrol/searchwidget.h
+++ b/kcontrol/kcontrol/searchwidget.h
@@ -50,7 +50,7 @@ class KeywordListEntry
 
 class SearchWidget : public TQWidget
 {  
-  Q_OBJECT    
+  TQ_OBJECT    
   
 public:   
   SearchWidget(TQWidget *parent, const char *name=0);
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 519ec91df..d3b2a3c2f 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -81,12 +81,12 @@ 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
-  _splitter = new TQSplitter( Qt::Horizontal, this );
+  _splitter = new TQSplitter( TQt::Horizontal, this );
 
   TQFrame* leftFrame = new TQFrame ( _splitter );
   TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame );
@@ -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,40 @@ 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");
+  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 +275,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()
@@ -399,8 +399,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 +495,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 39aa25090..8d2a84145 100644
--- a/kcontrol/kcontrol/toplevel.h
+++ b/kcontrol/kcontrol/toplevel.h
@@ -41,7 +41,7 @@ class ModuleTitle;
 
 class TopLevel : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TopLevel( const char* name=0 );
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index f6fcd2e5a..bbae08ad6 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -96,16 +96,16 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	_lvStartup->setAllColumnsShowFocus(true);
 	_lvStartup->header()->setStretchEnabled(true, 2);
 
-	KButtonBox *buttonBox = new KButtonBox( gb, Qt::Horizontal);
+	KButtonBox *buttonBox = new KButtonBox( gb, TQt::Horizontal);
 	_pbStart = buttonBox->addButton( i18n("Start"));
 	_pbStop = buttonBox->addButton( i18n("Stop"));
 
 	_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();
 }
@@ -161,7 +161,7 @@ void KDEDConfig::load( bool useDefaults ) {
 
 			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());
@@ -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()));
 }
 
 
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 6dff072ea..eaffa3808 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -30,7 +30,7 @@ class TQPushButton;
 
 class KDEDConfig : public TDECModule
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KDEDConfig(TQWidget* parent, const char* name= 0L, const TQStringList& foo = TQStringList());
 	~KDEDConfig() {};
@@ -64,7 +64,7 @@ private:
 
 class CheckListItem : public TQObject, public TQCheckListItem
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CheckListItem(TQListView* parent, const TQString &text);
 	~CheckListItem() { }
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/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h
index 54be5345b..9cb328f15 100644
--- a/kcontrol/keys/commandShortcuts.h
+++ b/kcontrol/keys/commandShortcuts.h
@@ -37,7 +37,7 @@ typedef TQPtrListIterator<AppTreeItem> treeItemListIterator;
 
 class CommandShortcutsModule : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         CommandShortcutsModule( TQWidget *parent = 0, const char *name = 0 );
         ~CommandShortcutsModule();
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index ee39447a1..90fa59f82 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -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() ) );
+  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();
 
@@ -356,8 +356,8 @@ void KKeyModule::readScheme( int index )
 
   } 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/");
@@ -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() );
 }*/
diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h
index f442a2c31..4da3f16b2 100644
--- a/kcontrol/keys/keyconfig.h
+++ b/kcontrol/keys/keyconfig.h
@@ -22,7 +22,7 @@ class KeyChooserSpec;
 
 class KKeyModule : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEAccelActions actions;
         //TDEAccelActions dict;
@@ -77,7 +77,7 @@ protected:
 
 class KeyChooserSpec : public KKeyChooser
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent,
                  bool bGlobal );
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index d002b667f..de0cc2dbc 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -75,16 +75,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()
@@ -181,9 +181,9 @@ extern "C"
 	kdDebug(125) << "KeyModule::init() - Load Included Bindings\n";
 // this should match the included files above
 #define NOSLOTS
-#define SHIFT Qt::SHIFT
-#define CTRL Qt::CTRL
-#define ALT Qt::ALT
+#define SHIFT TQt::SHIFT
+#define CTRL TQt::CTRL
+#define ALT TQt::ALT
 #include "../../klipper/klipperbindings.cpp"
 #include "../../twin/twinbindings.cpp"
 #define KICKER_ALL_BINDINGS
diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h
index 281b2d37a..1830438a9 100644
--- a/kcontrol/keys/main.h
+++ b/kcontrol/keys/main.h
@@ -33,7 +33,7 @@ class ModifiersModule;
 
 class KeyModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	KeyModule( TQWidget *parent, const char *name );
         ~KeyModule();
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 39dfb7010..bc182f944 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -172,7 +172,7 @@ void ModifiersModule::initGUI()
 	TQGridLayout* pLayoutTop = new TQGridLayout( this, 6, 2, KDialog::marginHint() );
 	pLayoutTop->setColStretch( 1, 1 );
 
-	TQGroupBox* pGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("TDE Modifiers"), this );
+	TQGroupBox* pGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("TDE Modifiers"), this );
 	pLayoutTop->addWidget( pGroup, 0, 0 );
 
 	TQLabel* plbl = new TQLabel( i18n("Modifier"), pGroup );
@@ -183,13 +183,13 @@ void ModifiersModule::initGUI()
 	plbl = new TQLabel( i18n("X11-Mod"), pGroup );
 	plbl->setFont( font );
 
-	new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Shift"), pGroup );
+	new TQLabel( i18n("TQAccel", "Shift"), pGroup );
 	new TQLabel( "shift", pGroup );
 
-	m_plblCtrl = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl"), pGroup );
+	m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup );
 	new TQLabel( "control", pGroup );
 
-	m_plblAlt = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt"), pGroup );
+	m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup );
 	new TQLabel( "mod1", pGroup );
 
 	m_plblWin = new TQLabel( i18n("Win"), pGroup );
@@ -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,13 +220,13 @@ 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 );
 
 	//------------------
 	pLayoutTop->addRowSpacing( 3, KDialog::spacingHint() * 3 );
 
-	pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this );
+	pGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("X Modifier Mapping"), this );
 	pLayoutTop->addWidget( pGroup, 4, 0 );
 
 	m_plstXMods = new TDEListView( pGroup );
@@ -286,8 +286,8 @@ void ModifiersModule::updateWidgets()
 		}
 		m_pchkMacSwap->setEnabled( true );
 	} else {
-		m_plblCtrl->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl") );
-		m_plblAlt->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt") );
+		m_plblCtrl->setText( i18n("TQAccel", "Ctrl") );
+		m_plblAlt->setText( i18n("TQAccel", "Alt") );
 		m_plblWin->setText( i18n("Win") );
 		m_pchkMacSwap->setEnabled( false );
 	}
diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h
index b600bfafb..64b73fa5b 100644
--- a/kcontrol/keys/modifiers.h
+++ b/kcontrol/keys/modifiers.h
@@ -10,7 +10,7 @@ class TDEListView;
 
 class ModifiersModule : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	ModifiersModule( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index e7f599dda..18f6803ab 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -139,21 +139,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 +168,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 +196,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();
@@ -404,7 +404,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/" );
 
@@ -434,7 +434,7 @@ 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();
 }
 
diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h
index c1f1b2822..2ffc0e68f 100644
--- a/kcontrol/keys/shortcuts.h
+++ b/kcontrol/keys/shortcuts.h
@@ -35,7 +35,7 @@
 
 class ShortcutsModule : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	ShortcutsModule( TQWidget *parent = 0, const char *name = 0 );
 	~ShortcutsModule();
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 36d0e3bf4..31879e2f2 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -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()
@@ -122,7 +122,7 @@ AppTreeView::~AppTreeView()
 
 void AppTreeView::fill()
 {
-    TQApplication::setOverrideCursor(Qt::WaitCursor);
+    TQApplication::setOverrideCursor(TQt::WaitCursor);
     clear();
     fillBranch(TQString::null, 0);
     TQApplication::restoreOverrideCursor();
diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h
index 4da6d2351..591658ffe 100644
--- a/kcontrol/keys/treeview.h
+++ b/kcontrol/keys/treeview.h
@@ -61,7 +61,7 @@ private:
 class AppTreeView : public TDEListView
 {
     friend class AppTreeItem;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AppTreeView(TQWidget *parent=0, const char *name=0);
     ~AppTreeView();
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index f2ba15680..dadb70f39 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->menubarPanelTransparent, TQ_SIGNAL(clicked()),
+            this, TQ_SLOT(changed()));
+    connect(m_advancedWidget->menubarPanelBlurred, 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();
 }
 
diff --git a/kcontrol/kicker/advancedDialog.h b/kcontrol/kicker/advancedDialog.h
index 12a2ef4bd..a0ffdff6d 100644
--- a/kcontrol/kicker/advancedDialog.h
+++ b/kcontrol/kicker/advancedDialog.h
@@ -26,7 +26,7 @@ class advancedKickerOptions;
 
 class advancedDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         advancedDialog(TQWidget* parent, const char* name);
diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui
index bcdfef2f8..05549de36 100644
--- a/kcontrol/kicker/applettab.ui
+++ b/kcontrol/kicker/applettab.ui
@@ -217,11 +217,9 @@
     </vbox>
 </widget>
 <includes>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">qwidget.h</include>
+    <include location="local"  impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>qwidget.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index c2f488550..7c5436b52 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -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/applettab_impl.h b/kcontrol/kicker/applettab_impl.h
index a92e166d6..14a082c17 100644
--- a/kcontrol/kicker/applettab_impl.h
+++ b/kcontrol/kicker/applettab_impl.h
@@ -33,7 +33,7 @@ class TQListViewItem;
 
 class AppletTab : public AppletTabBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   AppletTab( TQWidget *parent=0, const char* name=0 );
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/hidingconfig.h b/kcontrol/kicker/hidingconfig.h
index 1a6e22472..427201c62 100644
--- a/kcontrol/kicker/hidingconfig.h
+++ b/kcontrol/kicker/hidingconfig.h
@@ -24,7 +24,7 @@ class HidingTab;
 
 class HidingConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     HidingConfig(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index 542d66bd2..b0a9088cb 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -762,14 +762,11 @@
 <includes>
     <include location="global" impldecl="in declaration">klineedit.h</include>
     <include location="global" impldecl="in implementation">knuminput.h</include>
-    <include location="local" impldecl="in implementation">kdialog.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"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-</includehints>
 </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/hidingtab_impl.h b/kcontrol/kicker/hidingtab_impl.h
index 34bc6a372..f5cd67ed1 100644
--- a/kcontrol/kicker/hidingtab_impl.h
+++ b/kcontrol/kicker/hidingtab_impl.h
@@ -26,7 +26,7 @@ class ExtensionInfo;
 
 class HidingTab : public HidingTabBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     HidingTab(TQWidget *parent = 0, const char* name = 0);
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/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h
index ff8a55b38..f35a33f45 100644
--- a/kcontrol/kicker/lookandfeelconfig.h
+++ b/kcontrol/kicker/lookandfeelconfig.h
@@ -24,7 +24,7 @@ class LookAndFeelTab;
 
 class LookAndFeelConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LookAndFeelConfig(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 7938f5f6c..fcc746f57 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -617,20 +617,18 @@ This option is only active if 'Enable background image' is selected.</string>
     <tabstop>advancedOptionsButton</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="global" impldecl="in declaration">kcombobox.h</include>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <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"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp
index 674b1cd04..858cc2cb3 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.cpp
+++ b/kcontrol/kicker/lookandfeeltab_impl.cpp
@@ -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_impl.h b/kcontrol/kicker/lookandfeeltab_impl.h
index 704a359db..49c366dfe 100644
--- a/kcontrol/kicker/lookandfeeltab_impl.h
+++ b/kcontrol/kicker/lookandfeeltab_impl.h
@@ -28,7 +28,7 @@ class advancedDialog;
 
 class LookAndFeelTab : public LookAndFeelTabBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LookAndFeelTab(TQWidget *parent = 0, const char* name = 0);
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/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h
index 32a89b4f8..54df41784 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.h
+++ b/kcontrol/kicker/lookandfeeltab_kcm.h
@@ -24,7 +24,7 @@ class LookAndFeelTab;
 
 class LookAndFeelConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LookAndFeelConfig(TQWidget *parent = 0L, const char *name = 0L);
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index da73da7c3..a0e14ba17 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -68,10 +68,10 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name)
                       "jumpToPanel(TQString)", false);
     kapp->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,7 +128,7 @@ 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();
 }
 
diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h
index 06bf2ec03..9b832ab38 100644
--- a/kcontrol/kicker/main.h
+++ b/kcontrol/kicker/main.h
@@ -29,7 +29,7 @@ class KDirWatch;
 
 class KickerConfig : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
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/menuconfig.h b/kcontrol/kicker/menuconfig.h
index a5fa29daf..373e1cbf8 100644
--- a/kcontrol/kicker/menuconfig.h
+++ b/kcontrol/kicker/menuconfig.h
@@ -24,7 +24,7 @@ class MenuTab;
 
 class MenuConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MenuConfig(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index fa3868004..17b0d89da 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -325,7 +325,7 @@
 						</property>
             <widget class="TQLabel" row="0" column="0">
               <property name="name">
-                <cstring>TextLabel1_3_3_2</cstring>
+                <cstring>TextLabel1_3_3_1</cstring>
               </property>
               <property name="sizePolicy">
                 <sizepolicy>
@@ -705,7 +705,40 @@
 							<string>&lt;qt&gt;When this option is selected a text-based search field will appear in the TDE Menu.&lt;/qt&gt;</string>
 						</property>
 					</widget>
-					<spacer row="0" column="1" rowspan="3" colspan="1">
+
+					<widget class="TQLayoutWidget" row="2" column="0">
+				        <property name="name">
+					<cstring>m_searchShortcutLayout</cstring>
+					</property>
+					<hbox>
+					        <property name="name">
+                 				        <cstring>unnamed</cstring>
+             					</property>
+
+						<widget class="TQLabel">
+                                                        <property name="name">
+                 					        <cstring>searchShortcutLabel</cstring>
+							</property>
+							<property name="text">
+                                                                <string>Search shortcut:</string>
+							</property>
+							<property name="whatsThis" stdset="0">
+							        <string>From here you can change the keyboard shortcut which triggers the search line in the TDE Menu.</string>
+							</property>
+						</widget>
+
+						<widget class="KKeyButton">
+                                                        <property name="name">
+                 					        <cstring>m_searchShortcut</cstring>
+							</property>
+							<property name="whatsThis" stdset="0">
+							        <string>From here you can change the keyboard shortcut which triggers the search line in the TDE Menu.</string>
+							</property>
+						</widget>
+					</hbox>
+					</widget>
+					    
+					<spacer row="0" column="1" rowspan="3" colspan="2">
 						<property name="name">
 							<cstring>Spacer8</cstring>
 						</property>
@@ -749,7 +782,46 @@
 		<include location="global" impldecl="in implementation">kpushbutton.h</include>
 		<include location="global" impldecl="in implementation">tdefontrequester.h</include>
 		<include location="global" impldecl="in implementation">tdelistview.h</include>
+		<include location="global" impldecl="in implementation">kkeybutton.h</include>
 	</includes>
+	<connections>
+		<connection>
+			<sender>kcfg_ShowKMenuText</sender>
+			<signal>toggled(bool)</signal>
+			<receiver>TextLabel1_3_3_1</receiver>
+			<slot>setEnabled(bool)</slot>
+		</connection>
+		<connection>
+			<sender>kcfg_ShowKMenuText</sender>
+			<signal>toggled(bool)</signal>
+			<receiver>kcfg_KMenuText</receiver>
+			<slot>setEnabled(bool)</slot>
+		</connection>
+		<connection>
+			<sender>kcfg_ShowKMenuText</sender>
+			<signal>toggled(bool)</signal>
+			<receiver>TextLabel1_3_3_2</receiver>
+			<slot>setEnabled(bool)</slot>
+		</connection>
+		<connection>
+			<sender>kcfg_ShowKMenuText</sender>
+			<signal>toggled(bool)</signal>
+			<receiver>kcfg_ButtonFont</receiver>
+			<slot>setEnabled(bool)</slot>
+		</connection>
+		<connection>
+			<sender>kcfg_UseSearchBar</sender>
+			<signal>toggled(bool)</signal>
+			<receiver>searchShortcutLabel</receiver>
+			<slot>setEnabled(bool)</slot>
+		</connection>
+                <connection>
+                        <sender>kcfg_UseSearchBar</sender>
+                        <signal>toggled(bool)</signal>
+                        <receiver>m_searchShortcut</receiver>
+                        <slot>setEnabled(bool)</slot>
+                </connection>
+	</connections>
 	<layoutdefaults spacing="6" margin="11"/>
 	<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index fe20f2302..259027a0b 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -37,6 +37,8 @@
 #include <knuminput.h>
 #include <kstandarddirs.h>
 #include <tdefontrequester.h>
+#include <kkeybutton.h>
+#include <tdemessagebox.h>
 
 #include <kicondialog.h>
 #include <kiconloader.h>
@@ -77,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
@@ -127,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,
@@ -135,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";
@@ -154,7 +156,7 @@ void MenuTab::load( bool useDefaults )
                                         *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()));
         }
     }
 
@@ -163,12 +165,17 @@ 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, 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();
 }
@@ -288,6 +295,7 @@ void MenuTab::save()
     // Save KMenu settings
     c->setGroup("KMenu");
     c->writeEntry("CustomIcon", m_kmenu_icon);
+    c->writeEntry("SearchShortcut", (m_searchShortcut->shortcut()).toString());
     c->sync();
 
     // Save recent documents
@@ -349,3 +357,22 @@ void MenuTab::kmenuChanged()
     //m_kmenu_button_changed = true;
     emit changed();
 }
+
+void MenuTab::setSearchShortcut(const TDEShortcut &cut)
+{
+    if( cut.contains( KKeySequence(KKey(TQt::Key_Escape)) ) )
+    {
+        int anotherTry = KMessageBox::warningYesNo(
+  	    this,
+	    i18n("Cannot set Escape as menu search shortcut.\nWould you like to set another shortcut?"),
+	    i18n("Invalid shortcut")
+	);
+
+	if( anotherTry == KMessageBox::Yes )
+  	    m_searchShortcut->captureShortcut();
+	
+        return;
+    }
+
+    m_searchShortcut->setShortcut(cut, false);
+}
diff --git a/kcontrol/kicker/menutab_impl.h b/kcontrol/kicker/menutab_impl.h
index b143b0072..1344f2950 100644
--- a/kcontrol/kicker/menutab_impl.h
+++ b/kcontrol/kicker/menutab_impl.h
@@ -21,13 +21,14 @@
 #include <tqlistview.h>
 #include <stdlib.h>
 
+#include <tdeshortcut.h>
 #include <kpushbutton.h>
 
 #include "menutab.h"
 
 class kSubMenuItem : public TQObject, public TQCheckListItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         kSubMenuItem(TQListView* parent, 
@@ -50,7 +51,7 @@ class kSubMenuItem : public TQObject, public TQCheckListItem
 
 class MenuTab : public MenuTabBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MenuTab( TQWidget *parent=0, const char* name=0 );
@@ -68,12 +69,14 @@ public slots:
     void menuStyleChanged();
     void launchIconEditor();
     void kmenuChanged();
+    void setSearchShortcut(const TDEShortcut &cut);
 
 protected:
     kSubMenuItem *m_bookmarkMenu;
     kSubMenuItem *m_quickBrowserMenu;
     TQString m_kmenu_icon;
     bool m_kmenu_button_changed;
+
 };
 
 #endif
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/positionconfig.h b/kcontrol/kicker/positionconfig.h
index 93d7cb533..264533e7e 100644
--- a/kcontrol/kicker/positionconfig.h
+++ b/kcontrol/kicker/positionconfig.h
@@ -24,7 +24,7 @@ class PositionTab;
 
 class PositionConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PositionConfig(TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index ac367a15f..2786cedf5 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -1110,20 +1110,14 @@ how it is positioned on the screen and how much of the screen it should use.</st
 <includes>
     <include location="global" impldecl="in declaration">klineedit.h</include>
     <include location="global" impldecl="in implementation">knuminput.h</include>
-    <include location="local" impldecl="in implementation">kdialog.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"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 63cdb35a9..b8a2d7ea9 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -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()
@@ -696,11 +696,11 @@ void PositionTab::showIdentify()
         screenLabel->setFrameStyle(TQFrame::Panel);
         screenLabel->setFrameShadow(TQFrame::Plain);
 
-        screenLabel->setAlignment(Qt::AlignCenter);
+        screenLabel->setAlignment(TQt::AlignCenter);
         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/kicker/positiontab_impl.h b/kcontrol/kicker/positiontab_impl.h
index 4740a8a61..31868fef9 100644
--- a/kcontrol/kicker/positiontab_impl.h
+++ b/kcontrol/kicker/positiontab_impl.h
@@ -29,7 +29,7 @@ class ExtensionInfo;
 
 class PositionTab : public PositionTabBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PositionTab(TQWidget *parent, const char* name = 0);
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index b703b9b35..6e198659a 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -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 )
diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h
index 12aa35333..eb77bbf48 100644
--- a/kcontrol/knotify/knotify.h
+++ b/kcontrol/knotify/knotify.h
@@ -46,7 +46,7 @@ namespace KNotify
 
 class KCMKNotify : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCMKNotify(TQWidget *parent, const char *name, const TQStringList &);
@@ -74,7 +74,7 @@ private:
 
 class PlayerSettingsDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PlayerSettingsDialog( TQWidget *parent, bool modal );
diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui
index def27d1fa..1397e2ebb 100644
--- a/kcontrol/knotify/playersettings.ui
+++ b/kcontrol/knotify/playersettings.ui
@@ -323,10 +323,8 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index d662d6af7..55eb642fe 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -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,7 +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, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
 
 	TQHBoxLayout *hlay = new TQHBoxLayout( lay );
 
@@ -135,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 "
@@ -148,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. "
@@ -164,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 );
 
@@ -213,6 +218,8 @@ void KBehaviourOptions::load( bool useDefaults )
 
     cbRenameDirectlyIcon->setChecked( g_pConfig->readBoolEntry("RenameIconDirectly",  DEFAULT_RENAMEICONDIRECTLY ) );
 
+    cbDoubleClickMoveToParent->setChecked(g_pConfig->readBoolEntry("DoubleClickMoveToParent", true));
+
     TDEConfig globalconfig("kdeglobals", true, false);
     globalconfig.setGroup( "KDE" );
     cbShowDeleteCommand->setChecked( globalconfig.readBoolEntry("ShowDeleteCommand", false) );
@@ -254,6 +261,7 @@ void KBehaviourOptions::save()
 //    g_pConfig->writeEntry( "FileTipsItems", sbToolTip->value() );
 
     g_pConfig->writeEntry( "RenameIconDirectly", cbRenameDirectlyIcon->isChecked());
+    g_pConfig->writeEntry( "DoubleClickMoveToParent", cbDoubleClickMoveToParent->isChecked());
 
     TDEConfig sidebarconfig("konqsidebartng.rc");
     sidebarconfig.setGroup( "" );
diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h
index bb6421be3..ebb7d8511 100644
--- a/kcontrol/konq/behaviour.h
+++ b/kcontrol/konq/behaviour.h
@@ -35,7 +35,7 @@ class KURLRequester;
 
 class KBehaviourOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KBehaviourOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
     ~KBehaviourOptions();
@@ -68,6 +68,7 @@ private:
   TQCheckBox *cbShowTips;
   TQCheckBox *cbShowPreviewsInTips;
   TQCheckBox *cbRenameDirectlyIcon;
+  TQCheckBox *cbDoubleClickMoveToParent;
 
   TQCheckBox *cbMoveToTrash;
   TQCheckBox *cbDelete;
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/browser.h b/kcontrol/konq/browser.h
index 0e0cee35c..1cb49eb02 100644
--- a/kcontrol/konq/browser.h
+++ b/kcontrol/konq/browser.h
@@ -29,7 +29,7 @@ class TQTabWidget;
 
 class KBrowserOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KBrowserOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index 973d94047..5125a03f1 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
 /**
  *  Copyright (c) 2000 Matthias Elter <elter@kde.org>
  *
@@ -71,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 );
@@ -87,7 +86,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   // name group
   TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this);
 
-  name_group->setColumnLayout(4, Qt::Horizontal);
+  name_group->setColumnLayout(4, TQt::Horizontal);
 
   for(int i = 0; i < (maxDesktops/2); i++)
     {
@@ -100,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++)
@@ -112,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);
diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h
index b7a05c3bc..9bdb8cb59 100644
--- a/kcontrol/konq/desktop.h
+++ b/kcontrol/konq/desktop.h
@@ -32,7 +32,7 @@ static const int maxDesktops = 20;
 
 class KDesktopConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   KDesktopConfig(TQWidget *parent = 0L, const char *name = 0L);
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index c247ab354..703f88e95 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -33,79 +33,243 @@
                 <attribute name="title">
                     <string>General</string>
                 </attribute>
-                <grid>
+                <vbox>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="TQCheckBox" row="0" column="0">
+                    <widget class="TQGroupBox">
                         <property name="name">
-                            <cstring>iconsEnabledBox</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Show icons on desktop</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop will be somewhat faster but you will no longer be able to drag files to the desktop.</string>
+                            <cstring>iconsGroupBox</cstring>
                         </property>
-                    </widget>
-                    <widget class="TQLayoutWidget" row="1" column="0">
-                        <property name="name">
-                            <cstring>layout1</cstring>
+                        <property name="title">
+                            <string>Desktop Icons</string>
                         </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <spacer>
+                        <vbox>
+                            <widget class="TQCheckBox">
                                 <property name="name">
-                                    <cstring>spacer3</cstring>
+                                    <cstring>iconsEnabledBox</cstring>
                                 </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
                                 </property>
-                                <property name="sizeType">
-                                    <enum>Fixed</enum>
+                                <property name="text">
+                                    <string>&amp;Show icons on desktop</string>
                                 </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>20</width>
-                                        <height>0</height>
-                                    </size>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Uncheck this option if you do not want to have icons on the desktop. Without icons the desktop will be somewhat faster but you will no longer be able to drag files to the desktop.</string>
                                 </property>
-                            </spacer>
+                            </widget>
+                            <widget class="TQLayoutWidget">
+                                <property name="name">
+                                    <cstring>layout1</cstring>
+                                </property>
+                                <hbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <spacer>
+                                        <property name="name">
+                                            <cstring>spacer1</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>0</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>vrootBox</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="text">
+                                            <string>Allow pro&amp;grams in desktop window</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>Check this option if you want to run X11 programs that draw into the desktop such as xsnow, xpenguin or xmountain. If you have problems with applications like netscape that check the root window for running instances, disable this option.</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
                             <widget class="TQCheckBox">
                                 <property name="name">
-                                    <cstring>vrootBox</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
+                                    <cstring>toolTipBox</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>Allow pro&amp;grams in desktop window</string>
+                                    <string>Show &amp;tooltips</string>
                                 </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>Check this option if you want to run X11 programs that draw into the desktop such as xsnow, xpenguin or xmountain. If you have problems with applications like netscape that check the root window for running instances, disable this option.</string>
+                            </widget>
+                            <widget class="KSeparator">
+                                <property name="name">
+                                    <cstring>iconOptsSeparator</cstring>
                                 </property>
                             </widget>
-                        </hbox>
-                    </widget>
-                    <widget class="TQCheckBox" row="2" column="0">
-                        <property name="name">
-                            <cstring>toolTipBox</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Show &amp;tooltips</string>
-                        </property>
+                            <widget class="TQLayoutWidget">
+                              <property name="name">
+                                <cstring>iconOptsOuterLayout</cstring>
+                              </property>
+                              <hbox>
+                                <widget class="TQLayoutWidget">
+                                  <property name="name">
+                                    <cstring>iconOptsVLayout</cstring>
+                                  </property>
+                                  <vbox>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>lockInPlaceBox</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="text">
+                                            <string>Lock in Place</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>Check this option if you want to prevent your icons from being dragged around.</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>autoLineupIconsBox</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="text">
+                                            <string>Align to grid</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>Check this option if you want to see your icons automatically aligned to the grid when you move them.</string>
+                                        </property>
+                                    </widget>
+                                  </vbox>
+                                </widget>
+                                <spacer>
+                                  <property name="name">
+                                    <cstring>spacer2</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="TQLayoutWidget">
+                                  <property name="name">
+                                    <cstring>spacingVLayout</cstring>
+                                  </property>
+                                  <vbox>
+                                    <widget class="TQLayoutWidget">
+                                        <property name="name">
+                                            <cstring>spacingValueLayout</cstring>
+                                        </property>
+                                        <hbox>
+                                            <property name="name">
+                                                <cstring>spacingLayout</cstring>
+                                            </property>
+                                            <widget class="TQLabel">
+                                                <property name="name">
+                                                    <cstring>spacingLabel</cstring>
+                                                </property>
+                                                <property name="text">
+                                                    <string>Icon Spacing:</string>
+                                                </property>
+                                                <property name="whatsThis" stdset="0">
+                                                    <string>Changing this value controls how close or far to each other the icons are placed on the desktop. This option has effect only if the "Align to Grid" option is enabled.</string>
+                                                </property>
+                                            </widget>
+                                            <widget class="TQSpinBox">
+                                                <property name="name">
+                                                    <cstring>spacingValue</cstring>
+                                                </property>
+                                                <property name="specialValueText">
+                                                    <string>Default</string>
+                                                </property>
+                                                <property name="suffix">
+                                                    <string> px</string>
+                                                </property>
+                                                <property name="minValue">
+                                                    <number>5</number>
+                                                </property>
+                                                <property name="whatsThis" stdset="0">
+                                                    <string>Changing this value controls how close or far to each other the icons are placed on the desktop. This option has effect only if the "Align to Grid" option is enabled.</string>
+                                                </property>
+                                            </widget>
+                                            <spacer>
+                                                <property name="name">
+                                                    <cstring>spacer3</cstring>
+                                                </property>
+                                                <property name="orientation">
+                                                    <enum>Horizontal</enum>
+                                                </property>
+                                                <property name="sizeType">
+                                                    <enum>Expanding</enum>
+                                                </property>
+                                                <property name="sizeHint">
+                                                    <size>
+                                                        <width>40</width>
+                                                        <height>20</height>
+                                                    </size>
+                                                </property>
+                                            </spacer>
+                                        </hbox>
+                                    </widget>
+                                    <widget class="TQCheckBox">
+                                      <property name="name">
+                                        <cstring>spacingCtrlScroll</cstring>
+                                      </property>
+                                      <property name="text">
+                                        <string>Ctrl+Mouse Scroll changes spacing</string>
+                                      </property>
+                                      <property name="whatsThis" stdset="0">
+                                        <string>Check this if you want to change desktop icon spacing by pressing Ctrl and scrolling on the desktop background.</string>
+                                      </property>
+                                    </widget>
+                                  </vbox>
+                                </widget>
+                                <spacer>
+                                  <property name="name">
+                                    <cstring>spacer2</cstring>
+                                  </property>
+                                  <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                  </property>
+                                  <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                  </property>
+                                  <property name="sizeHint">
+                                    <size>
+                                      <width>40</width>
+                                      <height>20</height>
+                                    </size>
+                                  </property>
+                                </spacer>
+                              </hbox>
+                            </widget>
+                        </vbox>
                     </widget>
-                    <widget class="TQButtonGroup" row="3" column="0">
+                    <widget class="TQButtonGroup">
                         <property name="name">
                             <cstring>desktopMenuGroup</cstring>
                         </property>
@@ -151,7 +315,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="TQGroupBox" row="4" column="0">
+                    <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox3</cstring>
                         </property>
@@ -260,7 +424,7 @@
                             </widget>
                             <spacer row="0" column="3" rowspan="3" colspan="1">
                                 <property name="name">
-                                    <cstring>spacer5</cstring>
+                                    <cstring>spacer4</cstring>
                                 </property>
                                 <property name="orientation">
                                     <enum>Horizontal</enum>
@@ -277,9 +441,9 @@
                             </spacer>
                         </grid>
                     </widget>
-                    <spacer row="5" column="0">
+                    <spacer>
                         <property name="name">
-                            <cstring>spacer8</cstring>
+                            <cstring>spacer5</cstring>
                         </property>
                         <property name="orientation">
                             <enum>Vertical</enum>
@@ -294,7 +458,7 @@
                             </size>
                         </property>
                     </spacer>
-                </grid>
+                </vbox>
             </widget>
             <widget class="TQWidget">
                 <property name="name">
@@ -307,17 +471,6 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="TQCheckBox" row="0" column="0">
-                        <property name="name">
-                            <cstring>autoLineupIconsBox</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Automatically &amp;line up icons</string>
-                        </property>
-                        <property name="whatsThis" stdset="0">
-                            <string>Check this option if you want to see your icons automatically aligned to the grid when you move them.</string>
-                        </property>
-                    </widget>
                     <widget class="TQCheckBox" row="1" column="0">
                         <property name="name">
                             <cstring>showHiddenBox</cstring>
@@ -421,5 +574,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">tdelistview.h</include>
+    <include location="global" impldecl="in implementation">kseparator.h</include>
 </includes>
 </UI>
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 17fc2f364..3d149ef39 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -28,6 +28,7 @@
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
 #include <tqbuttongroup.h>
+#include <tqspinbox.h>
 #include <tqtabwidget.h>
 #include <tqwhatsthis.h>
 #include <tdelistview.h>
@@ -52,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()
@@ -126,13 +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(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed()));
-  connect(mediaListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(mediaListViewChanged(TQListViewItem *)));
+  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"
@@ -151,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"
@@ -173,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>"
@@ -197,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"
@@ -219,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
   {
@@ -236,6 +240,11 @@ void DesktopBehavior::mediaListViewChanged(TQListViewItem * item)
     emit changed();
 }
 
+void DesktopBehavior::spacingChanged(int value)
+{
+    emit changed();
+}
+
 void DesktopBehavior::setMediaListViewEnabled(bool enabled)
 {
     for (DesktopBehaviorMediaItem *it=static_cast<DesktopBehaviorMediaItem *>(mediaListView->firstChild());
@@ -307,6 +316,9 @@ void DesktopBehavior::load( bool useDefaults )
     g_pConfig->setGroup( "Desktop Icons" );
     bool bShowHidden = g_pConfig->readBoolEntry("ShowHidden", DEFAULT_SHOW_HIDDEN_ROOT_ICONS);
     showHiddenBox->setChecked(bShowHidden);
+    spacingValue->setValue( g_pConfig->readNumEntry("IconSpacing", 5) );
+    spacingCtrlScroll->setChecked( g_pConfig->readBoolEntry("SpacingCtrlScroll", false) );
+    lockInPlaceBox->setChecked( g_pConfig->readBoolEntry( "LockIcons", false ) );
     //bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN);
     TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
     previewListView->clear();
@@ -333,6 +345,8 @@ void DesktopBehavior::load( bool useDefaults )
     iconsEnabledBox->setChecked( g_pConfig->readBoolEntry( "Enabled", true ) );
     autoLineupIconsBox->setChecked( g_pConfig->readBoolEntry( "AutoLineUpIcons", false ) );
 
+    toggleSpacingOpts();
+
     //
     g_pConfig->setGroup( "Mouse Buttons" );
     TQString s;
@@ -365,6 +379,9 @@ void DesktopBehavior::save()
 {
     g_pConfig->setGroup( "Desktop Icons" );
     g_pConfig->writeEntry("ShowHidden", showHiddenBox->isChecked());
+    g_pConfig->writeEntry("IconSpacing", spacingValue->value());
+    g_pConfig->writeEntry("SpacingCtrlScroll", spacingCtrlScroll->isChecked());
+    g_pConfig->writeEntry("LockIcons", lockInPlaceBox->isChecked());
     TQStringList previews;
     for ( DesktopBehaviorPreviewItem *item = static_cast<DesktopBehaviorPreviewItem *>( previewListView->firstChild() );
           item;
@@ -395,6 +412,8 @@ void DesktopBehavior::save()
     g_pConfig->writeEntry( "Enabled", iconsEnabledBox->isChecked() );
     g_pConfig->writeEntry( "AutoLineUpIcons", autoLineupIconsBox->isChecked() );
 
+    toggleSpacingOpts();
+
     saveMediaListView();
     g_pConfig->sync();
 
@@ -421,6 +440,9 @@ void DesktopBehavior::enableChanged()
     bool enabled = iconsEnabledBox->isChecked();
     behaviorTab->setTabEnabled(behaviorTab->page(1), enabled);
     vrootBox->setEnabled(enabled);
+    lockInPlaceBox->setEnabled(enabled);
+    autoLineupIconsBox->setEnabled(enabled);
+    enableGridChanged();
 
     if (m_bHasMedia)
     {
@@ -433,6 +455,24 @@ void DesktopBehavior::enableChanged()
     changed();
 }
 
+void DesktopBehavior::toggleSpacingOpts()
+{
+  bool enabled = (
+    autoLineupIconsBox->isEnabled() &&  // Desktop grid available
+    autoLineupIconsBox->isChecked() &&  // Desktop grid enabled
+    !lockInPlaceBox->isChecked()        // Lock in Place is off
+  );
+
+  spacingCtrlScroll->setEnabled(enabled);
+  spacingValue->setEnabled(enabled);
+}
+
+void DesktopBehavior::enableGridChanged()
+{
+  toggleSpacingOpts();
+  changed();
+}
+
 void DesktopBehavior::comboBoxChanged()
 {
   int i;
diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h
index bc5965750..bc8aad2d2 100644
--- a/kcontrol/konq/desktopbehavior_impl.h
+++ b/kcontrol/konq/desktopbehavior_impl.h
@@ -28,7 +28,7 @@
 
 class DesktopBehavior : public DesktopBehaviorBase
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         DesktopBehavior(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
         virtual void load();
@@ -44,10 +44,12 @@ signals:
         void changed();
 
 private slots:
-        void enableChanged();
+	void enableChanged();
+	void enableGridChanged();
 	void comboBoxChanged();
 	void editButtonPressed();
 	void mediaListViewChanged(TQListViewItem * item);
+	void spacingChanged(int value);
 
 private:
         TDEConfig *g_pConfig;
@@ -56,6 +58,8 @@ private:
 	void saveMediaListView();
 	void setMediaListViewEnabled(bool enabled);
 
+	void toggleSpacingOpts();
+
         // Combo for the menus
         void fillMenuCombo( TQComboBox * combo );
 
@@ -65,7 +69,7 @@ private:
 
 class DesktopBehaviorModule : public TDECModule
 {
-        Q_OBJECT
+        TQ_OBJECT
 
 public:
         DesktopBehaviorModule(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L );
diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp
index a12b02069..e8a99297d 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.");
@@ -94,14 +94,14 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     m_pNormalText = new KColorButton( normalTextColor, this );
     label = new TQLabel( m_pNormalText, i18n("Normal te&xt color:"), this );
     lay->addWidget(label,row,0);
-    lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQ_Alignment)hAlign);
+    lay->addWidget(m_pNormalText,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
 
     wtstr = i18n("This is the color used to display text in Konqueror windows.");
     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,18 +125,18 @@ 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,(TQ_Alignment)hAlign);
+        lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign);
 
         wtstr = i18n("This is the color used behind the text for the icons on the 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." );
@@ -179,8 +179,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
     }
 
     cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this);
-    lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign);
-    connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign);
+    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:"
@@ -192,8 +192,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop
         row++;
 
         m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this);
-        lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQ_Alignment)hAlign );
-        connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) );
+        lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign );
+        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"
@@ -263,7 +263,7 @@ void KonqFontOptions::load( bool useDefaults )
         m_pTextBackground->setColor( textBackgroundColor );
 	// Don't keep an invalid color around, otherwise checking the checkbox still gives invalid.
 	if ( !textBackgroundColor.isValid() )
-            textBackgroundColor = Qt::black;
+            textBackgroundColor = TQt::black;
     }
     else
     {
diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h
index 69ffa4af5..10e6837bd 100644
--- a/kcontrol/konq/fontopts.h
+++ b/kcontrol/konq/fontopts.h
@@ -51,7 +51,7 @@ class TDEFontCombo;
 
 class KonqFontOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqFontOptions(TDEConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0);
   TQString quickHelp() const;
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 3b2349fc7..309651dbb 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);
 
diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h
index d76b28560..4b9da1270 100644
--- a/kcontrol/konq/previews.h
+++ b/kcontrol/konq/previews.h
@@ -42,7 +42,7 @@ class KDoubleNumInput;
 
 class KPreviewOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KPreviewOptions( TQWidget *parent = 0L, const char *name = 0L );
     virtual void load();
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index 5da14f2f5..be73dcb7a 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -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();
 }
@@ -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/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 1f38faabd..c6645bdb8 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -35,7 +35,7 @@ namespace TDEIO { class Job; }
 
 class DesktopPathConfig : public TDECModule
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         DesktopPathConfig(TQWidget *parent = 0L, const char *name = 0L );
         virtual void load();
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 30272c3f6..6e92d8ffe 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
 
@@ -40,7 +40,7 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg
   int r = 0;
   int E = 0, M = 1, W = 3; //CT 3 (instead 2) allows smaller color buttons
 
-  TQGroupBox* gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Font Si&ze"), this );
+  TQGroupBox* gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Font Si&ze"), this );
   lay->addMultiCellWidget(gb, r, r, E, W);
 
   TQWhatsThis::add( gb, i18n("This is the relative font size Konqueror uses to display web sites.") );
@@ -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);
 
diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h
index 3c5131abf..82f020bda 100644
--- a/kcontrol/konqhtml/appearance.h
+++ b/kcontrol/konqhtml/appearance.h
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
 // (c) Martin R. Jones 1996
 // (c) Bernd Wuebben 1998
 // KControl port & modifications
@@ -21,7 +20,7 @@ class TDEFontCombo;
 
 class KAppearanceOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0);
   ~KAppearanceOptions();
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index fcddac791..53433264f 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -35,44 +35,44 @@
 DomainListView::DomainListView(TDEConfig *config,const TQString &title,
 		TQWidget *parent,const char *name) :
 	TQGroupBox(title, parent, name), config(config) {
-  setColumnLayout(0, Qt::Vertical);
+  setColumnLayout(0, TQt::Vertical);
   layout()->setSpacing(0);
   layout()->setMargin(0);
   TQGridLayout* thisLayout = new TQGridLayout(layout());
-  thisLayout->setAlignment(Qt::AlignTop);
+  thisLayout->setAlignment(TQt::AlignTop);
   thisLayout->setSpacing(KDialog::spacingHint());
   thisLayout->setMargin(KDialog::marginHint());
 
   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/domainlistview.h b/kcontrol/konqhtml/domainlistview.h
index f5844071e..2cf3da3d8 100644
--- a/kcontrol/konqhtml/domainlistview.h
+++ b/kcontrol/konqhtml/domainlistview.h
@@ -52,7 +52,7 @@ class PolicyDialog;
  * @author Leo Savernik
  */
 class DomainListView : public TQGroupBox {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /** Enumerates the available buttons.
     */
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index 9a2ae9efe..9b7f520ec 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -55,7 +55,7 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group,
     mKillCheck = new TQCheckBox(i18n("Hide filtered images"), this);
     topLayout->addWidget( mKillCheck );
 
-    TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("URL Expressions to Filter"), this );
+    TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("URL Expressions to Filter"), this );
     topLayout->addWidget( topBox );
 
     mListBox = new TQListBox( topBox );
@@ -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/filteropts.h b/kcontrol/konqhtml/filteropts.h
index eba3dad7d..3ca2b863b 100644
--- a/kcontrol/konqhtml/filteropts.h
+++ b/kcontrol/konqhtml/filteropts.h
@@ -30,7 +30,7 @@ class TDEConfig;
 
 class KCMFilter : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KCMFilter( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
     ~KCMFilter();
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index ed87ea349..14cf39a36 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);
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index b04690b51..52c5a7e33 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -33,7 +33,7 @@ class KIntNumInput;
 
 class KMiscHTMLOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L );
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/javaopts.h b/kcontrol/konqhtml/javaopts.h
index ea854aed3..38039188f 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -63,7 +63,7 @@ public:
 /** Java-specific enhancements to the domain list view
   */
 class JavaDomainListView : public DomainListView {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   JavaDomainListView(TDEConfig *config,const TQString &group,KJavaOptions *opt,
   		TQWidget *parent,const char *name = 0);
@@ -86,7 +86,7 @@ private:
 
 class KJavaOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KJavaOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index da5af132d..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
 
@@ -45,28 +45,28 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid
   TQVBoxLayout* toplevel = new TQVBoxLayout( this, 10, 5 );
 
   // the global checkbox
-  TQGroupBox* globalGB = new TQGroupBox( 2, Qt::Vertical, i18n( "Global Settings" ), this );
+  TQGroupBox* globalGB = new TQGroupBox( 2, TQt::Vertical, i18n( "Global Settings" ), this );
   toplevel->addWidget( globalGB );
 
   enableJavaScriptGloballyCB = new TQCheckBox( i18n( "Ena&ble JavaScript globally" ), globalGB );
   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/jsopts.h b/kcontrol/konqhtml/jsopts.h
index 000f7f770..361808f39 100644
--- a/kcontrol/konqhtml/jsopts.h
+++ b/kcontrol/konqhtml/jsopts.h
@@ -33,7 +33,7 @@ class KJavaScriptOptions;
 /** JavaScript-specific enhancements to the domain list view
   */
 class JSDomainListView : public DomainListView {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   JSDomainListView(TDEConfig *config,const TQString &group,KJavaScriptOptions *opt,
   		TQWidget *parent,const char *name = 0);
@@ -56,7 +56,7 @@ private:
 
 class KJavaScriptOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 1debc0ace..c24cd356e 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -132,11 +132,11 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 
   bool is_per_domain = !policies->isGlobal();
 
-  setColumnLayout(0, Qt::Vertical);
+  setColumnLayout(0, TQt::Vertical);
   layout()->setSpacing(0);
   layout()->setMargin(0);
   TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
-  this_layout->setAlignment(Qt::AlignTop);
+  this_layout->setAlignment(TQt::AlignTop);
   this_layout->setSpacing(3);
   this_layout->setMargin(11);
 
@@ -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/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index 3291dedab..48160bf92 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -202,7 +202,7 @@ private:
  * @author Leo Savernik
  */
 class JSPoliciesFrame : public TQGroupBox {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * constructor
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/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h
index d4e17af56..39d1a4b82 100644
--- a/kcontrol/konqhtml/khttpoptdlg.h
+++ b/kcontrol/konqhtml/khttpoptdlg.h
@@ -17,7 +17,7 @@
 */
 class KHTTPOptions : public TDECModule
 {
-Q_OBJECT
+TQ_OBJECT
   public:
     KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L);
 
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index a752a3a88..0794b390b 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -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()
diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h
index 69a324be8..c84c0e81d 100644
--- a/kcontrol/konqhtml/main.h
+++ b/kcontrol/konqhtml/main.h
@@ -35,7 +35,7 @@ class TQTabWidget;
 
 class KJSParts : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index f3525430e..e3abdbba9 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -256,18 +256,14 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
     <include location="global" impldecl="in declaration">tdelistbox.h</include>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tqwidget.h</include>
+    <include location="local"  impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>tqwidget.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index f8e1ad10a..b36f7f1a7 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -62,13 +62,13 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par
     enableHTTPOnly = new TQCheckBox( i18n( "Only allow &HTTP and HTTPS URLs for plugins" ), globalGB );
     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, Qt::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) ) );
+    priority = new TQSlider(5, 100, 5, 100, TQt::Horizontal, globalGB);
+    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;
 
@@ -312,11 +312,11 @@ 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(KProcIO*)),
+            this, TQ_SLOT(progress(KProcIO*)));
+    connect(m_nspluginscan, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(scanDone()));
+    connect(m_progress, TQ_SIGNAL(cancelled()), this, TQ_SLOT(scanDone()));
 
     m_nspluginscan->start();
 }
@@ -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*)) );
 }
 
 
@@ -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 efd3e0157..aa060f311 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -53,7 +53,7 @@ public:
 /** Plugin-specific enhancements to the domain list view
   */
 class PluginDomainListView : public DomainListView {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   PluginDomainListView(TDEConfig *config,const TQString &group,KPluginOptions *opt,
   		TQWidget *parent,const char *name = 0);
@@ -74,7 +74,7 @@ private:
  * dialog for embedding a PluginDomainListView widget
  */
 class PluginDomainDialog : public TQWidget {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   PluginDomainDialog(TQWidget *parent);
@@ -92,7 +92,7 @@ private:
 
 class KPluginOptions : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KPluginOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 );
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/policydlg.h b/kcontrol/konqhtml/policydlg.h
index e4a176fb3..0ae66a56e 100644
--- a/kcontrol/konqhtml/policydlg.h
+++ b/kcontrol/konqhtml/policydlg.h
@@ -31,7 +31,7 @@ class Policies;
  */
 class PolicyDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
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/userInterConfig.h b/kcontrol/konqhtml/userInterConfig.h
index b87879e45..a019eb7c5 100644
--- a/kcontrol/konqhtml/userInterConfig.h
+++ b/kcontrol/konqhtml/userInterConfig.h
@@ -24,7 +24,7 @@ class userInterOpts;
 
 class userInterConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     userInterConfig(TDEConfig *config, TQString group,
diff --git a/kcontrol/konqhtml/userInterOpts_impl.cpp b/kcontrol/konqhtml/userInterOpts_impl.cpp
index efe3c7343..26eac0f60 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()
diff --git a/kcontrol/konqhtml/userInterOpts_impl.h b/kcontrol/konqhtml/userInterOpts_impl.h
index 763b640b9..bfd845abd 100644
--- a/kcontrol/konqhtml/userInterOpts_impl.h
+++ b/kcontrol/konqhtml/userInterOpts_impl.h
@@ -24,7 +24,7 @@
       
 class userInterOpts : public userInterOptsBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     userInterOpts(TDEConfig *config, TQString groupName,
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index ace7409a7..87487fbe0 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -60,27 +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->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()
@@ -112,6 +113,8 @@ void KCMKonsole::load(bool useDefaults)
     dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 ));
     dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~"));
     dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false));
+    realTransparencyOrig = config.readBoolEntry("RealTransparency",false);
+    dialog->realTransparency->setChecked(realTransparencyOrig);
 
     dialog->SchemaEditor1->setSchema(config.readEntry("schema"));
 
@@ -153,6 +156,8 @@ void KCMKonsole::save()
     config.writeEntry("SilenceSeconds" , dialog->silence_secondsSB->value());
     config.writeEntry("wordseps", dialog->word_connectorLE->text());
     config.writeEntry("metaAsAltMode", dialog->metaAsAltModeCB->isChecked());
+    bool realTransparencyNew = dialog->realTransparency->isChecked();
+    config.writeEntry("RealTransparency", realTransparencyNew);
 
     config.writeEntry("schema", dialog->SchemaEditor1->schema());
 
@@ -174,6 +179,12 @@ void KCMKonsole::save()
                                            "settings of existing Konsole sessions."));
     }
 
+    if (realTransparencyOrig != realTransparencyNew)
+    {
+       KMessageBox::information(this, i18n("The real transparency setting will only affect "
+                                           "newly started Konsole sessions.\n"));
+    }
+
     if (bidiNew && !bidiOrig)
     {
        KMessageBox::information(this, i18n("You have chosen to enable "
diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h
index 561cb4502..32eb58141 100644
--- a/kcontrol/konsole/kcmkonsole.h
+++ b/kcontrol/konsole/kcmkonsole.h
@@ -28,7 +28,7 @@ class TQStringList;
 class KCMKonsole
 	: public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KCMKonsole (TQWidget *parent = 0, const char *name = 0, const TQStringList& = 0);
@@ -40,6 +40,7 @@ public:
 private:
 	KCMKonsoleDialog *dialog;
 	bool xonXoffOrig;
+	bool realTransparencyOrig;
 	bool bidiOrig;
 };
 
diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui
index 5034b42c4..a94a1b48b 100644
--- a/kcontrol/konsole/kcmkonsoledialog.ui
+++ b/kcontrol/konsole/kcmkonsoledialog.ui
@@ -174,7 +174,15 @@
                                 <string>Handle Meta &amp;key as Alt Key</string>
                               </property>
                             </widget>
-                            <widget class="TQLabel" row="13" column="0" rowspan="1" colspan="2">
+			    <widget class="TQCheckBox" row="13" column="0" rowspan="1" colspan="3">
+                              <property name="name">
+                                <cstring>realTransparency</cstring>
+                              </property>
+                              <property name="text">
+                                <string>Use &amp;real transparency</string>
+                              </property>
+                            </widget>
+                            <widget class="TQLabel" row="14" column="0" rowspan="1" colspan="2">
                               <property name="name">
                                 <cstring>TextLabel1_4</cstring>
                               </property>
@@ -193,7 +201,7 @@
                                 <cstring>line_spacingSB</cstring>
                               </property>
                             </widget>
-                            <spacer row="12" column="3">
+                            <spacer row="13" column="3">
                               <property name="name">
                                 <cstring>Spacer3</cstring>
                               </property>
@@ -210,7 +218,7 @@
                                 </size>
                               </property>
                             </spacer>
-                            <widget class="KIntNumInput" row="13" column="2">
+                            <widget class="KIntNumInput" row="14" column="2">
                                 <property name="name">
                                     <cstring>line_spacingSB</cstring>
                                 </property>
@@ -246,7 +254,7 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="TQLabel" row="14" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="15" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>SilenceLabel</cstring>
                                 </property>
@@ -265,7 +273,7 @@
                                     <cstring>silence_secondsSB</cstring>
                                 </property>
                             </widget>
-                            <widget class="KIntNumInput" row="14" column="2">
+                            <widget class="KIntNumInput" row="15" column="2">
                                 <property name="name">
                                     <cstring>silence_secondsSB</cstring>
                                 </property>
@@ -284,7 +292,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQLabel" row="15" column="0" colspan="3">
+                            <widget class="TQLabel" row="16" column="0" colspan="3">
                                 <property name="name">
                                     <cstring>TextLabel1_3</cstring>
                                 </property>
@@ -295,7 +303,7 @@
                                     <cstring>word_connectorLE</cstring>
                                 </property>
                             </widget>
-                            <widget class="TQLineEdit" row="16" column="0" colspan="3">
+                            <widget class="TQLineEdit" row="17" column="0" colspan="3">
                                 <property name="name">
                                     <cstring>word_connectorLE</cstring>
                                 </property>
@@ -386,16 +394,10 @@
 <includes>
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
     <include location="global" impldecl="in declaration">knuminput.h</include>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">schemaeditor.h</include>
+    <include location="global" impldecl="in implementation">sessioneditor.h</include>
+    <include location="local"  impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>schemaeditor.h</includehint>
-    <includehint>sessioneditor.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index dfa4dbefe..801880b8b 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -75,7 +75,7 @@ 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();
     if (!client->isAttached())
@@ -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;
 	}
 
diff --git a/kcontrol/konsole/schemaeditor.h b/kcontrol/konsole/schemaeditor.h
index 903cc1436..1dd990795 100644
--- a/kcontrol/konsole/schemaeditor.h
+++ b/kcontrol/konsole/schemaeditor.h
@@ -32,7 +32,7 @@ class TDESharedPixmap;
 /** SchemaEditor is the base class of the porject */
 class SchemaEditor : public SchemaDialog
 {
-  Q_OBJECT 
+  TQ_OBJECT 
   public:
     /** constructor */
     SchemaEditor(TQWidget* parent=0, const char *name=0);
diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui
index 950ebe1a9..0244ab236 100644
--- a/kcontrol/konsole/sessiondialog.ui
+++ b/kcontrol/konsole/sessiondialog.ui
@@ -435,12 +435,10 @@
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">kicondialog.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index 290541d12..e6ed3ee4c 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -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()
@@ -190,12 +190,12 @@ void SessionEditor::readSession(int num)
     KSimpleConfig* 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) )
diff --git a/kcontrol/konsole/sessioneditor.h b/kcontrol/konsole/sessioneditor.h
index be85f8505..04b60b3f7 100644
--- a/kcontrol/konsole/sessioneditor.h
+++ b/kcontrol/konsole/sessioneditor.h
@@ -31,7 +31,7 @@
 
 class SessionEditor : public SessionDialog
 {
-  Q_OBJECT 
+  TQ_OBJECT 
   public:
     SessionEditor(TQWidget* parent=0, const char *name=0);
     ~SessionEditor();
diff --git a/kcontrol/krdb/kcs/CMakeLists.txt b/kcontrol/krdb/kcs/CMakeLists.txt
index 3065d1c6e..b93dc018a 100644
--- a/kcontrol/krdb/kcs/CMakeLists.txt
+++ b/kcontrol/krdb/kcs/CMakeLists.txt
@@ -18,6 +18,7 @@ tde_create_translated_desktop(
     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
   DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes
   PO_DIR kcontrol-color-schemes
 )
diff --git a/kcontrol/krdb/kcs/Human.kcsrc b/kcontrol/krdb/kcs/Human.kcsrc
new file mode 100644
index 000000000..a4200f73a
--- /dev/null
+++ b/kcontrol/krdb/kcs/Human.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Human
+activeBackground=204,134,62
+activeBlend=204,134,62
+activeForeground=255,255,255
+activeTitleBtnBg=245,243,240
+alternateBackground=245,242,237
+background=239,235,231
+buttonBackground=225,217,209
+buttonForeground=0,0,0
+contrast=7
+foreground=16,16,16
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=235,231,227
+inactiveBlend=235,231,227
+inactiveForeground=179,175,171
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=179,175,171
+linkColor=0,0,238
+selectBackground=214,114,45
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Last.fm.kcsrc b/kcontrol/krdb/kcs/Last.fm.kcsrc
new file mode 100644
index 000000000..e1659fd83
--- /dev/null
+++ b/kcontrol/krdb/kcs/Last.fm.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Last.fm
+activeBackground=210,0,57
+activeBlend=183,0,29
+activeForeground=255,255,255
+activeTitleBtnBg=186,7,38
+alternateBackground=252,250,251
+background=227,230,216
+buttonBackground=219,222,210
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=145,153,142
+inactiveBlend=136,143,133
+inactiveForeground=255,255,255
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=145,153,142
+linkColor=0,0,238
+selectBackground=210,0,57
+selectForeground=255,255,255
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Lizard.kcsrc b/kcontrol/krdb/kcs/Lizard.kcsrc
new file mode 100644
index 000000000..aa77312db
--- /dev/null
+++ b/kcontrol/krdb/kcs/Lizard.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Lizard
+activeBackground=130,209,34
+activeBlend=97,176,0
+activeForeground=255,255,255
+activeTitleBtnBg=156,250,41
+alternateBackground=241,249,237
+background=239,239,239
+buttonBackground=221,223,228
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=170,209,122
+inactiveBlend=131,169,84
+inactiveForeground=0,0,0
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=167,181,199
+linkColor=0,0,238
+selectBackground=180,250,95
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Platinum.kcsrc b/kcontrol/krdb/kcs/Platinum.kcsrc
new file mode 100644
index 000000000..a2e059535
--- /dev/null
+++ b/kcontrol/krdb/kcs/Platinum.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Platinum
+activeBackground=212,212,212
+activeBlend=136,136,136
+activeForeground=0,0,0
+activeTitleBtnBg=212,212,212
+alternateBackground=242,242,255
+background=241,241,241
+buttonBackground=212,212,212
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=136,136,136
+inactiveBlend=212,212,212
+inactiveForeground=0,0,0
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=212,212,212
+linkColor=0,0,238
+selectBackground=170,170,214
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/Sienna.kcsrc b/kcontrol/krdb/kcs/Sienna.kcsrc
new file mode 100644
index 000000000..2839500e0
--- /dev/null
+++ b/kcontrol/krdb/kcs/Sienna.kcsrc
@@ -0,0 +1,27 @@
+[Color Scheme]
+Name=Sienna
+activeBackground=209,136,34
+activeBlend=176,103,0
+activeForeground=255,255,255
+activeTitleBtnBg=250,163,41
+alternateBackground=249,244,237
+background=239,239,239
+buttonBackground=221,223,228
+buttonForeground=0,0,0
+contrast=7
+foreground=0,0,0
+frame=239,239,239
+handle=239,239,239
+inactiveBackground=209,173,122
+inactiveBlend=169,134,84
+inactiveForeground=0,0,0
+inactiveFrame=239,239,239
+inactiveHandle=239,239,239
+inactiveTitleBtnBg=167,181,199
+linkColor=0,0,238
+selectBackground=250,185,95
+selectForeground=0,0,0
+shadeSortColumn=true
+visitedLinkColor=82,24,139
+windowBackground=255,255,255
+windowForeground=0,0,0
diff --git a/kcontrol/krdb/kcs/WedgieWeb.kcsrc b/kcontrol/krdb/kcs/WedgieWeb.kcsrc
new file mode 100644
index 000000000..c0fc98663
--- /dev/null
+++ b/kcontrol/krdb/kcs/WedgieWeb.kcsrc
@@ -0,0 +1,22 @@
+[Color Scheme]
+Name=WedgieWeb
+activeBackground=68,68,119
+activeBlend=68,68,119
+activeForeground=204,119,34
+activeTitleBtnBg=116,132,115
+alternateBackground=226,234,226
+background=65,68,115
+buttonBackground=49,48,98
+buttonForeground=156,161,164
+contrast=0
+foreground=153,119,0
+inactiveBackground=68,68,119
+inactiveBlend=68,68,119
+inactiveForeground=120,70,20
+inactiveTitleBtnBg=162,184,160
+linkColor=156,161,164
+selectBackground=65,48,49
+selectForeground=204,119,34
+visitedLinkColor=156,161,164
+windowBackground=0,16,32
+windowForeground=153,119,0
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 8c30c3286..25db21f3c 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -547,8 +547,21 @@ void runRdb( uint flags )
 
     TDEConfig cfgfonts("kcmfonts", true);
     cfgfonts.setGroup("General");
-    if( cfgfonts.readNumEntry( "forceFontDPI", 0 ) != 0 )
-      contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n';
+    int dpicfg = cfgfonts.readNumEntry("forceFontDPI", 0);
+    // "forceFontDPIEnable" must be read after "forceFontDPI" to make sure it is
+    // correctly initialized on the first run when upgrading to the new format,
+    // without the user even noticying it. The first time "forceFontDPIEnable"
+    // will not exist and its correct value will be deduced by the existing value
+    // of "forceFontDPI", which contains the value prior to the update.
+    bool dpiEnable = cfgfonts.readBoolEntry("forceFontDPIEnable", dpicfg > 0);
+    if (dpicfg < 64 || dpicfg > 512)
+    {
+      dpicfg = 96;
+    }
+    if (dpiEnable)
+    {
+      contents += "Xft.dpi: " + TQString::number(dpicfg) + '\n';
+    }
   }
 
   if (contents.length() > 0)
diff --git a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
index 3d534f9b6..cdeba332c 100644
--- a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
+++ b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#1e1e1e" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
index 2b648eac4..ea1938388 100644
--- a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
+++ b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#1e1e1e" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
index a93aba33a..c16988a4c 100644
--- a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
+++ b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#e1e1e1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
index 602f21613..d52955aaa 100644
--- a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
+++ b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#e1e1e1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
index 5236e586d..a3b3a524f 100644
--- a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
+++ b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#a7b5c7" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_default" >
+  <wm type="builtin" name="twin_default" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Keramik/Keramik.xml b/kcontrol/krdb/themes/Keramik/Keramik.xml
index bbc117ed6..2553d8a69 100644
--- a/kcontrol/krdb/themes/Keramik/Keramik.xml
+++ b/kcontrol/krdb/themes/Keramik/Keramik.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_keramik" >
+  <wm type="builtin" name="twin_keramik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Plastik/Plastik.xml b/kcontrol/krdb/themes/Plastik/Plastik.xml
index 6de5bee12..7ae86cd7d 100644
--- a/kcontrol/krdb/themes/Plastik/Plastik.xml
+++ b/kcontrol/krdb/themes/Plastik/Plastik.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_plastik" >
+  <wm type="builtin" name="twin_plastik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Platinum/Platinum.xml b/kcontrol/krdb/themes/Platinum/Platinum.xml
index 6a439e46d..6b7a843c1 100644
--- a/kcontrol/krdb/themes/Platinum/Platinum.xml
+++ b/kcontrol/krdb/themes/Platinum/Platinum.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_system" >
+  <wm type="builtin" name="twin_system" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Redmond/Redmond.xml b/kcontrol/krdb/themes/Redmond/Redmond.xml
index 1371f60e6..097c0001d 100644
--- a/kcontrol/krdb/themes/Redmond/Redmond.xml
+++ b/kcontrol/krdb/themes/Redmond/Redmond.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_redmond" >
+  <wm type="builtin" name="twin_redmond" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Sunshine/Sunshine.xml b/kcontrol/krdb/themes/Sunshine/Sunshine.xml
index dfd65fe3f..0f5d20285 100644
--- a/kcontrol/krdb/themes/Sunshine/Sunshine.xml
+++ b/kcontrol/krdb/themes/Sunshine/Sunshine.xml
@@ -100,7 +100,7 @@
     <inactiveTitleBtnBg rgb="#aeb2c3" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_cde" >
+  <wm type="builtin" name="twin_cde" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
index 3a7332628..e98edd00a 100644
--- a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+++ b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#1e1ee1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_quartz" >
+  <wm type="builtin" name="twin_quartz" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
index c624bbb6e..264971d9d 100644
--- a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
+++ b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
@@ -135,7 +135,7 @@
     <inactiveHandle rgb="#1e1ee1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="twin3_quartz" >
+  <wm type="builtin" name="twin_quartz" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp
index ee18c31c7..220408ab9 100644
--- a/kcontrol/kthememanager/knewthemedlg.cpp
+++ b/kcontrol/kthememanager/knewthemedlg.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
 /*  Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -29,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/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h
index 5a0df045a..39b7d554c 100644
--- a/kcontrol/kthememanager/knewthemedlg.h
+++ b/kcontrol/kthememanager/knewthemedlg.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
 /*  Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -32,7 +31,7 @@ class NewThemeWidget;
  */
 class KNewThemeDlg: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KNewThemeDlg( TQWidget * parent = 0, const char * name = 0);
     ~KNewThemeDlg();
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index fc2d6e1c9..1068eb325 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
 /*  Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
 
 This program is free software; you can redistribute it and/or modify
diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h
index 11fa6b056..1c2264f7d 100644
--- a/kcontrol/kthememanager/ktheme.h
+++ b/kcontrol/kthememanager/ktheme.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
 /*  Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
 
     This program is free software; you can redistribute it and/or modify
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 6afd487ed..4d3791511 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
 /*  Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -67,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 );
@@ -406,7 +405,7 @@ void kthememanager::updatePreview( const TQString & pixFile )
      TQImage preview( pixFile, "PNG" );
      if (preview.width()>dlg->lbPreview->contentsRect().width() ||
          preview.height()>dlg->lbPreview->contentsRect().height() )
-         preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQ_ScaleMin );
+         preview = preview.smoothScale( dlg->lbPreview->contentsRect().size(), TQImage::ScaleMin );
      TQPixmap pix;
      pix.convertFromImage( preview );
      dlg->lbPreview->setPixmap( pix );
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index 2c5e494f4..2415bd02e 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
 /*  Copyright (C) 2003 Lukas Tinkl <lukas@kde.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -61,7 +60,7 @@ private:
  */
 class kthememanager: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     kthememanager( TQWidget *parent=0, const char *name=0 );
     virtual ~kthememanager();
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index 1b7875e7f..06c41eaba 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -56,7 +56,7 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
      "notification. In this case, the cursor stops blinking after the time\n"
      "given in the section 'Startup indication timeout'"));
 
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
+    GroupBox1->setColumnLayout(0, TQt::Vertical );
     GroupBox1->layout()->setSpacing( 0 );
     GroupBox1->layout()->setMargin( 0 );
     Form1Layout->addWidget( GroupBox1 );
@@ -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" ) );
@@ -96,7 +96,7 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
      "notification. In this case, the button disappears after the time\n"
      "given in the section 'Startup indication timeout'"));
 
-    GroupBox2->setColumnLayout( 0, Qt::Vertical );
+    GroupBox2->setColumnLayout( 0, TQt::Vertical );
     GroupBox2->layout()->setSpacing( 0 );
     GroupBox2->layout()->setMargin( 0 );
     Form1Layout->addWidget( GroupBox2 );
@@ -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();
 
diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h
index e0219ffd3..3781cdd58 100644
--- a/kcontrol/launch/kcmlaunch.h
+++ b/kcontrol/launch/kcmlaunch.h
@@ -28,7 +28,7 @@ class KIntNumInput;
 
 class LaunchConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kcontrol/locale/Makefile.am b/kcontrol/locale/Makefile.am
index df5b46511..260d2ba94 100644
--- a/kcontrol/locale/Makefile.am
+++ b/kcontrol/locale/Makefile.am
@@ -1,5 +1,3 @@
-#AM_CPPFLAGS = -DTQT_NO_CAST_ASCII -DTQT_NO_COMPAT
-
 AM_CPPFLAGS = $(all_includes)
 
 SUBDIRS = default pics
diff --git a/kcontrol/locale/TIMEZONES b/kcontrol/locale/TIMEZONES
index b2924c04b..c599b0177 100644
--- a/kcontrol/locale/TIMEZONES
+++ b/kcontrol/locale/TIMEZONES
@@ -87,6 +87,7 @@ i18n("America/Cayenne");
 i18n("America/Cayman");
 i18n("America/Chicago");
 i18n("America/Chihuahua");
+i18n("America/Ciudad_Juarez");
 i18n("America/Costa_Rica");
 i18n("America/Creston");
 i18n("America/Cuiaba");
@@ -103,7 +104,6 @@ i18n("America/El_Salvador");
 i18n("America/Fort_Nelson");
 i18n("America/Fortaleza");
 i18n("America/Glace_Bay");
-i18n("America/Godthab");
 i18n("America/Goose_Bay");
 i18n("America/Grand_Turk");
 i18n("America/Grenada");
@@ -151,15 +151,14 @@ 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");
 i18n("America/North_Dakota/Center");
 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");
@@ -167,7 +166,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");
@@ -188,7 +186,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");
@@ -196,7 +193,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");
@@ -305,7 +301,6 @@ i18n("Atlantic/Stanley");
 i18n("Australia/Adelaide");
 i18n("Australia/Brisbane");
 i18n("Australia/Broken_Hill");
-i18n("Australia/Currie");
 i18n("Australia/Darwin");
 i18n("Australia/Eucla");
 i18n("Australia/Hobart");
@@ -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/default/entry.desktop b/kcontrol/locale/default/entry.desktop
index 3f648142b..d95ebe8eb 100644
--- a/kcontrol/locale/default/entry.desktop
+++ b/kcontrol/locale/default/entry.desktop
@@ -1,2 +1,2 @@
 [KCM Locale]
-Name=US English
+Name=English (American)
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 3d1736676..be2b1d16f 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -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();
 }
diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h
index c8b126919..e4b7e24cd 100644
--- a/kcontrol/locale/kcmlocale.h
+++ b/kcontrol/locale/kcmlocale.h
@@ -40,7 +40,7 @@ class TQPushButton;
 
 class TDELocaleConfig : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfig( TDELocale *_locale,
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index 9903965e8..aac454061 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -46,7 +46,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale,
 
   // Whatever the color scheme is, we want black text
   TQColorGroup a = palette().active();
-  a.setColor(TQColorGroup::Foreground, Qt::black);
+  a.setColor(TQColorGroup::Foreground, TQt::black);
   TQPalette pal(a, a, a);
 
   m_labNumber = new TQLabel(this, I18N_NOOP("Numbers:"));
@@ -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);
 }
 
@@ -90,9 +90,9 @@ void TDELocaleSample::slotUpdateTime()
 {
   TQDateTime dt = TQDateTime::currentDateTime();
 
-  m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false));
-  m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true));
-  m_timeSample->setText(m_locale->formatTime(TQT_TQTIME_OBJECT(dt.time()), true));
+  m_dateSample->setText(m_locale->formatDate(dt.date(), false));
+  m_dateShortSample->setText(m_locale->formatDate(dt.date(), true));
+  m_timeSample->setText(m_locale->formatTime(dt.time(), true));
 }
 
 void TDELocaleSample::slotLocaleChanged()
diff --git a/kcontrol/locale/klocalesample.h b/kcontrol/locale/klocalesample.h
index f4233c3cf..751f9f8f2 100644
--- a/kcontrol/locale/klocalesample.h
+++ b/kcontrol/locale/klocalesample.h
@@ -34,7 +34,7 @@ class TDELocale;
 
 class TDELocaleSample : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TDELocaleSample(TDELocale *_locale,
                 TQWidget *parent = 0, const char*name = 0);
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index 609e0c9ad..85bb44195 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -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;
@@ -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/localemon.h b/kcontrol/locale/localemon.h
index d84db0e37..28d1f8f91 100644
--- a/kcontrol/locale/localemon.h
+++ b/kcontrol/locale/localemon.h
@@ -37,7 +37,7 @@ class KLanguageCombo;
 
 class TDELocaleConfigMoney : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfigMoney(TDELocale *locale, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index ca523d2e9..dcec347b1 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -47,32 +47,32 @@ TDELocaleConfigNumber::TDELocaleConfigNumber(TDELocale *locale,
 
   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()
diff --git a/kcontrol/locale/localenum.h b/kcontrol/locale/localenum.h
index 1e19b687f..6441821ce 100644
--- a/kcontrol/locale/localenum.h
+++ b/kcontrol/locale/localenum.h
@@ -36,7 +36,7 @@ class KLanguageCombo;
 
 class TDELocaleConfigNumber : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfigNumber( TDELocale *_locale,
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 6cb8e9a8d..e2fdd910e 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -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);
diff --git a/kcontrol/locale/localeother.h b/kcontrol/locale/localeother.h
index 1ccad292d..68b8964b3 100644
--- a/kcontrol/locale/localeother.h
+++ b/kcontrol/locale/localeother.h
@@ -33,7 +33,7 @@ class TDELocale;
 
 class TDELocaleConfigOther : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfigOther(TDELocale *locale, TQWidget *parent = 0, const char *name = 0);
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 1e31f14f7..f9622dde5 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -202,8 +202,8 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale,
 
   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);
 }
diff --git a/kcontrol/locale/localetime.h b/kcontrol/locale/localetime.h
index 0c34380f7..e44621357 100644
--- a/kcontrol/locale/localetime.h
+++ b/kcontrol/locale/localetime.h
@@ -38,7 +38,7 @@ class StringPair;
 
 class TDELocaleConfigTime : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleConfigTime( TDELocale *_locale, TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index d2a17ca74..a0562c5fa 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -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();
 }
@@ -244,7 +244,7 @@ void TDELocaleApplication::slotTranslate()
   // The untranslated string for TQLabel are stored in
   // the name() so we use that when retranslating
   TQObject *wc;
-  TQObjectList *list = queryList(TQWIDGET_OBJECT_NAME_STRING);
+  TQObjectList *list = queryList("TQWidget");
   TQObjectListIt it(*list);
   while ( (wc = it.current()) != 0 )
   {
@@ -260,15 +260,15 @@ void TDELocaleApplication::slotTranslate()
     if (::qstrcmp(wc->name(), "unnamed") == 0)
       continue;
 
-    if (::qstrcmp(wc->className(), TQLABEL_OBJECT_NAME_STRING) == 0)
+    if (::qstrcmp(wc->className(), "TQLabel") == 0)
       ((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQGROUPBOX_OBJECT_NAME_STRING) == 0 ||
-             ::qstrcmp(wc->className(), TQVGROUPBOX_OBJECT_NAME_STRING) == 0)
+    else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 ||
+             ::qstrcmp(wc->className(), "TQVGroupBox") == 0)
       ((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQPUSHBUTTON_OBJECT_NAME_STRING) == 0 ||
+    else if (::qstrcmp(wc->className(), "TQPushButton") == 0 ||
              ::qstrcmp(wc->className(), "KMenuButton") == 0)
       ((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), TQCHECKBOX_OBJECT_NAME_STRING) == 0)
+    else if (::qstrcmp(wc->className(), "TQCheckBox") == 0)
       ((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) );
   }
   delete list;
diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h
index abc1a47f9..33c0ce5a5 100644
--- a/kcontrol/locale/toplevel.h
+++ b/kcontrol/locale/toplevel.h
@@ -42,7 +42,7 @@ class TDELocaleSample;
 
 class TDELocaleApplication : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDELocaleApplication(TQWidget *parent, const char *name, const TQStringList &);
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/nics/nic.h b/kcontrol/nics/nic.h
index f9bc2e082..aab4abb00 100644
--- a/kcontrol/nics/nic.h
+++ b/kcontrol/nics/nic.h
@@ -29,7 +29,7 @@ class TQListView;
 
 class KCMNic:public TDECModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KCMNic(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList( ));
 
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index 84959e34d..c6d1d9068 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -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/kcmperformance.h b/kcontrol/performance/kcmperformance.h
index 7e0660c60..fff281472 100644
--- a/kcontrol/performance/kcmperformance.h
+++ b/kcontrol/performance/kcmperformance.h
@@ -30,7 +30,7 @@ class SystemWidget;
 class Config
     : public TDECModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Config( TQWidget* parent_P, const char* name_P );
         virtual void load();
@@ -47,7 +47,7 @@ class Config
 class KonquerorConfig
     : public TDECModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KonquerorConfig( TQWidget* parent_P, const char* name_P );
         virtual void 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/konqueror.h b/kcontrol/performance/konqueror.h
index e948f6b7a..bb6fb86c3 100644
--- a/kcontrol/performance/konqueror.h
+++ b/kcontrol/performance/konqueror.h
@@ -27,7 +27,7 @@ namespace KCMPerformance
 class Konqueror
     : public Konqueror_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Konqueror( TQWidget* parent_P = NULL );
         void load(bool useDefaults);
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/performance/system.h b/kcontrol/performance/system.h
index cb570b506..50120aedf 100644
--- a/kcontrol/performance/system.h
+++ b/kcontrol/performance/system.h
@@ -29,7 +29,7 @@ namespace KCMPerformance
 class SystemWidget
     : public System_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         SystemWidget( TQWidget* parent_P = NULL );
         void load( bool useDefaults );
diff --git a/kcontrol/pics/cr128-app-energy_star.png b/kcontrol/pics/cr128-app-energy_star.png
index 35bd263c7..e71cc391f 100644
--- a/kcontrol/pics/cr128-app-energy_star.png
+++ b/kcontrol/pics/cr128-app-energy_star.png
diff --git a/kcontrol/pics/cr16-app-energy_star.png b/kcontrol/pics/cr16-app-energy_star.png
index f13297d75..0d8b50f0b 100644
--- a/kcontrol/pics/cr16-app-energy_star.png
+++ b/kcontrol/pics/cr16-app-energy_star.png
diff --git a/kcontrol/pics/cr22-app-energy_star.png b/kcontrol/pics/cr22-app-energy_star.png
index 92e29389c..f1be24483 100644
--- a/kcontrol/pics/cr22-app-energy_star.png
+++ b/kcontrol/pics/cr22-app-energy_star.png
diff --git a/kcontrol/pics/cr32-app-energy_star.png b/kcontrol/pics/cr32-app-energy_star.png
index d4209e127..ca82ba1b5 100644
--- a/kcontrol/pics/cr32-app-energy_star.png
+++ b/kcontrol/pics/cr32-app-energy_star.png
diff --git a/kcontrol/pics/cr48-app-energy_star.png b/kcontrol/pics/cr48-app-energy_star.png
index 53da9fdc5..6a489a64a 100644
--- a/kcontrol/pics/cr48-app-energy_star.png
+++ b/kcontrol/pics/cr48-app-energy_star.png
diff --git a/kcontrol/pics/cr64-app-energy_star.png b/kcontrol/pics/cr64-app-energy_star.png
index 23756779d..c6e2f4ed9 100644
--- a/kcontrol/pics/cr64-app-energy_star.png
+++ b/kcontrol/pics/cr64-app-energy_star.png
diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h
index 70d7b77cf..b0649c7c2 100644
--- a/kcontrol/privacy/kprivacymanager.h
+++ b/kcontrol/privacy/kprivacymanager.h
@@ -29,7 +29,7 @@
 
 class KPrivacyManager : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     KPrivacyManager();
 
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 71fc3313b..0aa05a90e 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();
 }
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index 74d199dcf..808bf3f98 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -30,7 +30,7 @@
 
 class Privacy: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Privacy( TQWidget *parent=0, const char *name=0 );
diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt
index 25a3a897e..1101f1ee1 100644
--- a/kcontrol/randr/CMakeLists.txt
+++ b/kcontrol/randr/CMakeLists.txt
@@ -11,6 +11,7 @@
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -55,6 +56,6 @@ tde_add_executable( tderandrtray AUTOMOC
   SOURCES
     main.cpp tderandrtray.cpp tderandrapp.cpp
     tderandrpassivepopup.cpp configdialog.cpp
-  LINK tdeutils-shared tderandr-shared
+  LINK tdeutils-shared tderandr-shared ${TDEHW_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index 5ed71aa6d..88ec261f2 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
 
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 0728146ee..1b6a5faac 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
 
@@ -42,7 +41,7 @@ class ConfigDialog;
 
 class ConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConfigDialog(TDEGlobalAccel *accel, bool isApplet );
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index 1aa0f58df..140234a90 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -35,9 +35,9 @@
 #include "ktimerdialog.h"
 #include "ktimerdialog.moc"
 
-KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
+KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent,
                  const char *name, bool modal,
-                 const QString &caption,
+                 const TQString &caption,
                  int buttonMask, ButtonCode defaultButton,
                  bool separator,
                  const KGuiItem &user1,
@@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *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" );
@@ -90,7 +90,7 @@ int KTimerDialog::exec()
     return KDialogBase::exec();
 }
 
-void KTimerDialog::setMainWidget( QWidget *widget )
+void KTimerDialog::setMainWidget( TQWidget *widget )
 {
     // yuck, here goes.
     QVBox *newWidget = new QVBox( this );
diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h
index 23b4a92b0..74891d048 100644
--- a/kcontrol/randr/ktimerdialog.h
+++ b/kcontrol/randr/ktimerdialog.h
@@ -44,7 +44,7 @@ class QLabel;
  */
 class KTimerDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -67,9 +67,9 @@ class KTimerDialog : public KDialogBase
      *
      * For the rest of the arguments, See @see KDialogBase .
      */
-    KTimerDialog( int msec, TimerStyle style=CountDown, QWidget *parent=0,
+    KTimerDialog( int msec, TimerStyle style=CountDown, TQWidget *parent=0,
                  const char *name=0, bool modal=true,
-                 const QString &caption=QString::null,
+                 const TQString &caption=TQString::null,
                  int buttonMask=Ok|Apply|Cancel, ButtonCode defaultButton=Ok,
                  bool separator=false,
                  const KGuiItem &user1=KGuiItem(),
@@ -117,7 +117,7 @@ class KTimerDialog : public KDialogBase
      * Overridden function which is used to set the main widget of the dialog.
      * @see KDialogBase::setMainWidget.
      */
-    void setMainWidget( QWidget *widget );
+    void setMainWidget( TQWidget *widget );
 
   signals:
     /**
diff --git a/kcontrol/randr/tderandrapp.cpp b/kcontrol/randr/tderandrapp.cpp
index e2a4b46f2..97e602496 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();
 }
 
diff --git a/kcontrol/randr/tderandrapp.h b/kcontrol/randr/tderandrapp.h
index 004da6294..422c0f568 100644
--- a/kcontrol/randr/tderandrapp.h
+++ b/kcontrol/randr/tderandrapp.h
@@ -26,7 +26,7 @@ class KRandRSystemTray;
 
 class KRandRApp : public KUniqueApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KRandRApp();
diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp
index 07702633b..a5ad3fe6d 100644
--- a/kcontrol/randr/tderandrbindings.cpp
+++ b/kcontrol/randr/tderandrbindings.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) by Andrew Stanley-Jones
 
@@ -19,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 11263bbf4..f13a863b9 100644
--- a/kcontrol/randr/tderandrmodule.cpp
+++ b/kcontrol/randr/tderandrmodule.cpp
@@ -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,10 +118,10 @@ 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, Qt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
+	m_rotationGroup = new TQButtonGroup(2, TQt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this);
 	topLayout->addWidget(m_rotationGroup);
 	m_rotationGroup->setRadioButtonExclusive(true);
 	TQWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen."));
@@ -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/tderandrmodule.h b/kcontrol/randr/tderandrmodule.h
index 65131ee26..73a13b623 100644
--- a/kcontrol/randr/tderandrmodule.h
+++ b/kcontrol/randr/tderandrmodule.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class KRandRModule : public TDECModule, public KRandrSimpleAPI
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KRandRModule(TQWidget *parent, const char *name, const TQStringList& _args);
diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp
index 5d2010f94..b0e78087c 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,
@@ -94,8 +94,8 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
 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/tderandrpassivepopup.h b/kcontrol/randr/tderandrpassivepopup.h
index 3b1d4b4f6..87dac8c0d 100644
--- a/kcontrol/randr/tderandrpassivepopup.h
+++ b/kcontrol/randr/tderandrpassivepopup.h
@@ -27,7 +27,7 @@
 class KRandrPassivePopup
     : public KPassivePopup
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	static KRandrPassivePopup *message( const TQString &caption, const TQString &text,
 	    const TQPixmap &icon, TQWidget *parent, const char *name=0, int timeout = -1 );
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index a443c3781..a5613eb2e 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -16,6 +16,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tqtimer.h>
 #include <tqimage.h>
 #include <tqtooltip.h>
@@ -55,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(Qt::AlignHCenter | Qt::AlignVCenter);
-	connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
+	setAlignment(TQt::AlignHCenter | TQt::AlignVCenter);
+	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
@@ -71,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(kapp, 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)), kapp->desktop(), TQ_SLOT( desktopResized()));
 #endif
 
 	randr_display = XOpenDisplay(NULL);
@@ -92,14 +96,14 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 		applyIccConfiguration(cur_profile, NULL);
 	}
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#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.
  */
@@ -143,7 +147,7 @@ void KRandRSystemTray::showEvent ( TQShowEvent * )
 void KRandRSystemTray::mousePressEvent(TQMouseEvent* e)
 {
 	// Popup the context menu with left-click
-	if (e->button() == Qt::LeftButton) {
+	if (e->button() == TQt::LeftButton) {
 		contextMenuAboutToShow(contextMenu());
 		contextMenu()->popup(e->globalPos());
 		e->accept();
@@ -267,7 +271,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 				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()));
+				connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenActivated()));
 			}
 		}
 
@@ -289,7 +293,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 			menu->setItemChecked(lastIndex, true);
 		}
 		menu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false));
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotColorProfileChanged(int)));
+		menu->connectItem(lastIndex, this, TQ_SLOT(slotColorProfileChanged(int)));
 	}
 
 	if (valid) {
@@ -299,10 +303,10 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 		if (!displayProfiles.isEmpty()) {
 			menu->insertTitle(SmallIcon("background"), i18n("Display Profiles"));
 			lastIndex = menu->insertItem(SmallIcon("bookmark"), "<default>");
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int)));
+			menu->connectItem(lastIndex, this, TQ_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)));
+				menu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int)));
 			}
 		}
 	}
@@ -310,17 +314,17 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu)
 	menu->insertTitle(SmallIcon("randr"), i18n("Global Configuration"));
 
 	TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ),
-		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ),
+		SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotDisplayConfig() ),
 		actionCollection() );
 	actColors->plug( menu );
 
 // 	TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ),
-// 		SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ),
+// 		SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotPrefs() ),
 // 		actionCollection() );
 // 	actPrefs->plug( menu );
 
 	TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ),
-		SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
+		SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotSKeys() ),
 		actionCollection() );
 	actSKeys->plug( menu );
 
@@ -438,7 +442,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 			menu->setItemChecked(lastIndex, true);
 
 		menu->setItemParameter(lastIndex, highestIndex);
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotResolutionChanged(int)));
+		menu->connectItem(lastIndex, this, TQ_SLOT(slotResolutionChanged(int)));
 	}
 	delete [] sizeSort;
 	sizeSort = 0L;
@@ -456,7 +460,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 					menu->setItemChecked(lastIndex, true);
 
 				menu->setItemParameter(lastIndex, 1 << i);
-				menu->connectItem(lastIndex, this, TQT_SLOT(slotOrientationChanged(int)));
+				menu->connectItem(lastIndex, this, TQ_SLOT(slotOrientationChanged(int)));
 			}
 		}
 	}
@@ -474,7 +478,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 			menu->setItemChecked(lastIndex, true);
 
 		menu->setItemParameter(lastIndex, i);
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotRefreshRateChanged(int)));
+		menu->connectItem(lastIndex, this, TQ_SLOT(slotRefreshRateChanged(int)));
 	}
 }
 
@@ -760,7 +764,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 
 			lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name));
 			menu->setItemChecked(lastIndex, true);
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
+			menu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
 			menu->setItemParameter(lastIndex, i);
 
 			connected_displays++;
@@ -782,7 +786,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 
 			lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name));
 			menu->setItemChecked(lastIndex, false);
-			menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int)));
+			menu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
 			menu->setItemParameter(lastIndex, i);
 
 			connected_displays++;
@@ -805,7 +809,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 			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->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int)));
 			menu->setItemParameter(lastIndex, i);
 		}
 
@@ -813,7 +817,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 		if (connected_displays < 2) {
 			menu->setItemEnabled(lastIndex, false);
 		}
-		menu->connectItem(lastIndex, this, TQT_SLOT(slotCycleDisplays()));
+		menu->connectItem(lastIndex, this, TQ_SLOT(slotCycleDisplays()));
 	}
 }
 
@@ -888,7 +892,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
 }
 
 void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 	if (device->type() == TDEGenericDeviceType::Monitor) {
 		KRandrPassivePopup::message(
 		i18n("New display output options are available!"),
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index 334e1ef31..af0d3b1f8 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -24,7 +24,7 @@
 #include <ksystemtray.h>
 #include <kglobalaccel.h>
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #else
 #define TDEGenericDevice void
@@ -37,7 +37,7 @@ class TDEPopupMenu;
 
 class KRandRSystemTray :  public KSystemTray, public KRandrSimpleAPI
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KRandRSystemTray(TQWidget* parent = 0, const char *name = 0);
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/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h
index 0897af021..7b8732c9f 100644
--- a/kcontrol/samba/kcmsambaimports.h
+++ b/kcontrol/samba/kcmsambaimports.h
@@ -30,7 +30,7 @@
 
 class ImportsView: public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       ImportsView(TQWidget *parent, TDEConfig *config=0, const char * name=0);
       virtual ~ImportsView() {};
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index c25a01113..a2a03fed3 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -59,7 +59,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
    subLayout->addWidget(&showConnClose,1,0);
    subLayout->addWidget(&showFileOpen,0,1);
    subLayout->addWidget(&showFileClose,1,1);
-   mainLayout->addWidget(&updateButton,0,Qt::AlignLeft);
+   mainLayout->addWidget(&updateButton,0,TQt::AlignLeft);
 
    TQWhatsThis::add( &logFileName, i18n("This page presents the contents of"
      " your samba log file in a friendly layout. Check that the correct log"
@@ -91,7 +91,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
    logFileName.setURL("/var/log/samba.log");
 
    viewHistory.setAllColumnsShowFocus(TRUE);
-   viewHistory.setFocusPolicy(TQ_ClickFocus);
+   viewHistory.setFocusPolicy(TQWidget::ClickFocus);
    viewHistory.setShowSortIndicator(true);
 
    viewHistory.addColumn(i18n("Date & Time"),130);
@@ -113,7 +113,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name)
    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());
@@ -161,7 +161,7 @@ void LogView::updateList()
    TQFile logFile(logFileName.url());
    if (logFile.open(IO_ReadOnly))
    {
-      TQApplication::setOverrideCursor(tqwaitCursor);
+      TQApplication::setOverrideCursor(TQt::waitCursor);
       viewHistory.clear();
       filesCount=0;
       connectionsCount=0;
diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h
index c3c8c07ea..99a259ddf 100644
--- a/kcontrol/samba/kcmsambalog.h
+++ b/kcontrol/samba/kcmsambalog.h
@@ -38,7 +38,7 @@
 
 class LogView: public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       LogView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
       virtual ~LogView() {};
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 3b77dbc9f..faeb54702 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -60,7 +60,7 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n
   expandedUserCb = new TQCheckBox( i18n( "Show expanded host info" ), this );
 
    viewStatistics->setAllColumnsShowFocus(TRUE);
-   viewStatistics->setFocusPolicy(TQ_ClickFocus);
+   viewStatistics->setFocusPolicy(TQWidget::ClickFocus);
    viewStatistics->setShowSortIndicator(true);
    
    viewStatistics->addColumn(i18n("Nr"),30);
@@ -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);
 }
 
@@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec
 void StatisticsView::calculate()
 {
    if (dataList==0) return;
-   TQApplication::setOverrideCursor(tqwaitCursor);
+   TQApplication::setOverrideCursor(TQt::waitCursor);
    int connCount(0);
    if (eventCb->currentText()==i18n("Connection"))
       connCount=1;
diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h
index 4b6ad6211..157fc62b3 100644
--- a/kcontrol/samba/kcmsambastatistics.h
+++ b/kcontrol/samba/kcmsambastatistics.h
@@ -77,7 +77,7 @@ class SambaLog
 
 class StatisticsView: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   StatisticsView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0);
   virtual ~StatisticsView() {};
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 f787293ae..4f9b076b1 100644
--- a/kcontrol/samba/ksmbstatus.h
+++ b/kcontrol/samba/ksmbstatus.h
@@ -34,7 +34,7 @@ class TDEProcess;
 
 class NetMon : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 public:
    NetMon(TQWidget *parent, TDEConfig * config=0, const char * name=0);
    void saveSettings() {};
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..e277a8853 100644
--- a/kcontrol/screensaver/advanceddialog.cpp
+++ b/kcontrol/screensaver/advanceddialog.cpp
@@ -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/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h
index 87ee03a31..4ddb9abc7 100644
--- a/kcontrol/screensaver/advanceddialog.h
+++ b/kcontrol/screensaver/advanceddialog.h
@@ -27,7 +27,7 @@ public:
 
 class KScreenSaverAdvancedDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KScreenSaverAdvancedDialog(TQWidget *parent, const char* name = 0);
       
diff --git a/kcontrol/screensaver/kswidget.h b/kcontrol/screensaver/kswidget.h
index 11ec33a74..4c96daf41 100644
--- a/kcontrol/screensaver/kswidget.h
+++ b/kcontrol/screensaver/kswidget.h
@@ -6,7 +6,7 @@
 
 class KSWidget : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KSWidget( TQWidget *parent = NULL, const char* name = NULL, int flags = 0 );
     virtual ~KSWidget();
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index b66f7bbd6..70cf3f469 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -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());
 
@@ -140,7 +140,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
         new TQVBoxLayout(leftColumnLayout, KDialog::spacingHint());
 
     mSaverGroup = new TQGroupBox(i18n("Screen Saver"), this );
-    mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
+    mSaverGroup->setColumnLayout( 0, TQt::Horizontal );
     vLayout->addWidget(mSaverGroup);
     vLayout->setStretchFactor( mSaverGroup, 10 );
     TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
@@ -153,31 +153,31 @@ 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.") );
 
     mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
-    mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
+    mSettingsGroup->setColumnLayout( 0, TQt::Vertical );
     leftColumnLayout->addWidget( mSettingsGroup );
     TQGridLayout *settingsGroupLayout = new TQGridLayout( mSettingsGroup->layout(), 5, 2, KDialog::spacingHint() );
 
     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);
@@ -523,28 +523,39 @@ void KScreenSaver::findSavers()
             i++, mNumLoaded++ ) {
         TQString file = mSaverFileList[mNumLoaded];
         SaverConfig *saver = new SaverConfig;
-        if (saver->read(file)) {
-            TQString saverexec = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(saver->exec());
+        bool saverFound = false;
+        if (saver->read(file))
+        {
             // find the xscreensaver executable
             //work around a TDEStandardDirs::findExe() "feature" where it looks in $TDEDIR/bin first no matter what and sometimes finds the wrong executable
             TQFileInfo checkExe;
-            checkExe.setFile(saverexec);
-            if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile()) {
-                mSaverList.append(saver);
+            TQStringList saverPaths = TQStringList::split(':', XSCREENSAVER_HACKS_DIRS);
+            for (TQStringList::ConstIterator it = saverPaths.begin(); it != saverPaths.end(); ++it)
+            {
+                checkExe.setFile((*it) + "/" + saver->exec());
+                if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile())
+                {
+                    mSaverList.append(saver);
+                    saverFound = true;
+                    break;
+                }
             }
-            else {
+
+            if (!saverFound)
+            {
                 // Executable not present in XScreenSaver directory!
                 // Try standard paths
-                if (TDEStandardDirs::findExe(saver->exec()) != TQString::null) {
+                if (TDEStandardDirs::findExe(saver->exec()) != TQString::null)
+                {
                     mSaverList.append(saver);
-                }
-                else {
-                    delete saver;
+                    saverFound = true;
                 }
             }
         }
-        else {
-            delete saver;
+
+        if (!saverFound)
+        {
+          delete saver;
         }
     }
 
@@ -604,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();
     }
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
index d52c81227..f5c32adee 100644
--- a/kcontrol/screensaver/scrnsave.h
+++ b/kcontrol/screensaver/scrnsave.h
@@ -33,7 +33,7 @@ class TDEProcess;
 //===========================================================================
 class KScreenSaver : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KScreenSaver(TQWidget *parent, const char *name, const TQStringList &);
     ~KScreenSaver();
diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp
index dd250e084..1055701f1 100644
--- a/kcontrol/screensaver/testwin.cpp
+++ b/kcontrol/screensaver/testwin.cpp
@@ -6,7 +6,7 @@ class QXEmbed;
 TestWin::TestWin()
     : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM )
 {
-    setFocusPolicy(TQ_StrongFocus);
+    setFocusPolicy(TQWidget::StrongFocus);
     KWin::setState( winId(), NET::StaysOnTop );
 }
 
diff --git a/kcontrol/screensaver/testwin.h b/kcontrol/screensaver/testwin.h
index ff77b6b4d..a59dcd7e7 100644
--- a/kcontrol/screensaver/testwin.h
+++ b/kcontrol/screensaver/testwin.h
@@ -5,7 +5,7 @@
 
 class TestWin : public KSWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TestWin();
 };
diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index 3b32d63b7..d4ad3e1b7 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>NoSmartcardBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>NoSmartcardBase</cstring>
     </property>
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index f0891db16..1e53bc3d9 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -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)));
 
 
 
diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h
index 7cb90478e..51cd7eddb 100644
--- a/kcontrol/smartcard/smartcard.h
+++ b/kcontrol/smartcard/smartcard.h
@@ -40,7 +40,7 @@ class TDEListViewItem;
 class KSmartcardConfig : public TDECModule, public DCOPObject
 {
   K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 
 
 public:
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index e7a3344ce..dd138d5b3 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>SmartcardBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SmartcardBase</cstring>
     </property>
@@ -23,7 +23,7 @@
             <property name="enabled">
                 <bool>true</bool>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -127,7 +127,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -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..3d165a577 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();
diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h
index c346033c6..31ea4d360 100644
--- a/kcontrol/smserver/kcmsmserver.h
+++ b/kcontrol/smserver/kcmsmserver.h
@@ -28,7 +28,7 @@ class SMServerConfigImpl;
 
 class SMServerConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   SMServerConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() );
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 b516617cf..2e1186936 100644
--- a/kcontrol/smserver/smserverconfigimpl.h
+++ b/kcontrol/smserver/smserverconfigimpl.h
@@ -26,13 +26,14 @@
   */
 
 class SMServerConfigImpl : public SMServerConfigDlg  {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	SMServerConfigImpl(TQWidget *parent=0, const char *name=0);
 	~SMServerConfigImpl();
 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..0b9611575 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>"));
 
diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h
index 10db546fd..dc94470cb 100644
--- a/kcontrol/spellchecking/spellchecking.h
+++ b/kcontrol/spellchecking/spellchecking.h
@@ -25,7 +25,7 @@ class KSpellConfig;
 
 class KSpellCheckingConfig  : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &);
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index a51a63e6b..27a599b09 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -156,12 +156,12 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	// Add Page1 (Style)
 	// -----------------
 	gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" );
-	gbWidgetStyle->setColumnLayout( 0, Qt::Vertical );
+	gbWidgetStyle->setColumnLayout( 0, TQt::Vertical );
 	gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
 	gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
 
 	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
-	gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
+	gbWidgetStyleLayout->setAlignment( TQt::AlignTop );
 	hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
 
 	cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@@ -205,7 +205,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	gbWidgetStyleLayout->addSpacing(10);
 
 	TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
-	gbPreview->setColumnLayout( 0, Qt::Vertical );
+	gbPreview->setColumnLayout( 0, TQt::Vertical );
 	gbPreview->layout()->setMargin( 0 );
 	gbPreview->layout()->setSpacing( KDialog::spacingHint() );
 	gbPreview->setFlat( true );
@@ -216,9 +216,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)
 	// -------------------
@@ -304,7 +304,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	sliderBox = new TQVBox( menuContainer );
 	sliderBox->setSpacing( KDialog::spacingHint() );
 	sliderBox->setMargin( 0 );
-	slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, Qt::Horizontal, sliderBox );
+	slOpacity = new TQSlider( 0, 100, 5, /*opacity*/ 90, TQt::Horizontal, sliderBox );
 	slOpacity->setTickmarks( TQSlider::Below );
 	slOpacity->setTickInterval( 10 );
 	TQHBox* box1 = new TQHBox( sliderBox );
@@ -338,13 +338,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)
 	// -------------------------
@@ -379,29 +379,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 +479,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
@@ -813,7 +813,7 @@ void KCMStyle::loadStyle( TDEConfig& config )
 	// they use QPopupMenus for the drop-down list!
 
 	// ##### Since Trolltech likes to seemingly copy & paste code,
-	// TQStringList::findItem() doesn't have a Qt::StringComparisonMode field.
+	// TQStringList::findItem() doesn't have a TQt::StringComparisonMode field.
 	// We roll our own (yuck)
 	cfgStyle = cfgStyle.lower();
 	int item = 0;
@@ -851,7 +851,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...
@@ -1157,5 +1157,3 @@ TQString KCMStyle::handbookSection() const
 }
 
 #include "kcmstyle.moc"
-
-// vim: set noet ts=4:
diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h
index 4fb1065bf..c9ff560f7 100644
--- a/kcontrol/style/kcmstyle.h
+++ b/kcontrol/style/kcmstyle.h
@@ -62,7 +62,7 @@ struct StyleEntry {
 
 class KCMStyle : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KCMStyle( TQWidget* parent = 0, const char* name = 0 );
@@ -168,5 +168,3 @@ private:
 };
 
 #endif // __KCMSTYLE_H
-
-// vim: set noet ts=4:
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 7fa6ef698..6ac4e6d4c 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -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/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h
index 6de7edb10..d129b78f7 100644
--- a/kcontrol/style/keramik/keramikconf.h
+++ b/kcontrol/style/keramik/keramikconf.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 
 class KeramikStyleConfig: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KeramikStyleConfig(TQWidget* parent);
 	~KeramikStyleConfig();
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 9b5edb672..6d8514fc1 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -34,7 +34,7 @@ MenuPreview::MenuPreview( TQWidget* parent, int opacity, PreviewMode pvm )
 	pixBackground(NULL), pixOverlay(NULL), pixBlended(NULL)
 {
 	setFixedSize(150, 150);
-	setFocusPolicy( TQ_NoFocus );
+	setFocusPolicy( TQWidget::NoFocus );
 
 	mode = pvm;
 	if (opacity < 0)   opacity = 0;
@@ -161,6 +161,3 @@ void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
 }
 
 #include "menupreview.moc"
-
-// vim: set noet ts=4:
-
diff --git a/kcontrol/style/menupreview.h b/kcontrol/style/menupreview.h
index e82b88f18..1f496d15a 100644
--- a/kcontrol/style/menupreview.h
+++ b/kcontrol/style/menupreview.h
@@ -26,7 +26,7 @@ class KPixmap;
 
 class MenuPreview : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	enum PreviewMode {
@@ -56,6 +56,5 @@ private:
 	PreviewMode mode;
 };
 
-// vim: set noet ts=4:
 #endif // __MENUPREVIEW_H
 
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/styleconfdialog.h b/kcontrol/style/styleconfdialog.h
index 6555adee6..a9c5d26ef 100644
--- a/kcontrol/style/styleconfdialog.h
+++ b/kcontrol/style/styleconfdialog.h
@@ -26,7 +26,7 @@
 
 class StyleConfigDialog: public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   StyleConfigDialog(TQWidget* parent, TQString styleName);
 
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 edf38650e..38f47ecee 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -33,14 +33,14 @@ void StylePreview::init()
 {
     // Ensure that the user can't toy with the child widgets.
     // Method borrowed from Qt's qtconfig.
-    TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+    TQObjectList* l = queryList("TQWidget");
     TQObjectListIt it(*l);
     TQObject* obj;
     while ((obj = it.current()) != 0)
     {
         ++it;
         obj->installEventFilter(this);
-        ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
+        ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus);
     }
     delete l;
 }
@@ -65,5 +65,3 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
     }
     return FALSE;
 }
-
-// vim: set noet ts=4:
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 941c8b986..2eb7cf376 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -24,6 +24,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
+#include <tqtabwidget.h>
 
 #include <dcopclient.h>
 
@@ -35,6 +36,7 @@
 #include <twin.h>
 #include <kcolorbutton.h>
 #include <kstandarddirs.h>
+#include <kiconloader.h>
 
 #define protected public
 #include "kcmtaskbarui.h"
@@ -190,10 +192,10 @@ 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())
@@ -218,9 +220,12 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_widget->appearance->insertItem((*it).name());
     }
+    m_widget->appearance->insertItem(i18n("Custom"));
 
-    connect(m_widget->appearance, TQT_SIGNAL(activated(int)),
-            this, TQT_SLOT(appearanceChanged(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."
@@ -236,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();
@@ -247,7 +252,6 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_widget->kcfg_ShowAllWindows->hide();
         m_widget->kcfg_SortByDesktop->hide();
-        m_widget->spacer2->changeSize(0, 0);
     }
 
     if (!TQApplication::desktop()->isVirtualDesktop() ||
@@ -259,7 +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->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"),
@@ -274,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()
@@ -286,43 +291,44 @@ TaskbarConfig::~TaskbarConfig()
 }
 
 void TaskbarConfig::slotEditGlobalConfiguration() {
-	TQByteArray data;
-	kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
+    TQByteArray data;
+    kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
 }
 
 void TaskbarConfig::processLockouts()
 {
-	m_configFileName = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
-	if (m_isGlobalConfig)
-	{
-		m_widget->globalConfigWarning->show();
-		m_widget->localConfigWarning->hide();
-		m_widget->globalConfigReload->hide();
-		m_widget->globalConfigEdit->hide();
-		m_widget->kcfg_UseGlobalSettings->hide();
-	}
-	else {
-		m_widget->globalConfigWarning->hide();
-		m_widget->localConfigWarning->show();
-		m_widget->kcfg_UseGlobalSettings->show();
-		if (m_widget->kcfg_UseGlobalSettings->isChecked()) {
-			m_widget->taskbarGroup->hide();
-			m_widget->actionsGroup->hide();
-			m_widget->globalConfigReload->hide();
-			m_widget->globalConfigEdit->show();
-		}
-		else {
-			m_widget->taskbarGroup->show();
-			m_widget->actionsGroup->show();
-			// FIXME
-			// Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied!
-			//m_widget->globalConfigReload->show();
-			m_widget->globalConfigReload->hide();
-			m_widget->globalConfigEdit->hide();
-		}
-	}
-
-	m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked());
+    m_configFileName = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
+    if (m_isGlobalConfig)
+    {
+        m_widget->globalConfigWarning->show();
+        m_widget->localConfigWarning->hide();
+        m_widget->globalConfigReload->hide();
+        m_widget->globalConfigEdit->hide();
+        m_widget->kcfg_UseGlobalSettings->hide();
+        m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
+    }
+    else {
+        m_widget->globalConfigWarning->hide();
+        m_widget->localConfigWarning->show();
+        m_widget->kcfg_UseGlobalSettings->show();
+        if (m_widget->kcfg_UseGlobalSettings->isChecked()) {
+            m_widget->tabs->hide();
+            m_widget->globalConfigReload->hide();
+            m_widget->globalConfigEdit->show();
+            m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding);
+        }
+        else {
+            m_widget->tabs->show();
+            // FIXME
+            // Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied!
+            //m_widget->globalConfigReload->show();
+            m_widget->globalConfigReload->hide();
+            m_widget->globalConfigEdit->hide();
+            m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
+        }
+    }
+
+    m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked());
 }
 
 void TaskbarConfig::slotReloadConfigurationFromGlobals()
@@ -384,23 +390,50 @@ void TaskbarConfig::updateAppearanceCombo()
     if (i < m_appearances.count())
     {
         m_widget->appearance->setCurrentItem(i);
+        m_widget->customAppearance->setEnabled(false);
         return;
     }
 
-    if (m_widget->appearance->count() == (int)m_appearances.count())
+    m_widget->appearance->setCurrentItem(m_appearances.count());
+    m_widget->customAppearance->setEnabled(true);
+}
+
+void TaskbarConfig::updateCustomAppearance()
+{
+    m_widget->kcfg_DrawButtons      ->setChecked(m_settingsObject->drawButtons());
+    m_widget->kcfg_HaloText         ->setChecked(m_settingsObject->haloText());
+    m_widget->kcfg_ShowButtonOnHover->setChecked(m_settingsObject->showButtonOnHover());
+}
+
+void TaskbarConfig::updateIconsTextCombo()
+{
+    if (m_widget->kcfg_DisplayIconsNText->currentText() == "Text only")
     {
-        m_widget->appearance->insertItem(i18n("Custom"));
+        m_widget->useIconsFrame->setEnabled(false);
+    }
+    else
+    {
+        m_widget->useIconsFrame->setEnabled(true);
     }
-
-    m_widget->appearance->setCurrentItem(m_appearances.count());
 }
 
 void TaskbarConfig::appearanceChanged(int selected)
 {
-    if (selected < (int)m_appearances.count())
+    if (selected < m_appearances.count())
+    {
+        m_widget->customAppearance->setEnabled(false);
+    }
+    else if(selected == m_appearances.count())
     {
-        unmanagedWidgetChangeState(!m_appearances[selected].matchesSettings());
+        m_widget->customAppearance->setEnabled(true);
+        updateCustomAppearance();
     }
+    unmanagedWidgetChangeState(true);
+}
+
+void TaskbarConfig::displayIconsNTextChanged(int selected)
+{
+    m_widget->useIconsFrame->setEnabled(selected != 1);  // 1 == Text only
 }
 
 void TaskbarConfig::load()
@@ -408,20 +441,37 @@ void TaskbarConfig::load()
     TDECModule::load();
     slotUpdateComboBox();
     updateAppearanceCombo();
+    updateIconsTextCombo();
     m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly());
+
+    int iconSize = m_settingsObject->iconSize();
+    if(kapp->iconLoader()->currentSize(TDEIcon::Small) != iconSize)
+    {
+        m_widget->smallIcons->setChecked(false);
+    }
 }
 
 void TaskbarConfig::save()
 {
+    TDECModule::save();
+
+    if(m_widget->smallIcons->isChecked())
+    {
+        m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Small));
+    }
+    else
+    {
+        m_settingsObject->setIconSize(kapp->iconLoader()->currentSize(TDEIcon::Panel));
+    }
+
     m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked());
     int selectedAppearance = m_widget->appearance->currentItem();
     if (selectedAppearance < (int)m_appearances.count())
     {
         m_appearances[selectedAppearance].alterSettings();
-        m_settingsObject->writeConfig();
     }
 
-    TDECModule::save();
+    m_settingsObject->writeConfig();
 
     TQByteArray data;
     kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data);
@@ -432,6 +482,7 @@ void TaskbarConfig::defaults()
     TDECModule::defaults();
     slotUpdateComboBox();
     updateAppearanceCombo();
+    updateIconsTextCombo();
 }
 
 void TaskbarConfig::notChanged()
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index 4d644bd0f..a67386abf 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -52,7 +52,7 @@ class TaskbarAppearance
 
 class TaskbarConfig : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TaskbarConfig(TQWidget *parent = 0, const char* name = 0,
@@ -67,6 +67,7 @@ public slots:
 protected slots:
     void slotUpdateComboBox();
     void appearanceChanged(int);
+    void displayIconsNTextChanged(int);
     void notChanged();
     void slotUpdateCustomColors();
 
@@ -78,6 +79,8 @@ private slots:
 private:
     TaskbarAppearance::List m_appearances;
     void updateAppearanceCombo();
+    void updateIconsTextCombo();
+    void updateCustomAppearance();
     static const TQStringList& actionList();
     static TQStringList i18nActionList();
     static const TQStringList& groupModeList();
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index f5c36e2b2..385991e55 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>358</width>
-            <height>351</height>
+            <width>817</width>
+            <height>828</height>
         </rect>
     </property>
     <property name="caption">
@@ -22,581 +22,1139 @@
             <cstring>unnamed</cstring>
         </property>
         <property name="margin">
-            <number>0</number>
+            <number>5</number>
         </property>
-	<widget class="TQGroupBox">
-		<property name="name">
-			<cstring>GroupBox2</cstring>
-		</property>
-		<property name="title">
-			<string>Settings</string>
-		</property>
-		<grid>
-			<property name="name">
-				<cstring>unnamed</cstring>
-			</property>
-			<widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>globalConfigWarning</cstring>
-				</property>
-				<property name="text">
-					<string>&lt;b&gt;NOTE: Currently you are editing the global taskbar configuration.&lt;/b&gt;&lt;br&gt;To change the configuration of a specific taskbar (when using multiple taskbars), use the corresponding Configure Taskbar menu option, located in the taskbar handle popup menu.</string>
-				</property>
-			</widget>
-			<widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>localConfigWarning</cstring>
-				</property>
-				<property name="text">
-					<string>&lt;b&gt;NOTE:&lt;/b&gt; Currently you are editing the taskbar configuration for &lt;b&gt;only&lt;/b&gt; this taskbar.</string>
-				</property>
-			</widget>
-			<widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>kcfg_UseGlobalSettings</cstring>
-				</property>
-				<property name="text">
-					<string>Use global floating taskbar configuration</string>
-				</property>
-				<property name="checked">
-					<bool>true</bool>
-				</property>
-				<property name="whatsThis" stdset="0">
-					<string>Selecting this option causes the taskbar to use the global taskbar configuration.</string>
-				</property>
-			</widget>
-			<widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>globalConfigReload</cstring>
-				</property>
-				<property name="text">
-					<string>Overwrite current configuration with the current global floating taskbar configuration</string>
-				</property>
-			</widget>
-			<widget class="TQPushButton" row="3" column="0" rowspan="1" colspan="2">
-				<property name="name">
-					<cstring>globalConfigEdit</cstring>
-				</property>
-				<property name="text">
-					<string>Edit global floating taskbar configuration</string>
-				</property>
-			</widget>
-		</grid>
-	</widget>
-        <widget class="TQButtonGroup">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>taskbarGroup</cstring>
+                <cstring>layout3</cstring>
             </property>
-            <property name="title">
-                <string>Taskbar</string>
-            </property>
-            <property name="layoutMargin" stdset="0">
-            </property>
-            <property name="layoutSpacing" stdset="0">
-            </property>
-            <grid>
+            <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_ShowAllWindows</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Show windows from all desktops</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. 
-
-By default, this option is selected and all windows are shown.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>kcfg_SortByDesktop</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Sort windows by desk&amp;top</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on.
-
-By default this option is selected.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel">
                     <property name="name">
-                        <cstring>showAllScreens</cstring>
+                        <cstring>localConfigWarning</cstring>
                     </property>
                     <property name="text">
-                        <string>Show windows from all sc&amp;reens</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar.
-
-By default, this option is selected and all windows are shown.</string>
+                        <string>&lt;b&gt;NOTE:&lt;/b&gt; Currently you are editing the taskbar configuration for &lt;b&gt;only&lt;/b&gt; this taskbar.</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel">
                     <property name="name">
-                        <cstring>kcfg_SortByApp</cstring>
+                        <cstring>globalConfigWarning</cstring>
                     </property>
                     <property name="text">
-                        <string>Sort alphabeticall&amp;y by application name</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
+                        <string>&lt;b&gt;NOTE: Currently you are editing the global taskbar configuration.&lt;/b&gt;&lt;br&gt;To change the configuration of a specific taskbar (when using multiple taskbars), use the corresponding Configure Taskbar menu option, located in the taskbar handle popup menu.</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2">
+                <widget class="TQCheckBox">
                     <property name="name">
-                        <cstring>kcfg_AllowDragAndDropReArrange</cstring>
+                        <cstring>kcfg_UseGlobalSettings</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Allow taskbar items to be rearranged using drag and drop</string>
+                        <string>Use global floating taskbar configuration</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
-                  <property name="name">
-                    <cstring>kcfg_CycleWheel</cstring>
-                  </property>
-                  <property name="text">
-                    <string>Cycle through windows with mouse wheel</string>
-                  </property>
-                  <property name="checked">
-                    <bool>true</bool>
-                  </property>
-                </widget>
-                <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_ShowOnlyIconified</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show o&amp;nly minimized windows</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. 
-
-By default, this option is not selected and the taskbar will show all windows.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_ShowWindowListBtn</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show window list &amp;button</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string>
-                    </property>
-                </widget>
-                <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>displayIconsNText</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Dis&amp;play:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_DisplayIconsNText</cstring>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="8" column="2">
-                    <property name="name">
-                        <cstring>kcfg_DisplayIconsNText</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="9" column="2">
-                    <property name="name">
-                        <cstring>kcfg_GroupTasks</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the &lt;em&gt;Show all windows&lt;/em&gt; option.
-
-You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to &lt;strong&gt;Always&lt;/strong&gt; group windows or to group windows only &lt;strong&gt;When the Taskbar is Full&lt;/strong&gt;.
-
-By default the taskbar groups windows when it is full.</string>
-                    </property>
-                </widget>
-                <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-			                  <cstring>groupTasksLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Group similar tasks:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_GroupTasks</cstring>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="10" column="2">
-                    <property name="name">
-                        <cstring>kcfg_ShowTaskStates</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-			                  <string>The taskbar can show and/or hide tasks based on their current process state.  Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
+                        <string>Selecting this option causes the taskbar to use the global taskbar configuration.</string>
                     </property>
                 </widget>
-                <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2">
+                <widget class="TQPushButton">
                     <property name="name">
-                        <cstring>showTaskStatesLabel</cstring>
+                        <cstring>globalConfigReload</cstring>
                     </property>
                     <property name="text">
-			                  <string>&amp;Show tasks with state:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_ShowTaskStates</cstring>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="11" column="2">
-                    <property name="name">
-                        <cstring>appearance</cstring>
+                        <string>Overwrite current configuration with the current global floating taskbar configuration</string>
                     </property>
                 </widget>
-                <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2">
+                <widget class="TQPushButton">
                     <property name="name">
-                        <cstring>textLabel1</cstring>
+                        <cstring>globalConfigEdit</cstring>
                     </property>
                     <property name="text">
-                        <string>A&amp;ppearance:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>appearance</cstring>
+                        <string>Edit global floating taskbar configuration</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="12" column="0" rowspan="1" colspan="2">
+                <spacer>
                     <property name="name">
-                        <cstring>kcfg_UseCustomColors</cstring>
+                        <cstring>localLikeGlobalSpacer</cstring>
                     </property>
-                    <property name="enabled">
-                        <bool>true</bool>
+                    <property name="orientation">
+                        <enum>Vertical</enum>
                     </property>
-                    <property name="text">
-                        <string>Use &amp;custom colors</string>
+                    <property name="sizeType">
+                        <enum>Maximum</enum>
                     </property>
-                    <property name="checked">
-                        <bool>true</bool>
+                    <property name="sizeHint">
+                        <size>
+                            <width>20</width>
+                            <height>1</height>
+                        </size>
                     </property>
-                </widget>
-                <widget class="TQLayoutWidget" row="13" column="0" rowspan="1" colspan="3">
+                </spacer>
+            </vbox>
+        </widget>
+        <widget class="TQTabWidget">
+            <property name="name">
+                <cstring>tabs</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>3</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+            <widget class="TQWidget">
+                <property name="name">
+                    <cstring>tab</cstring>
+                </property>
+                <attribute name="title">
+                    <string>&amp;Tasks</string>
+                </attribute>
+                <vbox>
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>unnamed</cstring>
                     </property>
-                    <grid>
+                    <widget class="TQButtonGroup">
                         <property name="name">
-                            <cstring>unnamed</cstring>
+                            <cstring>grpDisplay</cstring>
                         </property>
-                        <widget class="TQLabel" row="0" column="0">
-                            <property name="name">
-                                <cstring>inactiveTaskTextColorLabel</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Inacti&amp;ve task text color:</string>
-                            </property>
-                            <property name="buddy" stdset="0">
-                                <cstring>kcfg_InactiveTaskTextColor</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KColorButton" row="0" column="1">
-                            <property name="name">
-                                <cstring>kcfg_InactiveTaskTextColor</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="0" column="2">
-                            <property name="name">
-                                <cstring>spacer11</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>191</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="TQLabel" row="0" column="3">
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>5</hsizetype>
+                                <vsizetype>4</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Display</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>activeTaskTextColorLabel</cstring>
-                            </property>
-                            <property name="text">
-                                <string>Active task te&amp;xt color:</string>
+                                <cstring>unnamed</cstring>
                             </property>
-                            <property name="buddy" stdset="0">
-                                <cstring>kcfg_ActiveTaskTextColor</cstring>
-                            </property>
-                        </widget>
-                        <widget class="KColorButton" row="0" column="4">
+                            <widget class="TQCheckBox" row="0" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kcfg_ShowAllWindows</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Show windows from all desktops</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. By default, this option is selected and all windows are shown.</string>
+                                </property>
+                            </widget>
+                            <spacer row="1" column="0">
+                                <property name="name">
+                                    <cstring>spacer2_2_3</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="1" column="1" colspan="3">
+                                <property name="name">
+                                    <cstring>kcfg_SortByDesktop</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Sort windows by desk&amp;top</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on. By default this option is selected.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="2" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>showAllScreens</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Show windows from all sc&amp;reens</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar. By default, this option is selected and all windows are shown.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="3" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kcfg_ShowOnlyIconified</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Show o&amp;nly minimized windows</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. By default, this option is not selected and the taskbar will show all windows.</string>
+                                </property>
+                            </widget>
+                            <widget class="KSeparator" row="4" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kSeparator5</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="5" column="0" rowspan="2" colspan="2">
+                                <property name="name">
+                                    <cstring>showTaskStatesLabel</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>250</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Show tasks with state:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_ShowTaskStates</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="5" column="2" rowspan="2">
+                                <property name="name">
+                                    <cstring>kcfg_ShowTaskStates</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>250</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>The taskbar can show and/or hide tasks based on their current process state. Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
+                                </property>
+                            </widget>
+                            <spacer row="6" column="3">
+                                <property name="name">
+                                    <cstring>spacer23</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>31</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </grid>
+                    </widget>
+                    <widget class="TQButtonGroup">
+                        <property name="name">
+                            <cstring>grpSortGroup</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>5</hsizetype>
+                                <vsizetype>4</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Sorting and grouping</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>kcfg_ActiveTaskTextColor</cstring>
-                            </property>
-                            <property name="text">
-                                <string></string>
+                                <cstring>unnamed</cstring>
                             </property>
-                        </widget>
-                        <spacer row="0" column="5">
+                            <spacer row="1" column="0">
+                                <property name="name">
+                                    <cstring>spacer2_2</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="1" column="1" colspan="3">
+                                <property name="name">
+                                    <cstring>kcfg_AllowDragAndDropReArrange</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Allow taskbar items to be rearranged using drag and drop</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="0" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kcfg_SortByApp</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Sort alphabeticall&amp;y by application name</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <widget class="KSeparator" row="3" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>kSeparator6</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="4" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>groupTasksLabel</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>250</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Group similar tasks:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_GroupTasks</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="4" column="2">
+                                <property name="name">
+                                    <cstring>kcfg_GroupTasks</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>300</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the &lt;em&gt;Show all windows&lt;/em&gt; option. You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to &lt;strong&gt;Always&lt;/strong&gt; group windows or to group windows only &lt;strong&gt;When the Taskbar is Full&lt;/strong&gt;. By default the taskbar groups windows when it is full.</string>
+                                </property>
+                            </widget>
+                            <spacer row="4" column="3">
+                                <property name="name">
+                                    <cstring>spacer23_2</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>31</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </grid>
+                    </widget>
+                    <spacer>
+                        <property name="name">
+                            <cstring>spacer16</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Minimum</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
+            </widget>
+            <widget class="TQWidget">
+                <property name="name">
+                    <cstring>TabPage</cstring>
+                </property>
+                <attribute name="title">
+                    <string>&amp;Appearance</string>
+                </attribute>
+                <grid>
+                    <property name="name">
+                        <cstring>unnamed</cstring>
+                    </property>
+                    <spacer row="2" column="1">
+                        <property name="name">
+                            <cstring>spacer21</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Minimum</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget class="TQButtonGroup" row="0" column="1">
+                        <property name="name">
+                            <cstring>grpTaskbarColors</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>3</hsizetype>
+                                <vsizetype>5</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Colors</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>spacer11_2</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
+                                <cstring>unnamed</cstring>
                             </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>191</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                        <widget class="TQLabel" row="0" column="6">
+                            <spacer row="2" column="0">
+                                <property name="name">
+                                    <cstring>spacer2_2_2</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="1" column="0" colspan="3">
+                                <property name="name">
+                                    <cstring>kcfg_UseCustomColors</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="text">
+                                    <string>Use &amp;custom colors</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <widget class="TQLayoutWidget" row="2" column="1" colspan="2">
+                                <property name="name">
+                                    <cstring>layout19</cstring>
+                                </property>
+                                <grid>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQLabel" row="1" column="0">
+                                        <property name="name">
+                                            <cstring>activeTaskTextColorLabel</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>5</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                        <property name="text">
+                                            <string>Active task te&amp;xt color:</string>
+                                        </property>
+                                        <property name="buddy" stdset="0">
+                                            <cstring>kcfg_ActiveTaskTextColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQLabel" row="2" column="0">
+                                        <property name="name">
+                                            <cstring>taskBackgroundColorLabel</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>5</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                        <property name="text">
+                                            <string>&amp;Background color:</string>
+                                        </property>
+                                        <property name="buddy" stdset="0">
+                                            <cstring>kcfg_TaskBackgroundColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="KColorButton" row="0" column="1">
+                                        <property name="name">
+                                            <cstring>kcfg_InactiveTaskTextColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="KColorButton" row="1" column="1">
+                                        <property name="name">
+                                            <cstring>kcfg_ActiveTaskTextColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="KColorButton" row="2" column="1">
+                                        <property name="name">
+                                            <cstring>kcfg_TaskBackgroundColor</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQLabel" row="0" column="0">
+                                        <property name="name">
+                                            <cstring>inactiveTaskTextColorLabel</cstring>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>1</hsizetype>
+                                                <vsizetype>5</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                        <property name="text">
+                                            <string>Inacti&amp;ve task text color:</string>
+                                        </property>
+                                        <property name="buddy" stdset="0">
+                                            <cstring>kcfg_InactiveTaskTextColor</cstring>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="TQButtonGroup" row="1" column="1">
+                        <property name="name">
+                            <cstring>grpAppearanceMisc</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>1</hsizetype>
+                                <vsizetype>5</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Miscellaneous</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>taskBackgroundColorLabel</cstring>
-                            </property>
-                            <property name="text">
-                                <string>&amp;Background color:</string>
-                            </property>
-                            <property name="buddy" stdset="0">
-                                <cstring>kcfg_TaskBackgroundColor</cstring>
+                                <cstring>unnamed</cstring>
                             </property>
-                        </widget>
-                        <widget class="KColorButton" row="0" column="7">
+                            <widget class="TQCheckBox" row="0" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>kcfg_ShowWindowListBtn</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Show window list &amp;button</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string>
+                                </property>
+                            </widget>
+                            <widget class="KSeparator" row="1" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>kSeparator7</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="2" column="0">
+                                <property name="name">
+                                    <cstring>maxButtonWidthLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Max width for buttons:</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>This option allows to set the maximum width for taskbar buttons.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQSpinBox" row="2" column="1">
+                                <property name="name">
+                                    <cstring>kcfg_MaximumButtonWidth</cstring>
+                                </property>
+                                <property name="suffix">
+                                    <string> px</string>
+                                </property>
+                                <property name="maxValue">
+                                    <number>500</number>
+                                </property>
+                                <property name="minValue">
+                                    <number>10</number>
+                                </property>
+                                <property name="value">
+                                    <number>200</number>
+                                </property>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="TQButtonGroup" row="1" column="0">
+                        <property name="name">
+                            <cstring>grpIconsNText</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>5</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Icons</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>kcfg_TaskBackgroundColor</cstring>
+                                <cstring>unnamed</cstring>
                             </property>
-                            <property name="text">
-                                <string></string>
-                            </property>
-                        </widget>
-                        <spacer row="0" column="8">
+                            <widget class="TQLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>displayIconsNTextLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Dis&amp;play:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_DisplayIconsNText</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>130</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                            </widget>
+                            <spacer row="0" column="1">
+                                <property name="name">
+                                    <cstring>spacer2_2_2_3_3</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="TQComboBox" row="0" column="2" colspan="2">
+                                <property name="name">
+                                    <cstring>kcfg_DisplayIconsNText</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>5</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQFrame" row="1" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>useIconsFrame</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>false</bool>
+                                </property>
+                                <property name="frameShape">
+                                    <enum>StyledPanel</enum>
+                                </property>
+                                <property name="frameShadow">
+                                    <enum>Raised</enum>
+                                </property>
+                                <grid>
+                                    <widget class="TQCheckBox" row="0" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>smallIcons</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Small icons</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>Selecting this option makes the taskbar use small icons.</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>true</bool>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox" row="1" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>kcfg_ShowThumbnails</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Show thumbnails on hover</string>
+                                        </property>
+                                    </widget>
+                                    <spacer row="2" column="0">
+                                        <property name="name">
+                                            <cstring>spacer2_2_2_3</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="TQLabel" row="2" column="1">
+                                        <property name="name">
+                                            <cstring>thumbMaxDimensionLabel</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="text">
+                                            <string>Maximum dimension:</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQSpinBox" row="2" column="2">
+                                        <property name="name">
+                                            <cstring>kcfg_ThumbnailMaxDimension</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="suffix">
+                                            <string> px</string>
+                                        </property>
+                                        <property name="maxValue">
+                                            <number>500</number>
+                                        </property>
+                                        <property name="minValue">
+                                            <number>50</number>
+                                        </property>
+                                        <property name="value">
+                                            <number>100</number>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget class="TQButtonGroup" row="0" column="0">
+                        <property name="name">
+                            <cstring>grpTaskbarStyle</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>4</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Button style</string>
+                        </property>
+                        <grid>
                             <property name="name">
-                                <cstring>spacer12</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>191</width>
-                                    <height>20</height>
-                                </size>
+                                <cstring>unnamed</cstring>
                             </property>
-                        </spacer>
-                    </grid>
-                </widget>
-                <spacer row="1" column="0">
-                    <property name="name">
-                        <cstring>spacer2</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>
-            </grid>
-        </widget>
-        <widget class="TQGroupBox">
-            <property name="name">
-                <cstring>actionsGroup</cstring>
-            </property>
-            <property name="title">
-                <string>Actions</string>
-            </property>
-            <grid>
+                            <widget class="TQLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>textLabel1</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Taskbar style:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>appearance</cstring>
+                                </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>130</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
+                            </widget>
+                            <spacer row="0" column="1">
+                                <property name="name">
+                                    <cstring>spacer2_2_2_3_3</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="TQComboBox" row="0" column="2" colspan="2">
+                                <property name="name">
+                                    <cstring>appearance</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>5</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="TQFrame" row="1" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>customAppearance</cstring>
+                                </property>
+                                <property name="enabled">
+                                    <bool>false</bool>
+                                </property>
+                                <property name="frameShape">
+                                    <enum>StyledPanel</enum>
+                                </property>
+                                <property name="frameShadow">
+                                    <enum>Raised</enum>
+                                </property>
+                                <grid>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQCheckBox" row="0" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>kcfg_DrawButtons</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Always draw items as buttons</string>
+                                        </property>
+                                    </widget>
+                                    <spacer row="1" column="0">
+                                        <property name="name">
+                                            <cstring>spacer2_2_2_3_3</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="1" column="1" colspan="2">
+                                        <property name="name">
+                                            <cstring>kcfg_ShowButtonOnHover</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Draw items as buttons on hover</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox" row="2" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>kcfg_HaloText</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Draw halo around text</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>true</bool>
+                                        </property>
+                                    </widget>
+                                </grid>
+                            </widget>
+                        </grid>
+                    </widget>
+                </grid>
+            </widget>
+            <widget class="TQWidget">
                 <property name="name">
-                    <cstring>unnamed</cstring>
+                    <cstring>tab</cstring>
                 </property>
-                <widget class="TQLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>leftButtonLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Left button:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_LeftButtonAction</cstring>
-                    </property>
-                </widget>
-                <widget class="TQLabel" row="1" column="0">
-                    <property name="name">
-                        <cstring>middleButtonLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Middle button:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_MiddleButtonAction</cstring>
-                    </property>
-                </widget>
-                <widget class="TQLabel" row="2" column="0">
-                    <property name="name">
-                        <cstring>rightButtonLabel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Right b&amp;utton:</string>
-                    </property>
-                    <property name="buddy" stdset="0">
-                        <cstring>kcfg_RightButtonAction</cstring>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="0" column="1">
-                    <property name="name">
-                        <cstring>kcfg_LeftButtonAction</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="1" column="1">
-                    <property name="name">
-                        <cstring>kcfg_MiddleButtonAction</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                </widget>
-                <widget class="TQComboBox" row="2" column="1">
+                <attribute name="title">
+                    <string>A&amp;ctions</string>
+                </attribute>
+                <vbox>
                     <property name="name">
-                        <cstring>kcfg_RightButtonAction</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
+                        <cstring>unnamed</cstring>
                     </property>
-                </widget>
-            </grid>
+                    <widget class="TQGroupBox">
+                        <property name="name">
+                            <cstring>actionsGroup</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>5</hsizetype>
+                                <vsizetype>1</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="title">
+                            <string>Mouse Actions</string>
+                        </property>
+                        <grid>
+                            <property name="name">
+                                <cstring>unnamed</cstring>
+                            </property>
+                            <widget class="TQLabel" row="0" column="0">
+                                <property name="name">
+                                    <cstring>leftButtonLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Left button:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_LeftButtonAction</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="0" column="1">
+                                <property name="name">
+                                    <cstring>kcfg_LeftButtonAction</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="1" column="0">
+                                <property name="name">
+                                    <cstring>middleButtonLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Middle button:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_MiddleButtonAction</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="1" column="1">
+                                <property name="name">
+                                    <cstring>kcfg_MiddleButtonAction</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="TQComboBox" row="2" column="1">
+                                <property name="name">
+                                    <cstring>kcfg_RightButtonAction</cstring>
+                                </property>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>7</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="2" column="0">
+                                <property name="name">
+                                    <cstring>rightButtonLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Right b&amp;utton:</string>
+                                </property>
+                                <property name="buddy" stdset="0">
+                                    <cstring>kcfg_RightButtonAction</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="4" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>kcfg_CycleWheel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Cycle through windows with mouse wheel</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                            <spacer row="3" column="0">
+                                <property name="name">
+                                    <cstring>spacer11</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Vertical</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>21</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </grid>
+                    </widget>
+                    <spacer>
+                        <property name="name">
+                            <cstring>spacer35</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Minimum</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
+            </widget>
         </widget>
-        <spacer>
-            <property name="name">
-                <cstring>Spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
     </vbox>
 </widget>
+<customwidgets>
+</customwidgets>
 <connections>
     <connection>
+        <sender>kcfg_ShowThumbnails</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_ThumbnailMaxDimension</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_UseCustomColors</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_InactiveTaskTextColor</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_UseCustomColors</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_ActiveTaskTextColor</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_UseCustomColors</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_TaskBackgroundColor</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_ShowThumbnails</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>thumbMaxDimensionLabel</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_SortByApp</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_AllowDragAndDropReArrange</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>kcfg_DrawButtons</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>kcfg_ShowButtonOnHover</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+      <sender>kcfg_HaloText</sender>
+      <signal>toggled(bool)</signal>
+      <receiver>kcfg_ShowButtonOnHover</receiver>
+      <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
         <sender>kcfg_ShowAllWindows</sender>
         <signal>toggled(bool)</signal>
         <receiver>kcfg_SortByDesktop</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tabstops>
-    <tabstop>kcfg_ShowAllWindows</tabstop>
-    <tabstop>kcfg_SortByDesktop</tabstop>
-    <tabstop>showAllScreens</tabstop>
-    <tabstop>kcfg_SortByApp</tabstop>
-    <tabstop>kcfg_AllowDragAndDropReArrange</tabstop>
-    <tabstop>kcfg_CycleWheel</tabstop>
-    <tabstop>kcfg_ShowOnlyIconified</tabstop>
-    <tabstop>kcfg_ShowWindowListBtn</tabstop>
-    <tabstop>kcfg_DisplayIconsNText</tabstop>
-    <tabstop>kcfg_GroupTasks</tabstop>
-    <tabstop>kcfg_ShowTaskStates</tabstop>
-    <tabstop>appearance</tabstop>
-    <tabstop>kcfg_UseCustomColors</tabstop>
-    <tabstop>kcfg_InactiveTaskTextColor</tabstop>
-    <tabstop>kcfg_ActiveTaskTextColor</tabstop>
-    <tabstop>kcfg_TaskBackgroundColor</tabstop>
-    <tabstop>kcfg_LeftButtonAction</tabstop>
-    <tabstop>kcfg_MiddleButtonAction</tabstop>
-    <tabstop>kcfg_RightButtonAction</tabstop>
-</tabstops>
 <includes>
     <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">kseparator.h</include>
+    <include location="global" impldecl="in implementation">tdefontcombo.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+    <include location="global" impldecl="in implementation">tqtabwidget.h</include>
 </includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index 920326f0a..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,10 +156,10 @@ 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);
-    TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
+    fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
 
     layout->addWidget(toolbar);
 #ifdef HAVE_XFT
@@ -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/KCmFontInst.h b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
index a5dccb161..8708ef1c0 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.h
@@ -58,7 +58,7 @@ namespace KFI
 
 class CKCmFontInst : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
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/kcmfontinst/KFileFontView.h b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
index 646359280..a741fead8 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.h
@@ -115,7 +115,7 @@ class CFontListViewItem : public TDEListViewItem
  */
 class CKFileFontView : public TDEListView, public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 1956a34a6..987a44174 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -491,7 +491,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
             x=offset, y=offset;
 
         pix.resize(w, h);
-        pix.fill(Qt::white);
+        pix.fill(TQt::white);
 
         TQPainter painter(&pix);
 
@@ -580,7 +580,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
                         title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title);
 
                     painter.setFont(TDEGlobalSettings::generalFont());
-                    painter.setPen(Qt::black);
+                    painter.setPen(TQt::black);
                     y=painter.fontMetrics().height();
                     drawText(painter, x, y, w-offset, title);
                     y+=4;
diff --git a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
index b1f541f05..20bc97c23 100644
--- a/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
+++ b/kcontrol/tdefontinst/tdefontinst/CMakeLists.txt
@@ -31,6 +31,6 @@ tde_add_executable( tdefontinst
   SOURCES
     Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c
     XConfig.cpp
-  LINK kxftconfig-static tdefontinst-shared tdeio-shared
+  LINK kxftconfig-static tdefontinst-shared tdeio-shared ${FREETYPE_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index 41367d586..ff2eaae77 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -65,7 +65,7 @@ void CFontPreview::showFont()
     if(!itsCurrentUrl.isEmpty() &&
        itsEngine.draw(itsCurrentUrl, itsLastWidth, itsLastHeight, itsPixmap, itsCurrentFace-1, false))
     {
-        setEraseColor(Qt::white);
+        setEraseColor(TQt::white);
         update();
         emit status(true);
     }
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.h b/kcontrol/tdefontinst/viewpart/FontPreview.h
index 71916479e..f6ebd8dbd 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.h
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.h
@@ -42,7 +42,7 @@ namespace KFI
 
 class CFontPreview : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index e31510ad3..c2437ef1a 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -81,7 +81,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
 
     itsFrame->setFrameShape(TQFrame::NoFrame);
-    itsFrame->setFocusPolicy(TQ_ClickFocus);
+    itsFrame->setFocusPolicy(TQWidget::ClickFocus);
     itsToolsFrame->setFrameShape(TQFrame::NoFrame);
     previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised);
     previewFrame->setFrameShape(TQFrame::Panel);
@@ -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/FontViewPart.h b/kcontrol/tdefontinst/viewpart/FontViewPart.h
index 24f6d8d8b..62a380f85 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.h
@@ -45,7 +45,7 @@ class CFontPreview;
 
 class CFontViewPart : public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
index 7ac96e9c8..a584d0888 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.h
@@ -39,13 +39,13 @@ namespace KFI
 
 class CFontViewPartFactory : public KLibFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
     CFontViewPartFactory();
     virtual ~CFontViewPartFactory();
-    virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+    virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList());
 
     static TDEInstance * instance();
 
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index df1fa92d2..d5ca2eba5 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(kapp, 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;
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
index cc9a5981b..3b297a197 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.h
@@ -38,7 +38,7 @@ namespace KFI
 
 class CFontViewerAppMainWindow : public KParts::MainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
diff --git a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
index a592d4b57..b96168964 100644
--- a/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
+++ b/kcontrol/tdeio/UA-DESKTOP-FILE-HOWTO
@@ -29,7 +29,7 @@ NEW PROPERTIES:
 ===============
 X-TDE-UA-TAG
 FIELD:        REQUIRED
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    NO
 DESCRIPTION:
 An abbreviation of the actual browser-brand and is used
@@ -42,7 +42,7 @@ actual user-agent name (X-TDE-UA-NAME).
 
 X-TDE-UA-FULL
 FIELD:        REQUIRED
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    NO
 DESCRIPTION:
 The full user-agent description that will be sent to the remote
@@ -62,21 +62,21 @@ and set its value to 1 (for true).
 
 X-TDE-UA-NAME
 FIELD:        REQUIRED
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    YES
 DESCRIPTION:
 The actual name of the browser or user-agent.
 
 X-TDE-UA-VERSION
 FIELD:        REQUIRED
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    YES
 DESCRIPTION:
 The actual version of the browser or user-agent.
 
 X-TDE-UA-SYSNAME
 FIELD:        OPTIONAL
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    YES
 DESCRIPTION:
 The system name (for example Linux) where the browser
@@ -84,7 +84,7 @@ identification was obtained from.
 
 X-TDE-UA-SYSRELEASE
 FIELD:        OPTIONAL
-TYPE:         QString
+TYPE:         TQString
 TRANSLATE:    YES
 DESCRIPTION:
 The system version (for example 2.4.1) where the browser
diff --git a/kcontrol/tdeio/cache.cpp b/kcontrol/tdeio/cache.cpp
index 42c0fc28f..1f7a57a85 100644
--- a/kcontrol/tdeio/cache.cpp
+++ b/kcontrol/tdeio/cache.cpp
@@ -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/cache.h b/kcontrol/tdeio/cache.h
index 03a4d0581..7adb3c0b8 100644
--- a/kcontrol/tdeio/cache.h
+++ b/kcontrol/tdeio/cache.h
@@ -28,7 +28,7 @@ class CacheDlgUI;
 
 class KCacheConfigDialog : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   KCacheConfigDialog( TQWidget* parent = 0 );
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/kcookiesmain.h b/kcontrol/tdeio/kcookiesmain.h
index 99591c8ad..42a74c2ee 100644
--- a/kcontrol/tdeio/kcookiesmain.h
+++ b/kcontrol/tdeio/kcookiesmain.h
@@ -15,7 +15,7 @@ class KCookiesManagement;
 
 class KCookiesMain : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KCookiesMain(TQWidget *parent = 0L);
     ~KCookiesMain();
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/kcookiesmanagement.h b/kcontrol/tdeio/kcookiesmanagement.h
index 51e31fbee..ffd5c034d 100644
--- a/kcontrol/tdeio/kcookiesmanagement.h
+++ b/kcontrol/tdeio/kcookiesmanagement.h
@@ -61,7 +61,7 @@ private:
 
 class KCookiesManagement : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCookiesManagement(TQWidget *parent = 0 );
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/kcookiespolicies.h b/kcontrol/tdeio/kcookiespolicies.h
index 50ce7a62b..e0af0fc43 100644
--- a/kcontrol/tdeio/kcookiespolicies.h
+++ b/kcontrol/tdeio/kcookiespolicies.h
@@ -38,7 +38,7 @@ class KCookiesPolicyDlgUI;
 
 class KCookiesPolicies : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCookiesPolicies(TQWidget *parent = 0);
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/kenvvarproxydlg.h b/kcontrol/tdeio/kenvvarproxydlg.h
index 3ddbc989f..092ae4526 100644
--- a/kcontrol/tdeio/kenvvarproxydlg.h
+++ b/kcontrol/tdeio/kenvvarproxydlg.h
@@ -29,7 +29,7 @@ class EnvVarProxyDlgUI;
 
 class KEnvVarProxyDlg : public KProxyDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KEnvVarProxyDlg( TQWidget* parent = 0, const char* name = 0 );
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/kmanualproxydlg.h b/kcontrol/tdeio/kmanualproxydlg.h
index 18cbd6f0a..0c59f53ff 100644
--- a/kcontrol/tdeio/kmanualproxydlg.h
+++ b/kcontrol/tdeio/kmanualproxydlg.h
@@ -30,7 +30,7 @@ class ManualProxyDlgUI;
 
 class KManualProxyDlg : public KProxyDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   KManualProxyDlg( TQWidget* parent = 0, const char* name = 0 );
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/kproxydlg.h b/kcontrol/tdeio/kproxydlg.h
index d70921ef9..b6718584e 100644
--- a/kcontrol/tdeio/kproxydlg.h
+++ b/kcontrol/tdeio/kproxydlg.h
@@ -33,7 +33,7 @@ class KProxyDialogUI;
 
 class KProxyOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KProxyOptions( TQWidget* parent = 0 );
@@ -54,7 +54,7 @@ private:
 
 class KProxyDialog : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KProxyDialog( TQWidget* parent = 0 );
diff --git a/kcontrol/tdeio/kproxydlg_ui.ui b/kcontrol/tdeio/kproxydlg_ui.ui
index baf2141af..aed14c5dd 100644
--- a/kcontrol/tdeio/kproxydlg_ui.ui
+++ b/kcontrol/tdeio/kproxydlg_ui.ui
@@ -433,11 +433,9 @@ Although a persistent proxy connection is faster, note that it only works correc
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp
index c0770af9e..0116764c8 100644
--- a/kcontrol/tdeio/main.cpp
+++ b/kcontrol/tdeio/main.cpp
@@ -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/main.h b/kcontrol/tdeio/main.h
index 2fed35123..7963c1321 100644
--- a/kcontrol/tdeio/main.h
+++ b/kcontrol/tdeio/main.h
@@ -28,7 +28,7 @@ class TQTabWidget;
 
 class LanBrowser : public TDECModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       LanBrowser(TQWidget *parent=0);
       virtual void load();
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/netpref.h b/kcontrol/tdeio/netpref.h
index 30584a598..fd423df5b 100644
--- a/kcontrol/tdeio/netpref.h
+++ b/kcontrol/tdeio/netpref.h
@@ -14,7 +14,7 @@ class KIntNumInput;
 
 class KIOPreferences : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KIOPreferences( TQWidget* parent = 0);
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/policydlg.h b/kcontrol/tdeio/policydlg.h
index 2bf7a4c99..cd291998e 100644
--- a/kcontrol/tdeio/policydlg.h
+++ b/kcontrol/tdeio/policydlg.h
@@ -65,7 +65,7 @@ public:
 
 class PolicyDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   PolicyDlg (const TQString& caption, TQWidget *parent = 0,
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/smbrodlg.h b/kcontrol/tdeio/smbrodlg.h
index 1c9d0347d..73c513efa 100644
--- a/kcontrol/tdeio/smbrodlg.h
+++ b/kcontrol/tdeio/smbrodlg.h
@@ -31,7 +31,7 @@ class KComboBox;
 
 class SMBRoOptions : public TDECModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       SMBRoOptions(TQWidget *parent = 0);
       ~SMBRoOptions();
diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp
index 91d8cfd5c..8ac02dcfd 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();
diff --git a/kcontrol/tdeio/socks.h b/kcontrol/tdeio/socks.h
index f5c5cb2a4..eac39becc 100644
--- a/kcontrol/tdeio/socks.h
+++ b/kcontrol/tdeio/socks.h
@@ -35,7 +35,7 @@ class TQVButtonGroup;
 
 class KSocksConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KSocksConfig(TQWidget *parent);
   virtual ~KSocksConfig();
diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp
index 5e5cbd233..430261a45 100644
--- a/kcontrol/tdeio/uagentproviderdlg.cpp
+++ b/kcontrol/tdeio/uagentproviderdlg.cpp
@@ -45,8 +45,8 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e )
 {
   int key = e->key();
   TQString keycode = e->text();
-  if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
-       (cursorPosition() > 0 && key == Qt::Key_Minus) ||
+  if ( (key >= TQt::Key_Escape && key <= TQt::Key_Help) || key == TQt::Key_Period ||
+       (cursorPosition() > 0 && key == TQt::Key_Minus) ||
        (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
   {
     KLineEdit::keyPressEvent(e);
@@ -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/uagentproviderdlg.h b/kcontrol/tdeio/uagentproviderdlg.h
index 3e60edb54..acab34674 100644
--- a/kcontrol/tdeio/uagentproviderdlg.h
+++ b/kcontrol/tdeio/uagentproviderdlg.h
@@ -29,7 +29,7 @@ class UAProviderDlgUI;
 
 class UALineEdit : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   UALineEdit( TQWidget *parent, const char *name=0 );
@@ -40,7 +40,7 @@ protected:
 
 class UAProviderDlg : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   UAProviderDlg( const TQString& caption, TQWidget *parent = 0,
diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index 7b1f4b3d7..9ee0b58c6 100644
--- a/kcontrol/tdeio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -56,22 +56,22 @@ UserAgentDlg::UserAgentDlg( TQWidget * parent )
 
   dlg->lvDomainPolicyList->setSorting(0);
 
-  connect( dlg->cbSendUAString, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) );
-
-  connect( dlg->gbDefaultId, TQT_SIGNAL(clicked(int)),
-           TQT_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->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->cbSendUAString, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) );
+
+  connect( dlg->gbDefaultId, TQ_SIGNAL(clicked(int)),
+           TQ_SLOT(changeDefaultUAModifiers(int)));
+
+  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, 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();
 }
diff --git a/kcontrol/tdeio/useragentdlg.h b/kcontrol/tdeio/useragentdlg.h
index 746a8524a..ca65b2df3 100644
--- a/kcontrol/tdeio/useragentdlg.h
+++ b/kcontrol/tdeio/useragentdlg.h
@@ -33,7 +33,7 @@ class UserAgentDlgUI;
 
 class UserAgentDlg : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   UserAgentDlg ( TQWidget * parent = 0) ;
diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp
index 139ae90b7..c1f459924 100644
--- a/kcontrol/tdm/background.cpp
+++ b/kcontrol/tdm/background.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kcmdisplay.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -54,14 +54,14 @@ KBackground::KBackground(TQWidget *parent, const char *name)
     m_simpleConf=new KSimpleConfig(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 d88629c35..74f1b09ec 100644
--- a/kcontrol/tdm/background.h
+++ b/kcontrol/tdm/background.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kcmdisplay.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -22,7 +22,7 @@ class TQLabel;
 
 class KBackground: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KBackground(TQWidget *parent=0, const char *name=0);
     ~KBackground();
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp
index 2a5f72895..71e09cb0d 100644
--- a/kcontrol/tdm/main.cpp
+++ b/kcontrol/tdm/main.cpp
@@ -127,13 +127,13 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &)
   TQMap<gid_t,TQStringList> tgmap;
   TQMap<gid_t,TQStringList>::Iterator tgmapi;
   TQMap<gid_t,TQStringList>::ConstIterator tgmapci;
-  TQMap<TQString, QPair<int,TQStringList> >::Iterator umapi;
+  TQMap<TQString, TQPair<int,TQStringList> >::Iterator umapi;
 
   struct passwd *ps;
   for (setpwent(); (ps = getpwent()); ) {
     TQString un( TQFile::decodeName( ps->pw_name ) );
     if (usermap.find( un ) == usermap.end()) {
-      usermap.insert( un, QPair<int,TQStringList>( ps->pw_uid, sl ) );
+      usermap.insert( un, TQPair<int,TQStringList>( ps->pw_uid, sl ) );
       if ((tgmapi = tgmap.find( ps->pw_gid )) != tgmap.end())
         (*tgmapi).append( un );
       else
@@ -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 )) {
@@ -298,7 +298,7 @@ void TDModule::propagateUsers()
   groupmap.clear();
   emit clearUsers();
   TQMap<TQString,int> lusers;
-  TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+  TQMapConstIterator<TQString, TQPair<int,TQStringList> > it;
   TQStringList::ConstIterator jt;
   TQMap<TQString,int>::Iterator gmapi;
   for (it = usermap.begin(); it != usermap.end(); ++it) {
@@ -321,7 +321,7 @@ void TDModule::slotMinMaxUID(int min, int max)
 {
   if (updateOK) {
     TQMap<TQString,int> alusers, dlusers;
-    TQMapConstIterator<TQString, QPair<int,TQStringList> > it;
+    TQMapConstIterator<TQString, TQPair<int,TQStringList> > it;
     TQStringList::ConstIterator jt;
     TQMap<TQString,int>::Iterator gmapi;
     for (it = usermap.begin(); it != usermap.end(); ++it) {
diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h
index 48cfa5b22..4274e8323 100644
--- a/kcontrol/tdm/main.h
+++ b/kcontrol/tdm/main.h
@@ -38,7 +38,7 @@ class KBackground;
 
 class TDModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -71,7 +71,7 @@ private:
   TDMUsersWidget	*users;
   TDMConvenienceWidget	*convenience;
 
-  TQMap<TQString, QPair<int,TQStringList> >	usermap;
+  TQMap<TQString, TQPair<int,TQStringList> >	usermap;
   TQMap<TQString,int>	groupmap;
   int			minshowuid, maxshowuid;
   bool			updateOK;
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 8e49087d1..973d1dc35 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -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,9 +128,9 @@ 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, Qt::AlignCenter);
+  hglay->addWidget(logobutton, 1, 1, TQt::AlignCenter);
   hglay->addRowSpacing(1, 110);
   wtstr = i18n("Click here to choose an image that TDM will display. "
 	       "You can also drag and drop an image onto this button "
@@ -145,19 +145,19 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   grid->addLayout(hglay, 2, 1);
 
   label = new TQLabel(i18n("Position:"), group);
-  hglay->addMultiCellWidget(label, 0,1, 0,0, Qt::AlignVCenter);
-  TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group));
+  hglay->addMultiCellWidget(label, 0,1, 0,0, TQt::AlignVCenter);
+  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.");
@@ -226,12 +226,12 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
 
 
   // The Language group box
-  group = new TQGroupBox(0, Qt::Vertical, i18n("Locale"), this);
+  group = new TQGroupBox(0, TQt::Vertical, i18n("Locale"), this);
   vbox->addWidget(group);
 
   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);
@@ -243,11 +243,11 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   TQWhatsThis::add( langcombo, wtstr );
 
   // The SAK group box
-  group = new TQGroupBox(0, Qt::Vertical, i18n("Secure Attention Key"), this);
+  group = new TQGroupBox(0, TQt::Vertical, i18n("Secure Attention Key"), this);
   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);
@@ -262,11 +262,11 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   TQWhatsThis::add( sakbox, wtstr );
 
   // Keyboard group box
-  group = new TQGroupBox(0, Qt::Vertical, i18n("Keyboard"), this);
+  group = new TQGroupBox(0, TQt::Vertical, i18n("Keyboard"), this);
   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);
@@ -370,7 +370,7 @@ bool TDMAppearanceWidget::setLogo(TQString logo)
     if (p.isNull())
         return false;
     if (p.width() > 100 || p.height() > 100)
-        p = p.smoothScale(100, 100, TQ_ScaleMin);
+        p = p.smoothScale(100, 100, TQImage::ScaleMin);
     logobutton->setPixmap(p);
     uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
     logobutton->setFixedSize(p.width() + bd, p.height() + bd);
diff --git a/kcontrol/tdm/tdm-appear.h b/kcontrol/tdm/tdm-appear.h
index 69c2b241b..d79ac0524 100644
--- a/kcontrol/tdm/tdm-appear.h
+++ b/kcontrol/tdm/tdm-appear.h
@@ -44,7 +44,7 @@ class KLineEdit;
 
 class TDMAppearanceWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMAppearanceWidget(TQWidget *parent, const char *name=0);
diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp
index 487e8adbb..a324e866a 100644
--- a/kcontrol/tdm/tdm-conv.cpp
+++ b/kcontrol/tdm/tdm-conv.cpp
@@ -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-conv.h b/kcontrol/tdm/tdm-conv.h
index 39e0e30f9..f6d9346b6 100644
--- a/kcontrol/tdm/tdm-conv.h
+++ b/kcontrol/tdm/tdm-conv.h
@@ -41,7 +41,7 @@
 
 class TDMConvenienceWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMConvenienceWidget(TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp
index 65dbea179..0aa2e4a70 100644
--- a/kcontrol/tdm/tdm-font.cpp
+++ b/kcontrol/tdm/tdm-font.cpp
@@ -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-font.h b/kcontrol/tdm/tdm-font.h
index fbbbc5028..2d4cb4e62 100644
--- a/kcontrol/tdm/tdm-font.h
+++ b/kcontrol/tdm/tdm-font.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class TDMFontWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMFontWidget(TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp
index 14e681d18..6d6ed8cd7 100644
--- a/kcontrol/tdm/tdm-shut.cpp
+++ b/kcontrol/tdm/tdm-shut.cpp
@@ -17,6 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <sys/types.h>
 
@@ -52,13 +54,13 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
       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()));
+      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>"
@@ -71,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 );
@@ -91,17 +93,17 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name)
       bm_combo = new KBackedComboBox( group4 );
       bm_combo->insertItem("None", i18n("boot manager", "None"));
       bm_combo->insertItem("Grub", i18n("Grub"));
-#if defined(__linux__) && ( defined(__i386__) || defined(__amd64__) )
+#if defined(Q_OS_LINUX) && ( defined(__i386__) || defined(__amd64__) )
       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 );
 
@@ -208,12 +210,8 @@ void TDMSessionsWidget::load()
   readSD(sdrcombo, "Root");
 
   config->setGroup("Shutdown");
-  restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot"));
-#if defined(__OpenBSD__)
-  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt -p"));
-#else
-  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff"));
-#endif
+  restart_lined->setURL(config->readEntry("RebootCmd", REBOOT_BINARY));
+  shutdown_lined->setURL(config->readEntry("HaltCmd", POWEROFF_BINARY));
 
   bm_combo->setCurrentId(config->readEntry("BootManager", "None"));
 }
@@ -222,8 +220,8 @@ void TDMSessionsWidget::load()
 
 void TDMSessionsWidget::defaults()
 {
-  restart_lined->setURL("/sbin/reboot");
-  shutdown_lined->setURL("/sbin/poweroff");
+  restart_lined->setURL(REBOOT_BINARY);
+  shutdown_lined->setURL(POWEROFF_BINARY);
 
   sdlcombo->setCurrentItem(SdAll);
   sdrcombo->setCurrentItem(SdRoot);
diff --git a/kcontrol/tdm/tdm-shut.h b/kcontrol/tdm/tdm-shut.h
index a8d22adc2..73e1f716f 100644
--- a/kcontrol/tdm/tdm-shut.h
+++ b/kcontrol/tdm/tdm-shut.h
@@ -30,7 +30,7 @@ class KBackedComboBox;
 
 class TDMSessionsWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMSessionsWidget(TQWidget *parent=0, const char *name=0);
diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp
index fe2f31c65..5195c3bfd 100644
--- a/kcontrol/tdm/tdm-users.cpp
+++ b/kcontrol/tdm/tdm-users.cpp
@@ -48,7 +48,7 @@ extern KSimpleConfig *config;
 TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
-#ifdef __linux__
+#ifdef Q_OS_LINUX
     struct stat st;
     if (!stat( "/etc/debian_version", &st )) {	/* debian */
 	defminuid = "1000";
@@ -66,10 +66,18 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
 	defminuid = "500";
 	defmaxuid = "65000";
     }
-#else
+#elif defined(Q_OS_SOLARIS)
+    struct stat st;
+    if (stat( "/etc/dilos_version_build", &st ) == 0) { /* DilOS */
+	defminuid = "1000";
+    } else { /* other illumos distro */
+	defminuid = "100";
+    }
+    defmaxuid = "60000";
+#else /* default */
     defminuid = "1000";
     defmaxuid = "65000";
-#endif
+#endif /* default */
 
     // We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users,
     // and create them if necessary.
@@ -85,30 +93,30 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name)
 
     TQString wtstr;
 
-    minGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("System U&IDs"), this );
+    minGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("System U&IDs"), this );
     TQWhatsThis::add( minGroup, i18n("Users with a UID (numerical user identification) outside this range will not be listed by TDM and this setup dialog."
       " 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, Qt::Vertical, i18n("Users"), this );
-    connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) );
-    connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
+    usrGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("Users"), this );
+    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.") );
@@ -121,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.") );
 
@@ -132,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, Qt::Vertical, i18n("User Image Source"), this );
+    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 );
@@ -162,29 +170,29 @@ 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() );
     hlpl->addWidget( usercombo, 0, 1 );
-    hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, Qt::AlignHCenter );
-    hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, Qt::AlignHCenter );
+    hlpl->addMultiCellWidget( userbutton, 1,1, 0,1, TQt::AlignHCenter );
+    hlpl->addMultiCellWidget( rstuserbutton, 2,2, 0,1, TQt::AlignHCenter );
 
     TQHBoxLayout *main = new TQHBoxLayout( this, 10 );
 
@@ -219,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);
 }
@@ -264,7 +272,7 @@ void TDMUsersWidget::slotUserSelected()
 	rstuserbutton->setEnabled( false );
     }
     if (!p.isNull()) {
-	    userbutton->setPixmap( p.smoothScale( 48, 48, TQ_ScaleMin ) );
+	    userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) );
     }
 }
 
@@ -288,7 +296,7 @@ void TDMUsersWidget::changeUserPix(const TQString &pix)
 	return;
     }
 
-    p = p.smoothScale( 48, 48, TQ_ScaleMin );
+    p = p.smoothScale( 48, 48, TQImage::ScaleMin );
     TQString userpix = m_userPixDir + user + ".face.icon";
     if (!p.save( userpix, "PNG" ))
         KMessageBox::sorry(this,
diff --git a/kcontrol/tdm/tdm-users.h b/kcontrol/tdm/tdm-users.h
index 08c66c6f8..157f29551 100644
--- a/kcontrol/tdm/tdm-users.h
+++ b/kcontrol/tdm/tdm-users.h
@@ -39,7 +39,7 @@
 
 class TDMUsersWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDMUsersWidget( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kcontrol/usbview/CMakeLists.txt b/kcontrol/usbview/CMakeLists.txt
index d16b0049e..485afcd58 100644
--- a/kcontrol/usbview/CMakeLists.txt
+++ b/kcontrol/usbview/CMakeLists.txt
@@ -28,11 +28,12 @@ tde_create_translated_desktop(
   PO_DIR kcontrol-desktops
 )
 
-if( WITH_USBIDS )
-  set_property( SOURCE usbdb.cpp APPEND PROPERTY COMPILE_DEFINITIONS USBIDS_FILE="${WITH_USBIDS}" )
-else( )
-  install( FILES usb.ids DESTINATION ${DATA_INSTALL_DIR} )
-endif( )
+if( USE_BUILTIN_USBIDS )
+    install(
+        FILES usb.ids
+        DESTINATION ${DATA_INSTALL_DIR}
+    )
+endif( USE_BUILTIN_USBIDS )
 
 
 ##### kcm_usb (module) ##########################
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index b58647a9e..de61a61b2 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -36,7 +36,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
 
   TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
   TQGroupBox *gbox = new TQGroupBox(i18n("USB Devices"), this);
-  gbox->setColumnLayout( 0, Qt::Horizontal );
+  gbox->setColumnLayout( 0, TQt::Horizontal );
   vbox->addWidget(gbox);
 
   TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
@@ -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/kcmusb.h b/kcontrol/usbview/kcmusb.h
index eb33a475c..421129c30 100644
--- a/kcontrol/usbview/kcmusb.h
+++ b/kcontrol/usbview/kcmusb.h
@@ -23,7 +23,7 @@ class TQTextView;
 
 class USBViewer : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kcontrol/usbview/usb.ids b/kcontrol/usbview/usb.ids
index c2d3e4da9..aef0019e6 100644
--- a/kcontrol/usbview/usb.ids
+++ b/kcontrol/usbview/usb.ids
@@ -1,13 +1,16 @@
 #
 #	List of USB ID's
 #
-#	Maintained by Stephen J. Gowdy <gowdy@slac.stanford.edu>
-#	If you have any new entries, send them to the maintainer.
-#	Send entries as patches (diff -u old new).
+#	Maintained by Stephen J. Gowdy <linux.usb.ids@gmail.com>
+#	If you have any new entries, please submit them via
+#		http://www.linux-usb.org/usb-ids.html
+#	or send entries as patches (diff -u old new) in the
+#	body of your email (a bot will attempt to deal with it).
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# $Id$
+# Version: 2021.03.31
+# Date:    2021-03-31 20:34:09
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -18,21 +21,73 @@
 #		interface  interface_name		<-- two tabs
 
 0001  Fry's Electronics
+	7778  Counterfeit flash drive [Kingston]
 0002  Ingram
+	0002  passport00
 0003  Club Mac
 0004  Nebraska Furniture Mart
+0011  Unknown
+	7788  counterfeit flash drive
+0053  Planex
+	5301  GW-US54ZGL 802.11bg
+0078  Microntek
+	0006  Joystick
+0079  DragonRise Inc.
+	0006  PC TWIN SHOCK Gamepad
+	0011  Gamepad
+	1800  Mayflash Wii U Pro Game Controller Adapter [DirectInput]
+	181b  Venom Arcade Joystick
+	1843  Mayflash GameCube Controller Adapter
+	1844  Mayflash GameCube Controller
+0080  Unknown
+	a001  JMS578 based SATA bridge
+0085  Boeye Technology Co., Ltd.
+	0600  eBook Reader
+0102  miniSTREAK
+0105  Trust International B.V.
+	145f  NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
+0127  IBP
+	0002  HDM Interface
+	0127  ibp
+0145  Unknown
+	0112  Card Reader
+017c  MLK
+	145f  Trust Deskset
+0200  TP-Link
+	0201  MA180 UMTS Modem
 0204  Chipsbank Microelectronics Co., Ltd
-	6025  CBM2080 Flash drive controller
+	6025  CBM2080 / CBM2090 Flash drive controller
 	6026  CBM1180 Flash drive controller
+0218  Hangzhou Worlde
+	0301  MIDI Port
+02ad  HUMAX Co., Ltd.
+	138c  PVR Mass Storage
+0303  Mini Automation Controller
+0324  OCZ Technology Inc
+	bc06  OCZ ATV USB 2.0 Flash Drive
+	bc08  OCZ Rally2/ATV USB 2.0 Flash Drive
+0325  OCZ Technology Inc
+	ac02  ATV Turbo / Rally2 Dual Channel USB 2.0 Flash Drive
 0386  LTS
 	0001  PSX for USB Converter
+03d9  Shenzhen Sinote Tech-Electron Co., Ltd
+	0499  SE340D PC Remote Control
+03da  Bernd Walter Computer Technology
+	0002  HD44780 LCD interface
+03e7  Intel
+	2150  Myriad VPU [Movidius Neural Compute Stick]
+	2485  Movidius MyriadX
+	f63b  Myriad VPU [Movidius Neural Compute Stick]
 03e8  EndPoints, Inc.
-	0004  SE401 WebCam
+	0004  SE401 Webcam
 	0008  101 Ethernet [klsi]
+	0015  ATAPI Enclosure
 	2123  SiPix StyleCam Deluxe
+	8004  Aox 99001
 03e9  Thesys Microelectronics
 03ea  Data Broadcasting Corp.
 03eb  Atmel Corp.
+	0902  4-Port Hub
 	2002  Mass Storage Device
 	2015  at90usbkey sample firmware (HID keyboard)
 	2018  at90usbkey sample firmware (CDC ACM)
@@ -40,30 +95,109 @@
 	201c  at90usbkey sample firmware (HID mouse)
 	201d  at90usbkey sample firmware (HID generic)
 	2022  at90usbkey sample firmware (composite device)
+	2040  LUFA Test PID
+	2041  LUFA Mouse Demo Application
+	2042  LUFA Keyboard Demo Application
+	2043  LUFA Joystick Demo Application
+	2044  LUFA CDC Demo Application
+	2045  LUFA Mass Storage Demo Application
+	2046  LUFA Audio Output Demo Application
+	2047  LUFA Audio Input Demo Application
+	2048  LUFA MIDI Demo Application
+	2049  Stripe Snoop Magnetic Stripe Reader
+	204a  LUFA CDC Class Bootloader
+	204b  LUFA USB to Serial Adapter Project
+	204c  LUFA RNDIS Demo Application
+	204d  LUFA Combined Mouse and Keyboard Demo Application
+	204e  LUFA Dual CDC Demo Application
+	204f  LUFA Generic HID Demo Application
+	2060  Benito Programmer Project
+	2061  LUFA Combined Mass Storage and Keyboard Demo Application
+	2062  LUFA Combined CDC and Mouse Demo Application
+	2063  LUFA Datalogger Device
+	2064  Interfaceless Control-Only LUFA Devices
+	2065  LUFA Test and Measurement Demo Application
+	2066  LUFA Multiple Report HID Demo
+	2068  LUFA Virtual Serial/Mass Storage Demo
+	2069  LUFA Webserver Project
 	2103  JTAG ICE mkII
 	2104  AVR ISP mkII
+	2105  AVRONE!
+	2106  STK600 development board
 	2107  AVR Dragon
+	2109  STK541 ZigBee Development Board
+	210a  AT86RF230 [RZUSBSTICK] transceiver
+	210d  XPLAIN evaluation kit (CDC ACM)
+	2110  AVR JTAGICE3 Debugger and Programmer
+	2111  Xplained Pro board debugger and programmer
+	2122  XMEGA-A1 Explained evaluation kit
+	2140  AVR JTAGICE3 (v3.x) Debugger and Programmer
+	2141  ICE debugger
+	2145  ATMEGA328P-XMINI (CDC ACM)
+	2310  EVK11xx evaluation board
+	2404  The Micro
+	2fe4  ATxmega32A4U DFU bootloader
+	2fe6  Cactus V6 (DFU)
+	2fea  Cactus RF60 (DFU)
+	2fee  atmega8u2 DFU bootloader
+	2fef  atmega16u2 DFU bootloader
+	2ff0  atmega32u2 DFU bootloader
+	2ff1  at32uc3a3 DFU bootloader
+	2ff3  atmega16u4 DFU bootloader
+	2ff4  atmega32u4 DFU bootloader
+	2ff6  at32uc3b0/1 DFU bootloader
+	2ff7  at90usb82 DFU bootloader
+	2ff8  at32uc3a0/1 DFU bootloader
+	2ff9  at90usb646/647 DFU bootloader
+	2ffa  at90usb162 DFU bootloader
 	2ffb  at90usb AVR DFU bootloader
 	2ffd  at89c5130/c5131 DFU bootloader
 	2fff  at89c5132/c51snd1c DFU bootloader
-	3301  at43301 4-port Hub
-	3312  4-port Hub
+	3301  at43301 4-Port Hub
+	3312  4-Port Hub
+	4102  AirVast W-Buddie WN210
 	5601  at76c510 Prism-II 802.11b Access Point
 	5603  Cisco 7920 WiFi IP Phone
+	6119  AT91SAM CDC Demo Application
 	6124  at91sam SAMBA bootloader
-	7603  at76c503a D-Link DWL-120 802.11b Adapter
+	6127  AT91SAM HID Keyboard Demo Application
+	6129  AT91SAM Mass Storage Demo Application
+	6200  AT91SAM HID Mouse Demo Application
+	7603  D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a]
+	7604  at76c503a 802.11b Adapter
 	7605  at76c503a 802.11b Adapter
 	7606  at76c505 802.11b Adapter
 	7611  at76c510 rfmd2948 802.11b Access Point
+	7613  WL-1130 USB
+	7614  AT76c505a Wireless Adapter
+	7615  AT76C505AMX Wireless Adapter
+	7617  AT76C505AS Wireless Adapter
+	7800  Mini Album
+	800c  Airspy HF+
+	ff01  WootingOne
+	ff02  WootingTwo
+	ff07  Tux Droid fish dongle
 03ec  Iwatsu America, Inc.
 03ed  Mitel Corp.
 03ee  Mitsumi
 	0000  CD-R/RW Drive
+	2501  eHome Infrared Receiver
+	2502  eHome Infrared Receiver
+	5609  Japanese Keyboard
 	641f  WIF-0402C Bluetooth Adapter
+	6438  Bluetooth Device
 	6440  WML-C52APR Bluetooth Adapter
 	6901  SmartDisk FDD
-03f0  Hewlett-Packard
+	6902  Floppy Disk Drive
+	7500  CD-R/RW
+	ffff  Dongle with BlueCore in DFU mode
+03f0  HP, Inc
 	0004  DeskJet 895c
+	0011  OfficeJet G55
+	0012  DeskJet 1125C Printer Port
+	0024  KU-0316 Keyboard
+	002a  LaserJet P1102
+	0053  DeskJet 2620 All-in-One Printer
 	0101  ScanJet 4100c
 	0102  PhotoSmart S20
 	0104  DeskJet 880c/970c
@@ -71,177 +205,833 @@
 	0107  CD-Writer Plus
 	010c  Multimedia Keyboard Hub
 	0111  G55xi Printer/Scanner/Copier
+	0117  LaserJet 3200
 	011c  hn210w 802.11b Adapter
-	0121  HP49g+ Calculator
+	011d  Bluetooth 1.2 Interface [Broadcom BCM2035]
+	0121  HP 39g+ [F2224A], 39gs [F2223A], 40gs [F2225A], 48gII [F2226A], 49g+ [F2228A], 50g [F2229A, NW240AA]
+	0122  HID Internet Keyboard
+	0125  DAT72 Tape
+	0139  Barcode Scanner 4430
 	0201  ScanJet 6200c
 	0202  PhotoSmart S20
 	0204  DeskJet 815c
 	0205  ScanJet 3300c
 	0207  CD-Writer Plus 8200e
 	020c  Multimedia Keyboard
+	0211  OfficeJet G85
+	0212  DeskJet 1220C
+	0217  LaserJet 2200
+	0218  APOLLO P2500/2600
+	0221  StreamSmart 400 [F2235AA]
+	0223  Digital Drive Flash Reader
+	022a  Laserjet CP1525nw
+	0241  Link-5 micro dongle
 	0304  DeskJet 810c/812c
 	0305  ScanJet 4300c
+	0307  CD-Writer+ CD-4e
 	0311  OfficeJet G85xi
+	0312  Color Inkjet CP1700
+	0314  designjet 30/130 series
 	0317  LaserJet 1200
+	0324  SK-2885 keyboard
+	034a  Elite Keyboard
 	0401  ScanJet 5200c
 	0404  DeskJet 830c/832c
 	0405  ScanJet 3400cse
+	0411  OfficeJet G95
+	0412  Printing Support
 	0417  LaserJet 1200 series
+	0423  HS-COMBO Cardreader
+	042a  LaserJet M1132 MFP
+	0441  Prime [NW280AA, G8X92AA]
 	0504  DeskJet 885c
 	0505  ScanJet 2100c
+	0507  DVD+RW
 	050c  5219 Wireless Keyboard
+	0511  OfficeJet K60
+	0512  DeckJet 450
 	0517  LaserJet 1000
+	051d  Bluetooth Interface
+	052a  LaserJet M1212nf MFP
 	0601  ScanJet 6300c
 	0604  DeskJet 840c
 	0605  ScanJet 2200c
+	0610  Z24i Monitor Hub
+	0611  OfficeJet K60xi
+	0612  business inkjet 3000
+	0624  Bluetooth Dongle
+	0641  X1200 Optical Mouse
 	0701  ScanJet 5300c/5370c
 	0704  DeskJet 825c
 	0705  ScanJet 4400c
+	070c  Personal Media Drive
+	0711  OfficeJet K80
 	0712  DeskJet 1180c
+	0714  Printing Support
+	0741  Prime Wireless Kit [FOK65AA]
 	0801  ScanJet 7400c
 	0804  DeskJet 816c
+	0805  HP4470C
+	0811  OfficeJet K80xi
+	0817  LaserJet 3300
 	0901  ScanJet 2300c
 	0904  DeskJet 845c
+	0912  Printing Support
+	0917  LaserJet 3330
+	0924  Modular Smartcard Keyboard
+	0941  X500 Optical Mouse
+	094a  Optical Mouse [672662-001]
+	0a01  ScanJet 2400c
+	0a17  color LaserJet 3700
+	0b01  ScanJet 82x0C
+	0b0c  Wireless Keyboard and Optical Mouse receiver
+	0b17  LaserJet 2300d
+	0c17  LaserJet 1010
+	0c24  Bluetooth Dongle
+	0d12  OfficeJet 9100 series
+	0d17  LaserJet 1012
+	0d4a  SK-2025 Keyboard
+	0e17  LaserJet 1015
+	0f0c  Wireless Keyboard and Optical Mouse receiver
+	0f11  OfficeJet V40
+	0f12  Printing Support
+	0f17  LaserJet 1150
+	0f2a  LaserJet 400 color M451dn
+	1001  Photo Scanner 1000
+	1002  PhotoSmart 140 series
 	1004  DeskJet 970c/970cse
 	1005  ScanJet 5400c
-	1016  Jornada 548 / iPAQ HW6515 Pocket PC 
+	1011  OfficeJet V40xi
+	1016  Jornada 548 / iPAQ HW6515 Pocket PC
+	1017  LaserJet 1300
+	1024  Smart Card Keyboard
+	1027  Virtual keyboard and mouse
+	102a  LaserJet Professional P 1102w
+	1102  PhotoSmart 240 series
 	1104  DeskJet 959c
-	1105  ScanJet 5470c
+	1105  ScanJet 5470c/5490c
+	1111  OfficeJet v60
 	1116  Jornada 568 Pocket PC
-	1151  750xi Printer/Scanner/Copier
+	1117  LaserJet 1300n
+	1151  PSC-750xi Printer/Scanner/Copier
+	1198  HID-compliant mouse
+	1202  PhotoSmart 320 series
 	1204  DeskJet 930c
+	1205  ScanJet 4500C/5550C
+	1211  OfficeJet v60xi
+	1217  LaserJet 2300L
+	1227  Virtual CD-ROM
+	1302  PhotoSmart 370 series
 	1305  ScanJet 4570c
-	1312  Deskjet 460
+	1311  OfficeJet V30
+	1312  DeskJet 460
 	1317  LaserJet 1005
-	1405  Scanjet 3670
+	1327  iLO Virtual Hub
+	134a  Optical Mouse
+	1405  ScanJet 3670
+	1411  PSC 750
 	1424  f2105 Monitor Hub
+	1502  PhotoSmart 420 series
 	1504  DeskJet 920c
+	150c  Mood Lighting (Microchip Technology Inc.)
+	1511  PSC 750xi
+	1512  Printing Support
+	1517  color LaserJet 3500
+	1524  Smart Card Keyboard - KR
+	1539  Mini Magnetic Stripe Reader
+	1541  Prime [G8X92AA]
+	154a  Laser Mouse
+	1602  PhotoSmart 330 series
 	1604  DeskJet 940c
+	1605  ScanJet 5530C PhotoSmart
+	1611  psc 780
 	1617  LaserJet 3015
+	161d  Wireless Rechargeable Optical Mouse (HID)
+	1624  Smart Card Keyboard - JP
+	1702  PhotoSmart 380 series
+	1704  DeskJet 948C
+	1705  ScanJet 5590
+	1711  psc 780xi
+	1712  Printing Support
+	1717  LaserJet 3020
+	171d  Bluetooth 2.0 Interface [Broadcom BCM2045]
+	1801  Inkjet P-2000U
+	1802  PhotoSmart 470 series
+	1804  DeskJet 916C
+	1805  ScanJet 7650
+	1811  PSC 720
+	1812  OfficeJet Pro K550
+	1817  LaserJet 3030
+	181d  Bluetooth 2.0 Interface
+	1902  PhotoSmart A430 series
 	1904  DeskJet 3820
+	1911  OfficeJet V45
+	1917  LaserJet 3380
+	1a02  PhotoSmart A510 series
+	1a11  OfficeJet 5100 series
+	1a17  color LaserJet 4650
+	1b02  PhotoSmart A610 series
+	1b04  DeskJet 3810
+	1b05  ScanJet 4850C/4890C
+	1b07  Premium Starter Webcam
+	1c02  PhotoSmart A710 series
 	1c17  Color LaserJet 2550l
+	1d02  PhotoSmart A310 series
+	1d17  LaserJet 1320
+	1d24  Barcode scanner
+	1e02  PhotoSmart A320 Printer series
 	1e11  PSC-950
+	1e17  LaserJet 1160 series
+	1f02  PhotoSmart A440 Printer series
+	1f11  PSC 920
+	1f12  OfficeJet Pro K5300
+	1f17  color LaserJet 5550
+	1f1d  un2400 Gobi Wireless Modem
+	2001  Floppy
 	2002  Hub
 	2004  DeskJet 640c
 	2005  ScanJet 3570c
+	2012  OfficeJet Pro K5400
+	201d  un2400 Gobi Wireless Modem (QDL mode)
+	2039  Cashdrawer
+	2102  PhotoSmart 7345
 	2104  DeskJet 630c
+	2112  OfficeJet Pro L7500
+	211d  Sierra MC5725 [ev2210]
+	2202  PhotoSmart 7600 series
 	2205  ScanJet 3500c
+	2212  OfficeJet Pro L7600
+	2217  color LaserJet 9500 MFP
+	222a  LaserJet Pro MFP M125nw
+	2302  PhotoSmart 7600 series
 	2304  DeskJet 656c
 	2305  ScanJet 3970c
+	2311  OfficeJet d series
+	2312  OfficeJet Pro L7700
+	2317  LaserJet 4350
+	231d  Broadcom 2070 Bluetooth Combo
+	2402  PhotoSmart 7700 series
+	2404  Deskjet F2280 series
+	2405  ScanJet 4070 PhotoSmart
+	2417  LaserJet 4250
+	241d  Gobi 2000 Wireless Modem (QDL mode)
+	2424  LP1965 19" Monitor Hub
+	2441  Prime G2 [2AP18AA]
+	2502  PhotoSmart 7700 series
+	2504  DeskJet F4200 series
+	2505  ScanJet 3770
+	2512  OfficeJet Pro L7300 / Compaq LA2405 series monitor
+	2514  4-port hub
+	2517  LaserJet 2410
+	251d  Gobi 2000 Wireless Modem
+	2524  LP3065 30" Monitor Hub
+	2602  PhotoSmart A520 series
+	2605  ScanJet 3800c
+	2611  OfficeJet 7100 series
+	2617  Color LaserJet 2820 series
+	2624  Pole Display (HP522 2 x 20 Line Display)
+	2702  PhotoSmart A620 series
+	2704  DeskJet 915
+	2717  Color LaserJet 2830
+	2724  Magnetic Stripe Reader IDRA-334133-HP
+	2805  Scanjet G2710
 	2811  PSC-2100
+	2817  Color LaserJet 2840
+	2902  PhotoSmart A820 series
+	2911  PSC 2200
+	2917  LaserJet 2420
+	2a11  PSC 2150 series
+	2a17  LaserJet 2430
+	2a1d  Integrated Module with Bluetooth 2.1 Wireless technology
+	2b11  PSC 2170 series
+	2b17  LaserJet 1020
+	2b4a  Business Slim Keyboard
+	2c12  Officejet J4680
+	2c17  LaserJet 1022
+	2c24  Logitech M-UAL-96 Mouse
+	2d05  Scanjet 7000
 	2d11  OfficeJet 6110
+	2d17  Printing Support
+	2e11  PSC 1000
+	2e17  LaserJet 2600n
+	2e24  LP2275w Monitor Hub
+	2f11  PSC 1200
+	2f17  Color LaserJet 2605dn
+	2f24  LP2475w Monitor Hub
+	3002  PhotoSmart P1000
+	3004  DeskJet 980c
+	3005  ScanJet 4670v
+	3011  PSC 1100 series
+	3017  Printing Support
+	304a  Slim Keyboard
 	3102  PhotoSmart P1100 Printer w/ Card Reader
 	3104  DeskJet 960c
+	3111  OfficeJet 4100 series
+	3117  EWS 2605dtn
+	311d  Atheros AR9285 Malbec Bluetooth Adapter
+	312a  LaserJet Pro M701n
+	3202  PhotoSmart 1215
+	3207  4 GB flash drive
+	3211  OfficeJet 4105 series
+	3217  LaserJet 3050
+	3302  PhotoSmart 1218
 	3304  DeskJet 990c
+	3307  v125w Stick
+	3312  OfficeJet J6410
+	3317  LaserJet 3052
+	3402  PhotoSmart 1115
 	3404  DeskJet 6122
+	3417  LaserJet 3055
+	3502  PhotoSmart 230
 	3504  DeskJet 6127c
-	3817  LaserJet P2015 Series
+	3511  PSC 2300
+	3517  LaserJet 3390
+	354a  Slim Keyboard
+	3602  PhotoSmart 1315
+	3611  PSC 2410 PhotoSmart
+	3612  Officejet Pro 8000 A809
+	3617  Color LaserJet 2605
+	3711  PSC 2500
+	3717  EWS UPD
+	3724  Webcam
+	3802  PhotoSmart 100
+	3807  c485w Flash Drive
+	3817  LaserJet P2015 series
+	3902  PhotoSmart 130
+	3912  Officejet Pro 8500
+	3917  LaserJet P2014
+	3a02  PhotoSmart 7150
+	3a11  OfficeJet 5500 series
+	3a17  Printing Support
+	3a1d  hs2340 HSPA+ mobile broadband
+	3b02  PhotoSmart 7150~
+	3b05  Scanjet N8460
+	3b11  PSC 1300 series
+	3b17  LaserJet M1005 MFP
+	3b2a  Color LaserJet MFP M277dw
 	3c02  PhotoSmart 7350
+	3c05  Scanjet Professional 1000 Mobile Scanner
+	3c11  PSC 1358
+	3c17  EWS UPD
+	3d02  PhotoSmart 7350~
 	3d11  OfficeJet 4215
+	3d17  LaserJet P1005
+	3e02  PhotoSmart 7550
+	3e17  LaserJet P1006
+	3f02  PhotoSmart 7550~
 	3f11  PSC-1315/PSC-1317
-	4002  PhotoSmart 720 / PhotoSmart 935 (storage)
+	3f17  Laserjet P1505
+	4002  PhotoSmart 635/715/720/735/935/E337 (storage)
+	4004  CP1160
 	4102  PhotoSmart 618
+	4105  ScanJet 4370
+	4111  OfficeJet 7200 series
+	4117  LaserJet 1018
 	4202  PhotoSmart 812
+	4205  ScanJet G3010
+	4211  OfficeJet 7300 series
+	4217  EWS CM1015
 	4302  PhotoSmart 850 (ptp)
+	4305  ScanJet G3110
+	4311  OfficeJet 7400 series
+	4317  Color LaserJet CM1017
 	4402  PhotoSmart 935 (ptp)
+	4417  EWS UPD
 	4502  PhotoSmart 945 (PTP mode)
+	4505  ScanJet G4010
+	4507  External HDD
+	4511  PhotoSmart 2600
+	4512  E709n [Officejet 6500 Wireless]
+	4517  EWS UPD
+	4605  ScanJet G4050
+	4611  PhotoSmart 2700
+	4717  Color LaserJet CP1215
+	4811  PSC 1600
+	4911  PSC 2350
+	4b11  OfficeJet 6200
+	4c11  PSC 1500 series
+	4c17  EWS UPD
+	4d11  PSC 1400
+	4d17  EWS UPD
+	4e11  PhotoSmart 2570 series
+	4f11  OfficeJet 5600 (USBHUB)
+	4f17  Color LaserJet CM1312 MFP
 	5004  DeskJet 995c
+	5011  PhotoSmart 3100 series
+	5017  EWS UPD
+	5111  PhotoSmart 3200 series
+	5211  PhotoSmart 3300 series
+	5307  v165w Stick
+	5311  OfficeJet 6300
+	5312  Officejet Pro 8500A
+	5317  Color LaserJet CP2025 series
+	5411  OfficeJet 4300
+	5511  DeskJet F300 series
+	5611  PhotoSmart C3180
+	5617  LaserJet M1120 MFP
+	5711  PhotoSmart C4100 series
+	5717  LaserJet M1120n MFP
+	5811  PhotoSmart C5100 series
+	5817  LaserJet M1319f MFP
+	581d  lt4112 Gobi 4G Module Network Device
+	5911  PhotoSmart C6180
+	5912  Officejet Pro 8600
+	5a11  PhotoSmart C7100 series
+	5b11  OfficeJet J2100 series
+	5b12  Officejet Pro 8100
+	5c11  PhotoSmart C4200 Printer series
+	5c12  OfficeJet 6700
+	5c17  LaserJet P2055 series
+	5d11  PhotoSmart C5200 series
+	5e11  PhotoSmart D7400 series
 	6004  DeskJet 5550
+	6102  Hewlett Packard Digital Camera
 	6104  DeskJet 5650c
+	6117  color LaserJet 3550
 	6202  PhotoSmart 215
 	6204  DeskJet 5150c
+	6217  Color LaserJet 4700
 	6302  PhotoSmart 318/612
+	6317  Color LaserJet 4730mfp
+	632a  LaserJet M203-M206
 	6402  PhotoSmart 715 (ptp)
+	6411  PhotoSmart C8100 series
+	6417  LaserJet 5200
 	6502  PhotoSmart 120 (ptp)
+	6511  PhotoSmart C7200 series
 	6602  PhotoSmart 320
+	6611  PhotoSmart C4380 series
+	6617  LaserJet 5200L
 	6702  PhotoSmart 720 (ptp)
+	6717  Color LaserJet 3000
 	6802  PhotoSmart 620 (ptp)
+	6811  PhotoSmart D5300 series
+	6817  Color LaserJet 3800
+	6911  PhotoSmart D7200 series
+	6917  Color LaserJet 3600
 	6a02  PhotoSmart 735 (ptp)
+	6a11  PhotoSmart C6200 series
+	6a17  LaserJet 4240
 	6b02  PhotoSmart R707 (PTP mode)
+	6b11  Photosmart C4500 series
+	6c11  Photosmart C4480
+	6c17  Color LaserJet 4610
+	6f17  Color LaserJet CP6015 series
 	7004  DeskJet 3320c
 	7102  PhotoSmart 635 (PTP mode)
 	7104  DeskJet 3420c
+	7117  CM8060 Color MFP with Edgeline Technology
 	7202  PhotoSmart 43x (ptp)
 	7204  DeskJet 36xx
+	7217  LaserJet M5035 MFP
 	7302  PhotoSmart M307 (PTP mode)
 	7304  DeskJet 35xx
+	7311  Photosmart Premium C309
+	7317  LaserJet P3005
+	7404  Printing Support
+	7417  LaserJet M4345 MFP
+	7504  Printing Support
+	7517  LaserJet M3035 MFP
+	7604  DeskJet 3940
+	7611  DeskJet F2492 All-in-One
+	7617  LaserJet P3004
 	7702  PhotoSmart R817 (PTP mode)
+	7704  DeskJet D4100
+	7717  CM8050 Color MFP with Edgeline Technology
+	7804  DeskJet D1360
+	7817  Color LaserJet CP3505
+	7917  LaserJet M5025 MFP
 	7a02  PhotoSmart M415 (PTP mode)
+	7a04  DeskJet D2460
+	7a11  Photosmart B109
+	7a17  LaserJet M3027 MFP
 	7b02  PhotoSmart M23 (PTP mode)
-	8604  Deskjet 5440
+	7b17  Color LaserJet CP4005
+	7c17  Color LaserJet CM6040 series
+	7d04  DeskJet F2100 Printer series
+	7d17  Color LaserJet CM4730 MFP
+	7e04  DeskJet F4100 Printer series
+	8017  LaserJet P4515
+	8104  Printing Support
+	8117  LaserJet P4015
+	811c  Ethernet HN210E
+	8204  Printing Support
+	8207  FHA-3510 2.4GHz Wireless Optical Mobile Mouse
+	8217  LaserJet P4014
+	8317  LaserJet M9050 MFP
+	8404  DeskJet 6800 series
+	8417  LaserJet M9040 MFP
+	8504  DeskJet 6600 series
+	8604  DeskJet 5440
+	8607  Optical Mobile Mouse
+	8704  DeskJet 5940
+	8711  Deskjet 2050 J510
+	8804  DeskJet 6980 series
+	8904  DeskJet 6940 series
+	8911  Deskjet 1050 J410
+	8c07  Digital Stereo Headset
+	8c11  Deskjet F4500 series
+	9002  PhotoSmart M437
+	9102  PhotoSmart M537
+	9207  HD-4110 Webcam
+	9302  PhotoSmart R930 series
+	9402  PhotoSmart R837
+	942a  LaserJet Pro M12a
+	9502  PhotoSmart R840 series
+	952a  LaserJet Pro M12w
+	9602  PhotoSmart M730 series
+	9702  PhotoSmart R740 series
+	9802  PhotoSmart Mz60 series
+	9902  PhotoSmart M630 series
+	9a02  PhotoSmart E330 series
+	9b02  PhotoSmart M540 series
+	9b07  Portable Drive
+	9c02  PhotoSmart M440 series
 	a004  DeskJet 5850c
+	a011  Deskjet 3050A
+	a407  Wireless Optical Comfort Mouse
+	b002  PhotoSmart 7200 series
+	b102  PhotoSmart 7200 series
+	b107  v255w/c310w Flash Drive
+	b116  Webcam
+	b202  PhotoSmart 7600 series
+	b302  PhotoSmart 7600 series
+	b402  PhotoSmart 7700 series
+	b502  PhotoSmart 7700 series
+	b602  PhotoSmart 7900 series
+	b702  PhotoSmart 7900 series
+	b802  PhotoSmart 7400 series
+	b902  PhotoSmart 7800 series
+	ba02  PhotoSmart 8100 series
+	bb02  PhotoSmart 8400 series
+	bc02  PhotoSmart 8700 series
+	bd02  PhotoSmart Pro B9100 series
 	bef4  NEC Picty760
+	c002  PhotoSmart 7800 series
+	c102  PhotoSmart 8000 series
+	c111  Deskjet 1510
+	c202  PhotoSmart 8200 series
+	c211  Deskjet 2540 series
+	c302  DeskJet D2300
+	c402  PhotoSmart D5100 series
+	c502  PhotoSmart D6100 series
+	c602  PhotoSmart D7100 series
+	c702  PhotoSmart D7300 series
+	c802  PhotoSmart D5060 Printer
+	d104  Bluetooth Dongle
+	d507  39gII [NW249AA]
 	efbe  NEC Picty900
 	f0be  NEC Picty920
 	f1be  NEC Picty800
 03f1  Genoa Technology
 03f2  Oak Technology, Inc.
 03f3  Adaptec, Inc.
+	0020  AWN-8020 WLAN [Intersil PRISM 2.5]
+	0080  AVC-1100 Audio Capture
+	0083  AVC-2200 Device
+	0087  AVC-2210 Loader
+	0088  AVC-2210 Device
+	008b  AVC-2310 Loader
+	008c  AVC-2310 Device
+	0094  eHome Infrared Receiver
+	009b  AVC-1410 GameBridge TV NTSC
+	2000  USBXchange
+	2001  USBXchange Adapter
+	2002  USB2-Xchange
+	2003  USB2-Xchange Adapter
+	4000  4-port hub
+	adcc  Composite Device Support
 03f4  Diebold, Inc.
 03f5  Siemens Electromechanical
 03f8  Epson Imaging Technology Center
 03f9  KeyTronic Corp.
+	0100  KT-2001 Keyboard
+	0101  Keyboard
+	0102  Keyboard Mouse
 03fb  OPTi, Inc.
 03fc  Elitegroup Computer Systems
 03fd  Xilinx, Inc.
+	0008  Platform Cable USB II
+	0050  dfu downloader
 03fe  Farallon Comunications
 0400  National Semiconductor Corp.
+	05dc  Rigol Technologies DS1000USB Oscilloscope
 	0807  Bluetooth Dongle
+	080a  Bluetooth Device
+	09c4  Rigol Technologies DG1022 Arbitrary Waveform Generator
 	1000  Mustek BearPaw 1200 Scanner
 	1001  Mustek BearPaw 2400 Scanner
+	1237  Hub
+	a000  Smart Display Reference Device
+	c359  Logitech Harmony
+	c35b  Printing Support
+	c55d  Rigol Technologies DS5000USB Oscilloscope
 0401  National Registry, Inc.
 0402  ALi Corp.
 	5462  M5462 IDE Controller
-	5602  Video Camera Controller
-	5603  USB 2.0 Q-tec Webcam 300
-	5621  USB 2.0 Storage Device
-	5632  USB 2.0 Host-to-Host Link
-	5635  USB 2.0 Flash Card Reader
+	5602  M5602 Video Camera Controller
+	5603  M5603 Video Camera Controller
+	5606  M5606 Video Camera Controller [UVC]
+	5621  M5621 High-Speed IDE Controller
+	5623  M5623 Scanner Controller
+	5627  Welland ME-740PS USB2 3.5" Power Saving Enclosure
+	5632  M5632 Host-to-Host Link
+	5635  M5635 Flash Card Reader
 	5636  USB 2.0 Storage Device
 	5637  M5637 IDE Controller
+	5642  Storage Device
+	5661  M5661 MP3 player
+	5667  M5667 MP3 player
+	8841  Newmine Camera
+	9665  Gateway Webcam
 0403  Future Technology Devices International, Ltd
-	0000  H4SMK 7 Port Hub
-	6001  8-bit FIFO
+	0000  H4SMK 7 Port Hub / Bricked Counterfeit FT232 Serial (UART) IC
+	0232  Serial Converter
+	1060  JTAG adapter
+	1234  IronLogic RFID Adapter [Z-2 USB]
+	1235  Iron Logic Z-397 RS-485/422 converter
+	6001  FT232 Serial (UART) IC
+	6002  Lumel PD12
+	6007  Serial Converter
+	6008  Serial Converter
+	6009  Serial Converter
+	6010  FT2232C/D/H Dual UART/FIFO IC
+	6011  FT4232H Quad HS USB-UART/FIFO IC
+	6014  FT232H Single HS USB-UART/FIFO IC
+	6015  Bridge(I2C/SPI/UART/FIFO)
+	601f  Myriad-RF LimeSDR-Mini
+	6f70  HB-RF-USB
+	8028  Dev board JTAG (FT232H based)
 	8040  4 Port Hub
 	8070  7 Port Hub
+	8140  Vehicle Explorer Interface
+	8210  MGTimer - MGCC (Vic) Timing System
+	8348  FT232BM [SIENNA Serial Interface]
 	8370  7 Port Hub
 	8371  PS/2 Keyboard And Mouse
 	8372  FT8U100AX Serial Port
+	8508  Selectronic SP PRO
+	87d0  Cressi Dive Computer Interface
+	8a28  Rainforest Automation ZigBee Controller
+	8a98  TIAO Multi-Protocol Adapter
+	8b28  Alpermann+Velte TCI70
+	8b29  Alpermann+Velte TC60 CLS
+	8b2a  Alpermann+Velte Rubidium Q1
+	8b2b  Alpermann+Velte TCD
+	8b2c  Alpermann+Velte TCC70
+	9090  SNAP Stick 200
+	9132  LCD and Temperature Interface
+	9133  CallerID
+	9134  Virtual keyboard
+	9135  Rotary Pub alarm
+	9136  Pulsecounter
+	9137  Ledbutton interface
+	9e90  Marvell OpenRD Base/Client
+	9f08  CIB-1894 Conclusion SmartLink Box:
+	9f80  Ewert Energy Systems CANdapter
+	a6d0  Texas Instruments XDS100v2 JTAG / BeagleBone A3
+	a951  HCP HIT GSM/GPRS modem [Cinterion MC55i]
+	a9a0  FT2232D - Dual UART/FIFO IC - FTDI
+	abb8  Lego Mindstorms NXTCam
+	b0c0  microSensys RFID device
+	b0c1  microSensys RFID device
+	b0c2  iID contactless RFID device
+	b0c3  iID contactless RFID device
+	b0c4  RFID device
+	b0c5  RFID device
+	b810  US Interface Navigator (CAT and 2nd PTT lines)
+	b811  US Interface Navigator (WKEY and FSK lines)
+	b812  US Interface Navigator (RS232 and CONFIG lines)
+	b9b0  Fujitsu SK-16FX-100PMC V1.1
+	baf8  Amontec JTAGkey
+	bcd8  Stellaris Development Board
+	bcd9  Stellaris Evaluation Board
+	bcda  Stellaris ICDI Board
+	bd90  PICAXE Download Cable [AXE027]
+	bdc8  Egnite GmbH - JTAG/RS-232 adapter
+	bfd8  OpenDCC
+	bfd9  OpenDCC (Sniffer)
+	bfda  OpenDCC (Throttle)
+	bfdb  OpenDCC (Gateway)
+	bfdc  OpenDCC (GBM)
+	c580  HID UNIKEY dongle [F-Response]
 	c630  lcd2usb interface
+	c631  i2c-tiny-usb interface
+	c632  xu1541 c64 floppy drive interface
+	c633  TinyCrypt dongle
+	c634  glcd2usb interface
 	c7d0  RR-CirKits LocoBuffer-USB
+	c8b8  Alpermann+Velte MTD TCU
+	c8b9  Alpermann+Velte MTD TCU 1HE
+	c8ba  Alpermann+Velte Rubidium H1
+	c8bb  Alpermann+Velte Rubidium H3
+	c8bc  Alpermann+Velte Rubidium S1
+	c8bd  Alpermann+Velte Rubidium T1
+	c8be  Alpermann+Velte Rubidium D1
+	c8bf  Alpermann+Velte TC60 RLV
+	cc48  Tactrix OpenPort 1.3 Mitsubishi
+	cc49  Tactrix OpenPort 1.3 Subaru
+	cc4a  Tactrix OpenPort 1.3 Universal
+	cff8  Amontec JTAGkey
+	d010  SCS PTC-IIusb
+	d011  SCS Position-Tracker/TNC
+	d012  SCS DRAGON 1
+	d013  SCS DRAGON 1
+	d388  Xsens converter
+	d389  Xsens Wireless Receiver
+	d38a  Xsens serial converter
+	d38b  Xsens serial converter
+	d38c  Xsens Wireless Receiver
+	d38d  Xsens Awinda Station
+	d38e  Xsens serial converter
+	d38f  Xsens serial converter
+	d491  Zolix Omni 1509 monochromator
+	d578  Accesio USB-COM-4SM
+	d6f8  UNI Black BOX
+	d738  Propox JTAGcable II
+	d739  Propox ISPcable III
+	d9a9  Actisense USG-1 NMEA Serial Gateway
+	d9aa  Actisense NGT-1 NMEA2000 PC Interface
+	d9ab  Actisense NGT-1 NMEA2000 Gateway
+	daf4  Qundis Serial Infrared Head
+	e0d0  Total Phase Aardvark I2C/SPI Host Adapter
+	e521  EVER Sinline XL Series UPS
+	e6c8  PYRAMID Computer GmbH LCD
+	e700  Elster Unicom III Optical Probe
+	e729  Segway Robotic Mobility Platforms 200
+	e888  Expert ISDN Control USB
+	e889  USB-RS232 OptoBridge
+	e88a  Expert mouseCLOCK USB II
+	e88b  Precision Clock MSF USB
+	e88c  Expert mouseCLOCK USB II HBG
+	e8d8  Aaronia AG Spectran Spectrum Analyzer
+	e8dc  Aaronia AG UBBV Preamplifier
 	ea90  Eclo 1-Wire Adapter
+	ecd9  miControl miCan-Stick
+	ed71  HAMEG HO870 Serial Port
+	ed72  HAMEG HO720 Serial Port
+	ed73  HAMEG HO730 Serial Port
+	ed74  HAMEG HO820 Serial Port
+	ef10  FT1245BL
+	f070  Serial Converter 422/485 [Vardaan VEUSB422R3]
+	f0c8  SPROG Decoder Programmer
+	f0c9  SPROG-DCC CAN-USB
+	f0e9  Tagsys L-P101
+	f0ee  Tagsys Medio P200x
+	f1a0  Asix PRESTO Programmer
 	f208  Papenmeier Braille-Display
-	fc82  SEMC DSS-20 SyncStation
+	f3c0  4N-GALAXY Serial Converter
+	f458  ABACUS ELECTRICS Optical Probe
+	f608  CTI USB-485-Mini
+	f60b  CTI USB-Nano-485
+	f680  Suunto Sports Instrument
+	f758  GW Instek GDS-8x0 Oscilloscope
+	f7c0  ZeitControl Cardsystems TagTracer MIFARE
+	f850  USB-UIRT (Universal Infrared Receiver+Transmitter)
+	f918  Ant8 Logic Probe
+	fa00  Matrix Orbital USB Serial
+	fa01  Matrix Orbital MX2 or MX3
+	fa02  Matrix Orbital MX4 or MX5
+	fa03  Matrix Orbital VK/LK202 Family
+	fa04  Matrix Orbital VK/LK204 Family
+	fa20  Ross-Tech HEX-USB
+	fc08  Crystalfontz CFA-632 USB LCD
+	fc09  Crystalfontz CFA-634 USB LCD
+	fc0b  Crystalfontz CFA-633 USB LCD
+	fc0c  Crystalfontz CFA-631 USB LCD
+	fc0d  Crystalfontz CFA-635 USB LCD
+	fc82  SEMC DSS-20/DSS-25 SyncStation
 	fd48  ShipModul MiniPlex-4xUSB NMEA Multiplexer
+	fd49  ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer
+	fd4b  ShipModul MiniPlex NMEA Multiplexer
 	ff08  ToolHouse LoopBack Adapter
+	ff18  ScienceScope Logbook ML
+	ff19  Logbook Bus
+	ff1a  Logbook Bus
+	ff1b  Logbook Bus
+	ff1c  ScienceScope Logbook LS
+	ff1d  ScienceScope Logbook HS
+	ff1e  Logbook Bus
+	ff1f  Logbook Bus
 0404  NCR Corp.
-	0310 K590 Printer, Self-Service
-	0311 7167 Printer, Receipt/Slip
-	0312 7197 Printer Receipt
-	0320 5932-USB Keyboard
-	0321 5953-USB Dynakey
-	0322 5932-USB Enhanced Keyboard
-	0323 5932-USB Enhanced Keyboard, Flash-Recovery/Download
-	0324 5953-USB Enhanced Dynakey
-	0325 5953-USB Enhanced Dynakey Flash-Recovery/Download
-	0328 K016: USB-MSR ISO 3-track MSR: POS Standard (See HID pages)
-	0329 K018: USB-MSR JIS 2-Track MSR: POS Standard
-	032a K016: USB-MSR ISO 3-Track MSR: HID Keyboard Mode
-	032b K016/K018: USB-MSR Flash-Recovery/Download
+	0202  78XX Scanner
+	0203  78XX Scanner - Embedded System
+	0310  K590 Printer, Self-Service
+	0311  7167 Printer, Receipt/Slip
+	0312  7197 Printer Receipt
+	0320  5932-USB Keyboard
+	0321  5953-USB Dynakey
+	0322  5932-USB Enhanced Keyboard
+	0323  5932-USB Enhanced Keyboard, Flash-Recovery/Download
+	0324  5953-USB Enhanced Dynakey
+	0325  5953-USB Enhanced Dynakey Flash-Recovery/Download
+	0328  K016: USB-MSR ISO 3-track MSR: POS Standard (See HID pages)
+	0329  K018: USB-MSR JIS 2-Track MSR: POS Standard
+	032a  K016: USB-MSR ISO 3-Track MSR: HID Keyboard Mode
+	032b  K016/K018: USB-MSR Flash-Recovery/Download
 0405  Synopsys, Inc.
 0406  Fujitsu-ICL Computers
 0407  Fujitsu Personal Systems, Inc.
 0408  Quanta Computer, Inc.
+	0103  FV TouchCam N1 (Audio)
+	030c  HP Webcam
+	03b2  HP Webcam
+	03f4  HP Webcam
+	1030  FV TouchCam N1 (Video)
+	3000  Optical dual-touch panel
+	3001  Optical Touch Screen
+	3008  Optical Touch Screen
+	a060  HD Webcam
 0409  NEC Corp.
+	0011  PC98 Series Layout Keyboard Mouse
 	0012  ATerm IT75DSU ISDN TA
 	0014  Japanese Keyboard
+	0019  109 Japanese Keyboard with Bus-Powered Hub
+	001a  PC98 Series Layout Keyboard with Bus-Powered Hub
+	0025  Mini Keyboard with Bus-Powered Hub
 	0027  MultiSync Monitor
+	002c  Clik!-USB Drive
+	0034  109 Japanese Keyboard with One-touch start buttons
+	003f  Wireless Keyboard with One-touch start buttons
+	0040  Floppy
+	004e  SuperScript 1400 Series
+	004f  Wireless Keyboard with One-touch start buttons
+	0050  7-port hub
 	0058  HighSpeed Hub
 	0059  HighSpeed Hub
+	005a  HighSpeed Hub
 	006a  Conceptronic USB Harddisk Box
+	007d  MINICUBE2
+	007e  PG-FP5 Flash Memory Programmer
+	0081  SuperScript 1400 Series
+	0082  SuperScript 1400 Series
+	0094  Japanese Keyboard with One-touch start buttons
+	0095  Japanese Keyboard
+	00a9  AtermIT21L 128K Support Standard
+	00aa  AtermITX72 128K Support Standard
+	00ab  AtermITX62 128K Support Standard
+	00ac  AtermIT42 128K Support Standard
+	00ae  INSMATEV70G-MAX Standard
+	00af  AtermITX70 128K Support Standard
+	00b0  AtermITX80 128K Support Standard
+	00b2  AtermITX80D 128K Support Standard
+	00c0  Wireless Remocon
+	00f7  Smart Display PK-SD10
 	011d  e228 Mobile Phone
+	0193  RVT-R Writer
+	0203  HID Audio Controls
+	021d  Aterm WL54SU2 802.11g Wireless Adapter [Atheros AR5523]
+	0248  Aterm PA-WL54GU
+	0249  Aterm WL300NU-G
+	02b4  Aterm WL300NU-AG
+	02b6  Aterm WL300NU-GS 802.11n Wireless Adapter
+	02bc  Computer Monitor
+	0300  LifeTouch Note
+	0301  LifeTouch Note (debug mode)
 	55aa  Hub
 	55ab  Hub [iMac/iTouch kbd]
+	8010  Intellibase Hub
+	8011  Intellibase Hub
 	efbe  P!cty 900 [HP DJ]
 	f0be  P!cty 920 [HP DJ 812c]
 040a  Kodak Co.
@@ -259,8 +1049,10 @@
 	0140  DC-4800
 	0160  DC4800
 	0170  DX3900
+	0200  Digital Camera
 	0300  EZ-200
 	0400  MC3
+	0402  Digital Camera
 	0403  Z7590
 	0500  DX3500
 	0510  DX3600
@@ -293,35 +1085,238 @@
 	057e  C300
 	057f  DX7590
 	0580  Z730
+	0581  Digital Camera
+	0582  Digital Camera
+	0583  Digital Camera
 	0584  CX6445
+	0585  Digital Camera
 	0586  CX7525
+	0587  Digital Camera
+	0588  Digital Camera
 	0589  EasyShare C360
 	058a  C310
+	058b  Digital Camera
 	058c  C330
 	058d  C340
 	058e  V530
 	058f  V550
+	0590  Digital Camera
+	0591  Digital Camera
+	0592  Digital Camera
+	0593  Digital Camera
+	0594  Digital Camera
+	0595  Digital Camera
+	0596  Digital Camera
+	0597  Digital Camera
+	0598  EASYSHARE M1033 digital camera
+	0599  Digital Camera
+	059a  Digital Camera
+	059b  Digital Camera
+	059c  Digital Camera
+	059d  Digital Camera
+	059e  Digital Camera
+	059f  Digital Camera
+	05a0  Digital Camera
+	05a1  Digital Camera
+	05a2  Digital Camera
+	05a3  Digital Camera
+	05a4  Digital Camera
+	05a5  Digital Camera
+	05a6  Digital Camera
+	05a7  Digital Camera
+	05a8  Digital Camera
+	05a9  Digital Camera
+	05aa  Digital Camera
+	05ab  Digital Camera
+	05ac  Digital Camera
+	05ad  Digital Camera
+	05ae  Digital Camera
+	05af  Digital Camera
+	05b0  Digital Camera
+	05b1  Digital Camera
+	05b2  Digital Camera
+	05b3  EasyShare Z710 Camera
+	05b4  Digital Camera
+	05b5  Digital Camera
+	05b6  Digital Camera
+	05b7  Digital Camera
+	05b8  Digital Camera
+	05b9  Digital Camera
+	05ba  Digital Camera
+	05bb  Digital Camera
+	05bc  Digital Camera
+	05bd  Digital Camera
+	05be  Digital Camera
+	05bf  Digital Camera
+	05c0  Digital Camera
+	05c1  Digital Camera
+	05c2  Digital Camera
+	05c3  Digital Camera
+	05c4  Digital Camera
+	05c5  Digital Camera
+	05c8  EASYSHARE Z1485 IS Digital Camera
+	05d3  EasyShare M320 Camera
+	05d4  EasyShare C180 Digital Camera
+	1001  EasyShare SV811 Digital Picture Frame
+	4000  InkJet Color Printer
+	4021  Photo Printer 6800
+	4022  1400 Digital Photo Printer
+	402b  Photo Printer 6850
+	402e  605 Photo Printer
+	4034  805 Photo Printer
+	4035  7000 Photo Printer
+	4037  7010 Photo Printer
+	4038  7015 Photo Printer
+	404d  8810 Photo Printer
+	404f  305 Photo Printer
+	4056  ESP 7200 Series AiO
+	4109  EasyShare Printer Dock Series 3
+	410d  EasyShare G600 Printer Dock
 	5010  Wireless Adapter
+	5012  DBT-220 Bluetooth Adapter
+	6001  i30
+	6002  i40
+	6003  i50
+	6004  i60
+	6005  i80
+	6029  i900
+	602a  i900
 040b  Weltrend Semiconductor
+	0a68  Func MS-3 gaming mouse [WT6573F MCU]
+	2000  wired Keyboard [Dynex DX-WRK1401]
+	2367  Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad]
 	6510  Weltrend Bar Code Reader
-	6520  XBOX Xploder
+	6520  Xploder Xbox Memory Unit (8MB)
+	6533  Speed-Link Competition Pro
+	6543  Manhattan Magnetic Card Strip Reader
 040c  VTech Computers, Ltd
 040d  VIA Technologies, Inc.
+	3184  VNT VT6656 USB-802.11 Wireless LAN Adapter
+	340f  Audinst HUD-mx2
 	6205  USB 2.0 Card Reader
 040e  MCCI
 040f  Echo Speech Corp.
-0411  MelCo., Inc.
+0411  BUFFALO INC. (formerly MelCo., Inc.)
 	0001  LUA-TX Ethernet [pegasus]
+	0005  LUA-TX Ethernet
+	0006  WLI-USB-L11 Wireless LAN Adapter
+	0009  LUA2-TX Ethernet
+	000b  WLI-USB-L11G-WR Wireless LAN Adapter
+	000d  WLI-USB-L11G Wireless LAN Adapter
+	0012  LUA-KTX Ethernet
+	0013  USB2-IDE Adapter
 	0016  WLI-USB-S11 802.11b Adapter
+	0018  USB2-IDE Adapter
+	001c  USB-IDE Bridge: DUB-PxxG
 	0027  WLI-USB-KS11G 802.11b Adapter
+	002a  SMSC USB97C202 "HD-HB300V2-EU"
+	003d  LUA-U2-KTX Ethernet
+	0044  WLI-USB-KB11 Wireless LAN Adapter
+	004b  WLI-USB-G54 802.11g Adapter [Broadcom 4320 USB]
+	004d  WLI-USB-B11 Wireless LAN Adapter
+	0050  WLI2-USB2-G54 Wireless LAN Adapter
+	005e  WLI-U2-KG54-YB WLAN
+	0065  Python2 WDM Encoder
+	0066  WLI-U2-KG54 WLAN
+	0067  WLI-U2-KG54-AI WLAN
+	006e  LUA-U2-GT 10/100/1000 Ethernet Adapter
+	0089  RUF-C/U2 Flash Drive
+	008b  Nintendo Wi-Fi
+	0091  WLI-U2-KAMG54 Wireless LAN Adapter
+	0092  WLI-U2-KAMG54 Bootloader
+	0097  WLI-U2-KG54-BB
+	00a9  WLI-U2-AMG54HP Wireless LAN Adapter
+	00aa  WLI-U2-AMG54HP Bootloader
+	00b3  PC-OP-RS1 RemoteStation
+	00bc  WLI-U2-KG125S 802.11g Adapter [Broadcom 4320 USB]
+	00ca  802.11n Network Adapter
+	00cb  WLI-U2-G300N 802.11n Adapter
+	00d8  WLI-U2-SG54HP
+	00d9  WLI-U2-G54HP
+	00da  WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B]
+	00db  External Hard Drive HD-PF32OU2 [Buffalo Ministation]
+	00e8  WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]
+	00f9  Portable DVD Writer (DVSM-PL58U2)
+	0105  External Hard Drive HD-CEU2 [Drive Station]
+	012c  SATA Bridge
+	012e  WLI-UC-AG300N Wireless LAN Adapter
+	0148  WLI-UC-G300HP Wireless LAN Adapter
+	0150  WLP-UC-AG300 Wireless LAN Adapter
+	0157  External Hard Drive HD-PEU2
+	0158  WLI-UC-GNHP Wireless LAN Adapter
+	015d  WLI-UC-GN Wireless LAN Adapter [Ralink RT3070]
+	016f  WLI-UC-G301N Wireless LAN Adapter [Ralink RT3072]
+	017f  Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
+	019e  WLI-UC-GNP Wireless LAN Adapter
+	01a1  MiniStation Metro
+	01a2  WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070]
+	01ba  SATA Bridge
+	01dc  Ultra-Slim Portable DVD Writer (DVSM-PC58U2V)
+	01de  External Hard Drive HD-PCTU3 [Buffalo MiniStation]
+	01ea  SATA Bridge
+	01ee  WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070]
+	01f1  SATA Adapter [HD-LBU3]
+	01fd  WLI-UC-G450 Wireless LAN Adapter
+	027e  HD-LCU3
 0412  Award Software International
 0413  Leadtek Research, Inc.
+	1310  WinFast TV - NTSC + FM
+	1311  WinFast TV - NTSC + MTS + FM
+	1312  WinFast TV - PAL BG + FM
+	1313  WinFast TV - PAL BG+TXT + FM
+	1314  WinFast TV Audio - PHP PAL I
+	1315  WinFast TV Audio - PHP PAL I+TXT
+	1316  WinFast TV Audio - PHP PAL DK
+	1317  WinFast TV Audio - PHP PAL DK+TXT
+	1318  WinFast TV - PAL I/DK + FM
+	1319  WinFast TV - PAL N + FM
+	131a  WinFast TV Audio - PHP SECAM LL
+	131b  WinFast TV Audio - PHP SECAM LL+TXT
+	131c  WinFast TV Audio - PHP SECAM DK
+	131d  WinFast TV - SECAM DK + TXT + FM
+	131e  WinFast TV - NTSC Japan + FM
+	1320  WinFast TV - NTSC
+	1321  WinFast TV - NTSC + MTS
+	1322  WinFast TV - PAL BG
+	1323  WinFast TV - PAL BG+TXT
+	1324  WinFast TV Audio - PHP PAL I
+	1325  WinFast TV Audio - PHP PAL I+TXT
+	1326  WinFast TV Audio - PHP PAL DK
+	1327  WinFast TV Audio - PHP PAL DK+TXT
+	1328  WinFast TV - PAL I/DK
+	1329  WinFast TV - PAL N
+	132a  WinFast TV Audio - PHP SECAM LL
+	132b  WinFast TV Audio - PHP SECAM LL+TXT
+	132c  WinFast TV Audio - PHP SECAM DK
+	132d  WinFast TV - SECAM DK + TXT
+	132e  WinFast TV - NTSC Japan
+	6023  EMP Audio Device
+	6024  WinFast PalmTop/Novo TV Video
 	6025  WinFast DTV Dongle (cold state)
 	6026  WinFast DTV Dongle (warm state)
+	6029  WinFast DTV Dongle Gold
+	6125  WinFast DTV Dongle
+	6126  WinFast DTV Dongle BDA Driver
+	6a03  RTL2832 [WinFast DTV Dongle Mini]
 	6f00  WinFast DTV Dongle (STK7700P based)
 0414  Giga-Byte Technology Co., Ltd
 0416  Winbond Electronics Corp.
+	0035  W89C35 802.11bg WLAN Adapter
+	0101  Hub
 	0961  AVL Flash Card Reader
+	3810  Smart Card Controller
+	3811  Generic Controller - Single interface
+	3812  Smart Card Controller_2Interface
+	3813  Panel Display
+	5011  Virtual Com Port
+	511b  Nuvoton Nu-Link1 ICE
+	511c  Nuvoton Nu-Link1 ICE
+	511d  Nuvoton Nu-Link1 ICE/VCOM
+	511e  Nuvoton Nu-Link1 MSC/VCOM
+	5200  Nuvoton Nu-Link2-ME ICE/MSC/VCOM
+	5201  Nuvoton Nu-Link2-Pro ICE/MSC/VCOM
+	5210  Nuvoton Nu-Link2 MSC FW UPGRADE
+	5211  Nuvoton Nu-Link2 HID FW UPGRADE
 	5518  4-Port Hub
 	551a  PC Sync Keypad
 	551b  PC Async Keypad
@@ -330,240 +1325,919 @@
 	551e  Keyboard
 	551f  Keyboard w/ Sys and Media
 	5521  Keyboard
-	7723  SD Card Reader
 	6481  16-bit Scanner
+	7721  Memory Stick Reader/Writer
+	7722  Memory Stick Reader/Writer
+	7723  SD Card Reader
+	c141  Barcode Scanner
 0417  Symbios Logic
 0418  AST Research
 0419  Samsung Info. Systems America, Inc.
-	0001  IrDA Remote Controller
+	0001  IrDA Remote Controller / Creative Cordless Mouse
+	0600  Desktop Wireless 6000
+	2694  Laila
 	3001  Xerox P1202 Laser Printer
-	8002  SyncMaster 757DFX HID Device
+	3003  Olivetti PG L12L
+	3201  Docuprint P8ex
+	3404  SCX-5x12 series
+	3406  MFP 830 series
+	3407  ML-912
+	3601  InkJet Color Printer
+	3602  InkJet Color Printer
+	4602  Remote NDIS Network Device
+	8001  Hub
+	8002  SyncMaster HID Monitor Control
+	aa03  SDAS-3 MP3 Player
 041a  Phoenix Technologies, Ltd
 041b  d'TV
 041d  S3, Inc.
 041e  Creative Technology, Ltd
+	0414  HS-720 Headset
 	1002  Nomad II
 	1003  Blaster GamePad Cobra
 	1050  GamePad Cobra
+	1053  Mouse Gamer HD7600L
+	200c  MuVo V100
+	2020  Zen X-Fi 2
+	2029  ZiiO
+	2801  Prodikeys PC-MIDI multifunction keyboard
+	3000  SoundBlaster Extigy
+	3002  SB External Composite Device
 	3010  SoundBlaster MP3+
+	3014  SB External Composite Device
+	3015  Sound Blaster Digital Music LX
 	3020  SoundBlaster Audigy 2 NX
-	4003  VideoBlaster WebCam Go Plus [W9967CF]
+	3030  SB External Composite Device
+	3040  SoundBlaster Live! 24-bit External SB0490
+	3060  Sound Blaster Audigy 2 ZS External
+	3061  SoundBlaster Audigy 2 ZS Video Editor
+	3090  Sound Blaster Digital Music SX
+	30d0  Xmod
+	30d3  Sound Blaster Play!
+	3100  IR Receiver (SB0540)
+	3121  WoW tap chat
+	3220  Sound Blaster Tactic(3D) Sigma sound card
+	3232  Sound Blaster Premium HD [SBX]
+	3237  SB X-Fi Surround 5.1 Pro
+	3241  Sound Blaster JAM
+	3263  SB X-Fi Surround 5.1 Pro
+	3f00  E-Mu Xboard 25 MIDI Controller
+	3f02  E-Mu 0202
+	3f04  E-Mu 0404
+	3f07  E-Mu Xmidi 1x1
+	3f0e  Xmidi 1x1 Tab
+	4003  VideoBlaster Webcam Go Plus [W9967CF]
 	4004  Nomad II MG
-	4005  WebCam Blaster Go ES
+	4005  Webcam Blaster Go ES
 	4007  Go Mini
 	400a  PC-Cam 300
 	400b  PC-Cam 600
-	400c  WebCam 5 [pwc]
-	400d  WebCam PD1001
-	4011  WebCam PRO eX
+	400c  Webcam 5 [pwc]
+	400d  Webcam PD1001
+	400f  PC-CAM 550 (Composite)
+	4011  Webcam PRO eX
 	4012  PC-CAM350
 	4013  PC-Cam 750
 	4015  CardCam Value
 	4016  CardCam
-	4017  WebCam Mobile
-	4018  WebCam Vista
-	401c  WebCam NX [PD1110]
-	401d  WebCam NX Ultra
-	401e  WebCam NX Pro
-	401f  Webcam Notebook
+	4017  Webcam Mobile [PD1090]
+	4018  Webcam Vista [PD1100]
+	4019  Audio Device
+	401a  Webcam Vista [PD1100]
+	401c  Webcam NX [PD1110]
+	401d  Webcam NX Ultra
+	401e  Webcam NX Pro
+	401f  Webcam Notebook [PD1171]
+	4020  Webcam NX
+	4021  Webcam NX Ultra
+	4022  Webcam NX Pro
 	4028  Vista Plus cam [VF0090]
+	4029  Webcam Live!
+	402f  DC-CAM 3000Z
+	4034  Webcam Instant
+	4035  Webcam Instant
 	4036  Webcam Live!/Live! Pro
-	403a  WebCam NX Pro 2
-	403c  WebCam Live! Ultra
-	403d  WebCam Notebook Ultra
+	4037  Webcam Live!
+	4038  ORITE CCD Webcam [PC370R]
+	4039  Webcam Live! Effects
+	403a  Webcam NX Pro 2
+	403b  Creative Webcam Vista [VF0010]
+	403c  Webcam Live! Ultra
+	403d  Webcam Notebook Ultra
+	403e  Webcam Vista Plus
+	4041  Webcam Live! Motion
+	4043  Vibra Plus Webcam
+	4045  Live! Cam Voice
+	4049  Live! Cam Voice
+	4051  Live! Cam Notebook Pro [VF0250]
+	4052  Live! Cam Vista IM
+	4053  Live! Cam Video IM
+	4054  Live! Cam Video IM
+	4055  Live! Cam Video IM Pro
+	4056  Live! Cam Video IM Pro
+	4057  Live! Cam Optia
+	4058  Live! Cam Optia AF
+	405f  WebCam Vista (VF0330)
+	4061  Live! Cam Notebook Pro [VF0400]
+	4063  Live! Cam Video IM Pro
+	4068  Live! Cam Notebook [VF0470]
+	406c  Live! Cam Sync [VF0520]
+	4083  Live! Cam Socialize [VF0640]
+	4087  Live! Cam Socialize HD 1080 [VF0680]
+	4088  Live! Cam Chat HD [VF0700]
+	4095  Live! Cam Sync HD [VF0770]
+	4097  Live! Cam Chat HD [VF0700]
 	4100  Nomad Jukebox 2
 	4101  Nomad Jukebox 3
+	4102  NOMAD MuVo^2
 	4106  Nomad MuVo
+	4107  NOMAD MuVo
 	4108  Nomad Jukebox Zen
 	4109  Nomad Jukebox Zen NX
 	410b  Nomad Jukebox Zen USB 2.0
 	410c  Nomad MuVo NX
+	410f  NOMAD MuVo^2 (Flash)
 	4110  Nomad Jukebox Zen Xtra
 	4111  Dell Digital Jukebox
 	4116  MuVo^2
 	4117  Nomad MuVo TX
 	411b  Zen Touch
+	411c  Nomad MuVo USB 2.0
 	411d  Zen
 	411e  Zen Micro
+	4120  Nomad MuVo TX FM
 	4123  Zen Portable Media Center
+	4124  MuVo^2 FM (uHDD)
 	4126  Dell DJ (2nd gen)
 	4127  Dell DJ
+	4128  NOMAD Jukebox Zen Xtra (mtp)
 	412b  MuVo N200 with FM radio
+	412f  Dell Digital Jukebox 2.Gen
 	4130  Zen Micro (mtp)
-	4131  Zen Touch (mtp)
+	4131  DAP-HD0014 [Zen Touch] (MTP)
+	4133  Mass Storage Device
 	4134  Zen Neeon
 	4136  Zen Sleek
 	4137  Zen Sleek (mtp)
 	4139  Zen Nano Plus
 	413c  Zen MicroPhoto
+	4150  Zen V (MTP)
+	4151  Zen Vision:M (mtp)
+	4152  Zen V Plus
+	4153  Zen Vision W
+	4154  Zen Stone
+	4155  Zen Stone plus
+	4157  Zen (MTP)
+	500f  Broadband Blaster 8012U-V
+	5015  TECOM Bluetooth Device
+	ffff  Webcam Live! Ultra
 041f  LCS Telegraphics
 0420  Chips and Technologies
+	1307  Celly SIM Card Reader
 0421  Nokia Mobile Phones
+	0001  E61i (PC Suite mode)
+	0018  6288 GSM Smartphone
+	0019  6288 GSM Smartphone (imaging mode)
+	001a  6288 GSM Smartphone (file transfer mode)
+	0024  5610 XpressMusic (Storage mode)
+	0025  5610 XpressMusic (PC Suite mode)
+	0028  5610 XpressMusic (Imaging mode)
+	002d  6120 Phone (Mass storage mode)
+	002e  6120 Phone (Media-Player mode)
+	002f  6120 Phone (PC-Suite mode)
+	0042  E51 (PC Suite mode)
+	0064  3109c GSM Phone
+	006b  5310 Xpress Music (PC Suite mode)
+	006c  5310 Xpress music (Storage mode)
+	006d  N95 (Storage mode)
+	006e  N95 (Multimedia mode)
+	006f  N95 (Printing mode)
+	0070  N95 (PC Suite mode)
+	0096  N810 Internet Tablet
+	00aa  E71 (Mass storage mode)
+	00ab  E71 (PC Suite mode)
+	00e4  E71 (Media transfer mode)
+	0103  ADL Flashing Engine AVALON Parent
+	0104  ADL Re-Flashing Engine Parent
+	0105  Nokia Firmware Upgrade Mode
+	0106  ROM Parent
+	010d  E75 (Storage Mode)
+	010e  E75 (PC Suite mode)
+	010f  E75 (Media transfer mode)
+	0110  E75 (Imaging Mode)
+	0154  5800 XpressMusic (PC Suite mode)
+	0155  5800 XpressMusic (Multimedia mode)
+	0156  5800 XpressMusic (Storage mode)
+	0157  5800 XpressMusic (Imaging mode)
+	0189  N810 Internet Tablet WiMAX
+	0199  6700 Classic (msc)
+	019a  6700 Classic (PC Suite)
+	019b  6700 Classic (mtp)
+	01b0  6303 classic Phone (PC Suite mode)
+	01b1  6303 classic Phone (Mass storage mode)
+	01b2  6303 classic Phone (Printing and media mode)
+	01c7  N900 (Storage Mode)
+	01c8  N900/N950 (PC-Suite Mode)
+	0228  5530 XpressMusic
+	023a  6730 Classic
+	026a  N97 (mass storage)
+	026b  N97 (Multimedia)
+	026c  N97 (PC Suite)
+	026d  N97 (Pictures)
+	0295  660i/6600i Slide Phone (Mass Storage)
+	0297  660i/6600i Slide Phone (Still Image)
+	02e1  5230 (Storage mode)
+	02e2  5230 (Multimedia mode)
+	02e3  5230 (PC-Suite mode)
+	02e4  5230 (Imaging mode)
+	0360  C1-01 Ovi Suite Mode
+	0396  C7-00 (Modem mode)
+	03a4  C5 (Storage mode)
+	03c0  C7-00 (Mass storage mode)
+	03c1  C7-00 (Media transfer mode)
+	03c2  Sim
+	03cd  C7-00 (Nokia Suite mode)
+	03d1  N950 (Storage Mode)
+	03d2  N950 (PC Suite mode)
+	0400  7600 Phone Parent
 	0401  6650 GSM Phone
+	0402  6255 Phone Parent
+	0404  5510
 	0405  9500 GSM Communicator
+	0407  Music Player HDR-1(tm)
 	040b  N-Gage GSM Phone
+	040d  6620 Phone Parent
+	040e  6651 Phone Parent
 	040f  6230 GSM Phone
 	0410  6630 Imaging Smartphone
+	0411  7610 Phone Parent
+	0413  6260 Phone Parent
+	0414  7370
 	0415  9300 GSM Smartphone
-	0418  E-70 (PC-Suite mode)
+	0416  6170 Phone Parent
+	0417  7270 Phone Parent
+	0418  E70 (PC Suite mode)
+	0419  E60 (PC Suite mode)
 	041a  9500 GSM Communicator (RNDIS)
 	041b  9300 GSM Smartphone (RNDIS)
-	041e  Nokia 6680
-	0429  6230i Camera Phone
-	0431  770 Internet Tablet
-	0435  E-70 (IP Passthrough/RNDIS mode)
-	043a  Nokia N70 USB Phone Parent
+	041c  7710 Phone Parent
+	041d  6670 Phone Parent
+	041e  6680
+	041f  6235 Phone Parent
+	0421  3230 Phone Parent
+	0422  6681 Phone Parent
+	0423  6682 Phone Parent
+	0428  6230i Modem
+	0429  6230i MultiMedia Card
+	0431  770/N800 Internet Tablet
+	0432  N90 Phone Parent
+	0435  E70 (IP Passthrough/RNDIS mode)
+	0436  E60 (IP Passthrough/RNDIS mode)
+	0437  6265 Phone Parent
+	043a  N70 USB Phone Parent
+	043b  3155 Phone Parent
+	043c  6155 Phone Parent
+	043d  6270 Phone Parent
+	0443  N70 Phone Parent
+	0444  N91
+	044c  NM850iG Phone Parent
+	044d  E61 (PC Suite mode)
+	044e  E61 (Data Exchange mode)
+	044f  E61 (IP Passthrough/RNDIS mode)
+	0453  9300 Phone Parent
+	0456  6111 Phone Parent
+	0457  6111 Phone (Printing mode)
+	045a  6280 Phone Parent
+	045d  6282 Phone Parent
+	046e  6110 Navigator
+	0471  6110 Navigator
+	0485  MTP Device
+	04b9  5300
+	04bc  5200 (Nokia mode)
+	04bd  5200 (Storage mode)
+	04be  5200 (MTP mode)
+	04c3  N800 Internet Tablet
+	04ce  E90 Communicator (PC Suite mode)
+	04cf  E90 Communicator (Storage mode)
+	04f0  Nokia N95 (PC Suite mode)
+	04f9  6300 (PC Suite mode)
+	0508  E65 (PC Suite mode)
+	0509  E65 (Storage mode)
+	0518  N9 (Storage mode)
+	0519  N9 (RNDIS/Ethernet mode)
+	051a  N9 (PC Suite mode)
+	054d  C2-01
+	0600  Digital Pen SU-1B
+	0610  CS-15 (Internet Stick 3G modem)
+	0661  Lumia 620/920
+	0662  301 Dual SIM (Mass Storage)
+	0663  301 Dual SIM
+	069a  130 [RM-1035] (Charging only)
+	06fc  Lumia 640 Phone
+	0720  X (RM-980)
 	0800  Connectivity Cable DKU-5
+	0801  Data Cable DKU-6
+	0802  CA-42 Phone Parent
 0422  ADI Systems, Inc.
 0423  Computer Access Technology Corp.
 	000a  NetMate Ethernet
 	000c  NetMate2 Ethernet
 	000d  USB Chief Analyzer
+	0100  Generic Universal Protocol Analyzer
+	0101  UPA USBTracer
+	0200  Generic 10K Universal Protocol Analyzer
+	020a  PETracer ML
+	0300  Generic Universal Protocol Analyzer
+	0301  2500H Tracer Trainer
+	030a  PETracer x1
 	1237  Andromeda Hub
-0424  Standard Microsystems Corp.
+0424  Microchip Technology, Inc. (formerly SMSC)
+	0001  Integrated Hub
+	0140  LPC47M14x hub
+	0acd  Sitecom Internal Multi Memory reader/writer MD-005
+	0fdc  Floppy
+	10cd  Sitecom Internal Multi Memory reader/writer MD-005
+	2020  USB Hub
+	20cd  Sitecom Internal Multi Memory reader/writer MD-005
 	20fc  6-in-1 Card Reader
+	2134  Hub
+	2228  9-in-2 Card Reader
 	223a  8-in-1 Card Reader
+	2503  USB 2.0 Hub
+	2507  hub
+	2512  USB 2.0 Hub
+	2513  2.0 Hub
+	2514  USB 2.0 Hub
+	2517  Hub
 	2524  USB MultiSwitch Hub
+	2602  USB 2.0 Hub
+	2640  USB 2.0 Hub
+	2660  Hub
+	2744  Hub
+	274d  HTC Hub Controller
+	2807  Hub
+	3fc7  RME Babyface audio system
+	3fcc  RME MADIface
+	4041  Hub and media card controller
+	4060  Ultra Fast Media Reader
+	4064  Ultra Fast Media Reader
+	4712  USB4712 high-speed hub
+	4713  USB4715 high-speed hub (2 ports disabled)
+	4714  USB4715 high-speed hub (1 port disabled)
+	4715  USB4715 high-speed hub
+	4910  USB491x hub integrated functions (primary)
+	4912  USB4912 high-speed hub (1 port disabled)
+	4914  USB4914 high-speed hub
+	4916  USB4916 high-speed hub
+	4920  USB491x hub integrated functions (secondary)
+	4925  USB4925 high-speed hub (primary upstream)
+	4927  USB4927 high-speed hub (primary upstream)
+	4931  USB4925/4927 high-speed hub (secondary upstream)
+	4940  USB47xx/49xx hub integrated WinUSB
+	4942  USB47xx/49xx hub integrated I2S audio port
+	4943  USB47xx/49xx hub integrated I2S audio + HID port
+	4944  USB47xx/49xx hub integrated serial port
+	4946  USB47xx/49xx hub integrated serial + I2S audio port
+	4947  USB47xx/49xx hub integrated serial + I2S audio + HID port
+	494a  USB47xx/49xx hub integrated WinUSB + I2S audio port
+	494b  USB47xx/49xx hub integrated WinUSB + I2S audio + HID port
+	494c  USB47xx/49xx hub integrated WinUSB + serial port
+	494e  USB47xx/49xx hub integrated WinUSB + serial + I2S audio port
+	494f  USB47xx/49xx hub integrated WinUSB + serial + I2S audio + HID port
+	5434  Hub
+	5534  Hub
+	5744  Hub
+	5807  Hub
+	7500  LAN7500 Ethernet 10/100/1000 Adapter
+	9500  LAN9500/LAN9500i
+	9512  SMC9512/9514 USB Hub
+	9514  SMC9514 Hub
+	9904  LAN9512/LAN9514 Ethernet 10/100 Adapter (SAL10)
+	9e00  LAN9500A/LAN9500Ai
+	a700  2 Port Hub
+	ec00  SMSC9512/9514 Fast Ethernet Adapter
 0425  Motorola Semiconductors HK, Ltd
 	0101  G-Tech Wireless Mouse & Keyboard
+	f102  G-Tech U+P Wireless Mouse
 0426  Integrated Device Technology, Inc.
+	0426  WDM Driver
 0427  Motorola Electronics Taiwan, Ltd
 0428  Advanced Gravis Computer Tech, Ltd
 	4001  GamePad Pro
 0429  Cirrus Logic
 042a  Ericsson Austrian, AG
 042b  Intel Corp.
+	9316  8x931Hx Customer Hub
 042c  Innovative Semiconductors, Inc.
 042d  Micronics
 042e  Acer, Inc.
+	0380  MP3 Player
 042f  Molex, Inc.
 0430  Sun Microsystems, Inc.
+	0002  109 Keyboard
 	0005  Type 6 Keyboard
+	000a  109 Japanese Keyboard
+	000b  109 Japanese Keyboard
+	0082  109 Japanese Keyboard
+	0083  109 Japanese Keyboard
+	00a2  Type 7 Keyboard
 	0100  3-button Mouse
+	0502  Panasonic CF-19 HID Touch Panel
+	100e  24.1" LCD Monitor v4 / FID-638 Mouse
+	36ba  Bus Powered Hub
+	a101  remote key/mouse for P3 chip
+	a102  remote key/mouse/storage for P3 chip
+	a103  remote storage for P3 chip
+	a111  remote keyboard for P4 chip
+	a112  remote mouse for P4 chip
+	a113  remote storage for P4 chip
+	a4a2  Ethernet (RNDIS and CDC ethernet)
+	cdab  Raritan KVM dongle
 0431  Itac Systems, Inc.
 	0100  Mouse-Trak 3-button Track Ball
 0432  Unisys Corp.
+	0031  Document Processor
 0433  Alps Electric, Inc.
 	1101  IBM Game Controller
+	abab  Keyboard
 0434  Samsung Info. Systems America, Inc.
 0435  Hyundai Electronics America
 0436  Taugagreining HF
+	0005  CameraMate (DPCM_USB)
 0437  Framatome Connectors USA
 0438  Advanced Micro Devices, Inc.
+	7900  Root Hub
 0439  Voice Technologies Group
 043d  Lexmark International, Inc.
+	0001  Laser Printer
 	0002  Optra E310 Printer
+	0003  Laser Printer
+	0004  Laser Printer
+	0005  Laser Printer
+	0006  Laser Printer
+	0007  Laser Printer
+	0008  Inkjet Color Printer
 	0009  Optra S2450 Printer
+	000a  Laser Printer
+	000b  Inkjet Color Printer
 	000c  Optra E312 Printer
+	000d  Laser Printer
+	000e  Laser Printer
+	000f  Laser Printer
+	0010  Laser Printer
+	0011  Laser Printer
+	0012  Inkjet Color Printer
+	0013  Inkjet Color Printer
+	0014  InkJet Color Printer
+	0015  InkJet Color Printer
+	0016  Z12 Color Jetprinter
 	0017  Z32 printer
 	0018  Z52 Printer
+	0019  Forms Printer
 	001a  Z65 Printer
+	001b  InkJet Photo Printer
 	001c  Kodak Personal Picture Maker 200 Printer
+	001d  InkJet Color Printer
+	001e  InkJet Photo Printer
 	001f  Kodak Personal Picture Maker 200 Card Reader
 	0020  Z51 Printer
 	0021  Z33 Printer
+	0022  InkJet Color Printer
+	0023  Laser Printer
+	0024  Laser Printer
+	0025  InkJet Color Printer
+	0026  InkJet Color Printer
+	0027  InkJet Color Printer
+	0028  InkJet Color Printer
+	0029  Scan Print Copy
+	002a  Scan Print Copy
+	002b  Scan Print Copy
+	002c  Scan Print Copy
 	002d  X70/X73 Scan/Print/Copy
+	002e  Scan Print Copy
+	002f  Scan Print Copy
+	0030  Scan Print Copy
+	0031  Scan Print Copy
+	0032  Scan Print Copy
+	0033  Scan Print Copy
+	0034  Scan Print Copy
+	0035  Scan Print Copy
+	0036  Scan Print Copy
+	0037  Scan Print Copy
+	0038  Scan Print Copy
+	0039  Scan Print Copy
+	003a  Scan Print Copy
+	003b  Scan Print Copy
+	003c  Scan Print Copy
 	003d  X83 Scan/Print/Copy
+	003e  Scan Print Copy
+	003f  Scan Print Copy
+	0040  Scan Print Copy
+	0041  Scan Print Copy
+	0042  Scan Print Copy
+	0043  Scan Print Copy
+	0044  Scan Print Copy
+	0045  Scan Print Copy
+	0046  Scan Print Copy
+	0047  Scan Print Copy
+	0048  Scan Print Copy
+	0049  Scan Print Copy
+	004a  Scan Print Copy
+	004b  Scan Print Copy
+	004c  Scan Print Copy
+	004d  Laser Printer
+	004e  Laser Printer
+	004f  InkJet Color Printer
+	0050  InkJet Color Printer
+	0051  Laser Printer
+	0052  Laser Printer
+	0053  InkJet Color Printer
+	0054  InkJet Color Printer
 	0057  Z35 Printer
+	0058  Laser Printer
+	005a  X63
+	005c  InkJet Color Printer
 	0060  X74/X75 Scanner
 	0061  X74 Hub
+	0065  X5130
 	0069  X74/X75 Printer
+	006d  X125
+	006e  C510
 	0072  X6170 Printer
+	0073  InkJet Color Printer
+	0078  InkJet Color Printer
+	0079  InkJet Color Printer
+	007a  Generic Hub
+	007b  InkJet Color Printer
+	007c  X1110/X1130/X1140/X1150/X1170/X1180/X1185
+	007d  Photo 3150
+	008a  4200 series
+	008b  InkJet Color Printer
+	008c  to CF/SM/SD/MS Card Reader
+	008e  InkJet Color Printer
+	008f  X422
+	0091  Laser Printer E232
+	0093  X5250
 	0095  E220 Printer
+	0096  2200 series
+	0097  P6250
+	0098  7100 series
+	009e  P910 series Human Interface Device
+	009f  InkJet Color Printer
+	00a9  IBM Infoprint 1410 MFP
+	00ab  InkJet Color Printer
+	00b2  3300 series
+	00b8  7300 series
+	00b9  8300 series
+	00ba  InkJet Color Printer
+	00bb  2300 series
+	00bd  Printing Support
+	00be  Printing Support
+	00bf  Printing Support
+	00c0  6300 series
+	00c1  4300 series
+	00c7  Printing Support
+	00c8  Printing Support
+	00c9  Printing Support
+	00cb  Printing Support
+	00cc  E120(n)
+	00d0  9300 series
+	00d3  X340 Scanner
+	00d4  X342n Scanner
+	00d5  Printing Support
+	00d6  X340 Scanner
+	00e8  X642e
+	00e9  2400 series
+	00f6  3400 series
+	00f7  InkJet Color Printer
+	00ff  InkJet Color Printer
+	010b  2500 series
+	010d  3500-4500 series
+	010f  6500 series
+	0142  X3650 (Printer, Scanner, Copier)
+	01fa  S310 series
+	4303  Xerox WorkCentre Pro 412
 043e  LG Electronics USA, Inc.
+	3001  AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323]
+	3004  TWFM-B003D 802.11abgn Wireless Module [Broadcom BCM43236B]
+	3009  VC400
+	3101  AN-WF500 802.11abgn + BT Wireless Adapter [Broadcom BCM43242]
 	42bd  Flatron 795FT Plus Monitor
 	4a4d  Flatron 915FT Plus Monitor
 	7001  MF-PD100 Soul Digital MP3 Player
+	7013  MP3 Player
+	70d7  Mouse Scanner LSM-150 [LG Smart Scan Mouse]
+	70f5  External HDD
 	8484  LPC-U30 Webcam II
 	8585  LPC-UC35 Webcam
+	8888  Electronics VCS Camera II(LPC-U20)
+	9800  Remote Control Receiver_iMON
+	9803  eHome Infrared Receiver
+	9804  DMB Receiver Control
+	9c01  LGE Sync
 043f  RadiSys Corp.
 0440  Eizo Nanao Corp.
 0441  Winbond Systems Lab.
 	1456  Hub
 0442  Ericsson, Inc.
+	abba  Bluetooth Device
 0443  Gateway, Inc.
+	000e  Multimedia Keyboard
+	002e  Millennium Keyboard
 0445  Lucent Technologies, Inc.
 0446  NMB Technologies Corp.
+	6781  Keyboard with PS/2 Mouse Port
+	6782  Keyboard
 0447  Momentum Microsystems
+0449  Duta Multi Robotik
+	0128  Menengah
+	0210  Dasar
+	0612  Lanjutan
 044a  Shamrock Tech. Co., Ltd
 044b  WSI
 044c  CCL/ITRI
 044d  Siemens Nixdorf AG
 044e  Alps Electric Co., Ltd
+	1104  Japanese Keyboard
 	2002  MD-5500 Printer
+	2014  Bluetooth Device
 	3001  UGTZ4 Bluetooth
+	3002  Bluetooth Device
+	3003  Bluetooth Device
+	3004  Bluetooth Adapter
+	3005  Integrated Bluetooth Device
+	3006  Bluetooth Adapter
+	3007  Bluetooth Controller (ALPS/UGX)
+	300c  Bluetooth Controller (ALPS/UGPZ6)
+	300d  Bluetooth Controller (ALPS/UGPZ6)
+	3010  Bluetooth Adapter
+	3017  BCM2046 Bluetooth Device
+	ffff  Compaq Bluetooth Multiport Module
 044f  ThrustMaster, Inc.
 	0400  HOTAS Cougar
+	0402  HOTAS Warthog Joystick
+	0404  HOTAS Warthog Throttle
+	044f  GP XID
+	0f00  Steering Wheel for Xbox
+	0f03  Steering Wheel for Xbox
+	0f07  Controller for Xbox
+	0f0c  Xbox Memory Unit (8MB)
+	0f10  Modena GT Wheel
+	a003  Rage 3D Game Pad
+	a01b  PK-GP301 Driving Wheel
+	a0a0  Top Gun Joystick
+	a0a1  Top Gun Joystick (rev2)
 	a0a3  Fusion Digital GamePad
+	a201  PK-GP201 PlayStick
+	b108  T-Flight Hotas X Flight Stick
+	b10a  T.16000M Joystick
 	b203  360 Modena Pro Wheel
 	b300  Firestorm Dual Power
+	b303  FireStorm Dual Analog 2
 	b304  Firestorm Dual Power
+	b307  vibrating Upad
+	b30b  Wireless VibrationPad
+	b315  Firestorm Dual Analog 3
+	b320  Dual Trigger gamepad PC/PS2 2.0
+	b323  Dual Trigger 3-in-1 (PC Mode)
+	b324  Dual Trigger 3-in-1 (PS3 Mode)
+	b326  Gamepad GP XID
+	b351  F16 MFD 1
+	b352  F16 MFD 2
+	b365  UbiSoft UbiConnect
+	b603  force feedback Wheel
+	b605  force feedback Racing Wheel
+	b651  Ferrari GT Rumble Force Wheel
+	b653  RGT Force Feedback Clutch Racing Wheel
+	b654  Ferrari GT Force Feedback Wheel
+	b678  T.Flight Rudder Pedals
+	b679  T-Rudder
+	b687  TWCS Throttle
+	b700  Tacticalboard
 0450  DFI, Inc.
 0451  Texas Instruments, Inc.
+	0422  TUSB422 Port Controller with Power Delivery
+	1234  Bluetooth Device
 	1428  Hub
 	1446  TUSB2040/2070 Hub
+	16a2  CC Debugger
+	16a6  BM-USBD1 BlueRobin RF heart rate sensor receiver
+	16a8  CC2531 ZigBee
+	16ae  CC2531 Dongle
 	2036  TUSB2036 Hub
 	2046  TUSB2046 Hub
 	2077  TUSB2077 Hub
+	2f90  SM-USB-DIG
+	3200  TUSB3200 Boot Loader
 	3410  TUSB3410 Microcontroller
+	3f00  OMAP1610
+	3f02  SMC WSKP100 Wi-Fi Phone
+	505f  TUSB5052 Serial
+	5153  TUSB5052 Hub
 	5409  Frontier Labs NEX IA+ Digital Audio Player
 	6000  AU5 ADSL Modem (pre-reenum)
 	6001  AU5 ADSL Modem
-	625f  Trekstor USB-Stick 12 CS-D 12 GB
-	e001  GraphLink
+	6060  RNDIS/BeWAN ADSL2+
+	6070  RNDIS/BeWAN ADSL2+
+	625f  TUSB6250 ATA Bridge
+	8041  Hub
+	8042  Hub
+	8043  Hub
+	8140  TUSB8041 4-Port Hub
+	8142  TUSB8041 4-Port Hub
+	926b  TUSB9260 Boot Loader
+	bef3  CC1352R1 Launchpad
+	dbc0  Device Bay Controller
+	e001  GraphLink [SilverLink]
+	e003  TI-84 Plus Calculator
 	e004  TI-89 Titanium Calculator
 	e008  TI-84 Plus Silver Calculator
+	e00e  TI-89 Titanium Presentation Link
+	e00f  TI-84 Plus Presentation Link
+	e010  TI SmartPad Keyboard
+	e011  Nspire CAS+ prototype
+	e012  TI-Nspire Calculator
+	e013  Network Bridge
+	e01c  Data Collection Sled [Nspire Lab Cradle, Nspire Datatracker Cradle]
+	e01e  Nspire CX Navigator Access Point
+	e01f  Python Adapter (firmware install mode)
+	e020  Python Adapter
+	e022  Nspire CX II
 	f430  MSP-FET430UIF JTAG Tool
+	f432  eZ430 Development Tool
+	ffff  Bluetooth Device
 0452  Mitsubishi Electronics America, Inc.
+	0021  HID Monitor Controls
 	0050  Diamond Pro 900u CRT Monitor
 	0051  Integrated Hub
+	0100  Control Panel for Leica TCS SP5
 0453  CMD Technology
+	6781  NMB Keyboard
+	6783  Chicony Composite Keyboard
 0454  Vobis Microcomputer AG
 0455  Telematics International, Inc.
 0456  Analog Devices, Inc.
+	f000  FT2232 JTAG ICE [gnICE]
+	f001  FT2232H Hi-Speed JTAG ICE [gnICE+]
 0457  Silicon Integrated Systems Corp.
 	0150  Super Talent 1GB Flash Drive
-	0151  Super Flash 1GB Flash Drive
+	0151  Super Flash 1GB / GXT  64MB Flash Drive
+	0162  SiS162 usb Wireless LAN Adapter
+	0163  SiS163U 802.11 Wireless LAN Adapter
+	0817  SiS-184-ASUS-4352.17 touch panel
+	10e1  HID Touch Controller
+	5401  Wireless Adapter RO80211GS-USB
 0458  KYE Systems Corp. (Mouse Systems)
 	0001  Mouse
 	0002  Genius NetMouse Pro
 	0003  Genius NetScroll+
-	000e  VideoCAM Web
+	0006  Easy Mouse+
+	0007  Trackbar Emotion
+	000b  NetMouse Wheel(P+U)
+	000c  TACOMA Fingerprint V1.06.01
+	000e  Genius NetScroll Optical
+	0013  TACOMA Fingerprint Mouse V1.06.01
 	001a  Genius WebScroll+
+	002e  NetScroll + Traveler / NetScroll 110
+	0036  Pocket Mouse LE
+	0039  NetScroll+ Superior
+	003a  NetScroll+ Mini Traveler / Genius NetScroll 120
 	004c  Slimstar Pro Keyboard
+	0056  Ergo 300 Mouse
+	0057  Enhanced Gaming Device
+	0059  Enhanced Laser Device
+	005a  Enhanced Device
+	005b  Enhanced Device
+	005c  Enhanced Laser Gaming Device
+	005d  Enhanced Device
+	0061  Bluetooth Dongle
+	0066  Genius Traveler 1000 Wireless Mouse
+	0072  Navigator 335
+	0083  Bluetooth Dongle
+	0087  Ergo 525V Laser Mouse
+	0088  Genius Traveler 515 Laser
+	0089  Genius Traveler 350
+	00ca  Pen Mouse
 	0100  EasyPen Tablet
 	0101  CueCat
+	011b  NetScroll T220
+	0186  Genius DX-120 Mouse
+	1001  Joystick
+	1002  Game Pad
 	1003  Genius VideoCam
 	1004  Flight2000 F-23 Joystick
 	100a  Aashima Technology Trust Sight Fighter Vibration Feedback Joystick
 	2001  ColorPage-Vivid Pro Scanner
+	2004  ColorPage-HR6 V1 Scanner
+	2005  ColorPage-HR6/Vivid3
 	2007  ColorPage-HR6 V2 Scanner
 	2008  ColorPage-HR6 V2 Scanner
 	2009  ColorPage-HR6A Scanner
 	2011  ColorPage-Vivid3x Scanner
+	2012  Plustek Scanner
 	2013  ColorPage-HR7 Scanner
+	2014  ColorPage-Vivid4
 	2015  ColorPage-HR7LE Scanner
 	2016  ColorPage-HR6X Scanner
+	2017  ColorPage-Vivid3xe
+	2018  ColorPage-HR7X
+	2019  ColorPage-HR6X Slim
+	201a  ColorPage-Vivid4xe
+	201b  ColorPage-Vivid4x
+	201c  ColorPage-HR8
+	201d  ColorPage-Vivid 1200 X
+	201e  ColorPage-Slim 1200
+	201f  ColorPage-Vivid 1200 XE
+	2020  ColorPage-Slim 1200 USB2
+	2021  ColorPage-SF600
+	3017  SPEED WHEEL 3 Vibration
+	3018  Wireless 2.4Ghz Game Pad
+	3019  10-Button USB Joystick with Vibration
+	301a  MaxFire G-12U Vibration
+	301c  Genius MaxFighter F-16U
 	301d  Genius MaxFire MiniPad
-	7004  VideoCAM Express
+	400f  Genius TVGo DVB-T02Q MCE
+	4012  TVGo DVB-T03 [AF9015]
+	5003  G-pen 560 Tablet
+	5004  G-pen Tablet
+	5005  Genius EasyPen M406
+	5012  Genius EasyPen M406W
+	5014  Genius EasyPen 340
+	505e  Genius iSlim 330
+	6001  GF3000F Ethernet Adapter
+	7004  VideoCAM Express V2
+	7006  Dsc 1.3 Smart Camera Device
 	7007  VideoCAM Web
+	7009  G-Shot G312 Still Camera Device
+	700c  VideoCAM Web V3
+	700d  G-Shot G511 Composite Device
+	700f  VideoCAM Web
 	7012  WebCAM USB2.0
+	7014  VideoCAM Live V3
+	701c  G-Shot G512 Still Camera
+	7020  Sim 321C
+	7025  Eye 311Q Camera
+	7029  Genius Look 320s (SN9C201 + HV7131R)
+	702f  Genius Slim 322
+	7035  i-Look 325T Camera
+	7045  Genius Look 1320 V2
+	704c  Genius i-Look 1321
+	704d  Slim 1322AF
+	7055  Slim 2020AF camera
+	705a  Asus USB2.0 Webcam
+	705c  Genius iSlim 1300AF
+	7061  Genius iLook 1321 V2
+	7066  Acer Crystal Eye Webcam
+	7067  Genius iSlim 1300AF V2
+	7068  Genius eFace 1325R
+	706d  Genius iSlim 2000AF V2
+	7076  Genius FaceCam 312
+	7079  FaceCam 2025R
+	707f  TVGo DVB-T03 [RTL2832]
+	7088  WideCam 1050
+	7089  Genius FaceCam 320
+	708c  Genius WideCam F100
 0459  Adobe Systems, Inc.
 045a  SONICblue, Inc.
+	07da  Supra Express 56K modem
 	0b4a  SupraMax 2890 56K Modem [Lucent Atlas]
 	0b68  SupraMax 56K Modem
+	5001  Rio 600 MP3 Player
+	5002  Rio 800 MP3 Player
+	5003  Nike Psa/Play MP3 Player
+	5005  Rio S10 MP3 Player
+	5006  Rio S50 MP3 Player
+	5007  Rio S35 MP3 Player
+	5008  Rio 900 MP3 Player
+	5009  Rio S30 MP3 Player
+	500d  Fuse MP3 Player
+	500e  Chiba MP3 Player
+	500f  Cali MP3 Player
+	5010  Rio S11 MP3 Player
+	501c  Virgin MPF-1000
+	501d  Rio Fuse
+	501e  Rio Chiba
+	501f  Rio Cali
+	503f  Cali256 MP3 Player
+	5042  Rio Forge
+	5202  Rio Riot MP3 Player
 	5210  Rio Karma Music Player
 	5220  Rio Nitrus MP3 Player
+	5221  Rio Eigen
 045b  Hitachi, Ltd
+	0053  RX610 RX-Stick
+	0229  mSATA Adapter [renkforce Pi-102]
 045d  Nortel Networks, Ltd
 045e  Microsoft Corp.
 	0007  SideWinder Game Pad
 	0008  SideWinder Precision Pro
 	0009  IntelliMouse
 	000b  Natural Keyboard Elite
+	000e  SideWinder® Freestyle Pro
 	0014  Digital Sound System 80
 	001a  SideWinder Precision Racing Wheel
 	001b  SideWinder Force Feedback 2 Joystick
+	001c  Internet Keyboard Pro
 	001d  Natural Keyboard Pro
 	001e  IntelliMouse Explorer
 	0023  Trackball Optical
@@ -574,6 +2248,8 @@
 	0028  SideWinder Dual Strike
 	0029  IntelliMouse Optical
 	002b  Internet Keyboard Pro
+	002d  Internet Keyboard
+	002f  Integrated Hub
 	0033  Sidewinder Strategic Commander
 	0034  SideWinder Force Feedback Wheel
 	0038  SideWinder Precision 2
@@ -582,20 +2258,63 @@
 	003c  SideWinder Joystick
 	0040  Wheel Mouse Optical
 	0047  IntelliMouse Explorer 3.0
+	0048  Office Keyboard 1.0A
+	0053  Optical Mouse
 	0059  Wireless IntelliMouse Explorer
-	006e  MN510 802.11b Adapter
+	005c  Office Keyboard (106/109)
+	005f  Wireless MultiMedia Keyboard
+	0061  Wireless MultiMedia Keyboard (106/109)
+	0063  Wireless Natural MultiMedia Keyboard
+	0065  Wireless Natural MultiMedia Keyboard (106/109)
+	006a  Wireless Optical Mouse (IntelliPoint)
+	006d  eHome Remote Control Keyboard keys
+	006e  MN-510 802.11b Wireless Adapter [Intersil ISL3873B]
+	006f  Smart Display Reference Device
+	0070  Wireless MultiMedia Keyboard
+	0071  Wireless MultiMedia Keyboard (106/109)
+	0072  Wireless Natural MultiMedia Keyboard
+	0073  Wireless Natural MultiMedia Keyboard (106/109)
+	0079  IXI Ogo CT-17 handheld device
+	007a  10/100 USB NIC
 	007d  Notebook Optical Mouse
 	007e  Wireless Transceiver for Bluetooth
 	0080  Digital Media Pro Keyboard
 	0083  Basic Optical Mouse
-	008a  Wireless Keyboard and Mouse
+	0084  Basic Optical Mouse
+	008a  Wireless Optical Desktop Receiver 2.0A
+	008b  Dual Receiver Wireless Mouse (IntelliPoint)
 	008c  Wireless Intellimouse Explorer 2.0
+	0095  IntelliMouse Explorer 4.0 (IntelliPoint)
+	009c  Wireless Transceiver for Bluetooth 2.0
+	009d  Wireless Optical Desktop 3.0
+	00a0  eHome Infrared Receiver
+	00a4  Compact Optical Mouse, model 1016
+	00b0  Digital Media Pro Keyboard
+	00b4  Digital Media Keyboard 1.0A
 	00b9  Wireless Optical Mouse 3.0
+	00bb  Fingerprint Reader
+	00bc  Fingerprint Reader
 	00bd  Fingerprint Reader
+	00c2  MN-710 802.11g Wireless Adapter [Intersil ISL3886]
+	00c9  MTP Device
+	00ca  Fingerprint Reader
+	00cb  Basic Optical Mouse v2.0
 	00ce  Generic PPC Flash device
+	00d1  Optical Mouse with Tilt Wheel
+	00d2  Notebook Optical Mouse with Tilt Wheel
+	00da  eHome Infrared Receiver
 	00db  Natural Ergonomic Keyboard 4000 V1.0
-	00e1  Wireless Laser Mouse 6000 Reciever
+	00dd  Comfort Curve Keyboard 2000 V1.0
+	00e1  Wireless Laser Mouse 6000 Receiver
+	00f4  LifeCam VX-6000 (SN9C20x + OV9650)
+	00f5  LifeCam VX-3000
+	00f6  Comfort Optical Mouse 1000
+	00f7  LifeCam VX-1000
+	00f8  LifeCam NX-6000
+	00f9  Wireless Desktop Receiver 3.1
 	0202  Xbox Controller
+	0280  Xbox Memory Unit (8MB)
+	0283  Xbox Communicator
 	0284  Xbox DVD Playback Kit
 	0285  Xbox Controller S
 	0288  Xbox Controller S Hub
@@ -605,12 +2324,231 @@
 	028e  Xbox360 Controller
 	028f  Xbox360 Wireless Controller
 	0290  Xbox360 Performance Pipe (PIX)
+	0291  Xbox 360 Wireless Receiver for Windows
 	0292  Xbox360 Wireless Networking Adapter
 	029c  Xbox360 HD-DVD Drive
 	029d  Xbox360 HD-DVD Drive
 	029e  Xbox360 HD-DVD Memory Unit
+	02a0  Xbox360 Big Button IR
+	02a1  Xbox 360 Wireless Receiver for Windows
+	02a8  Xbox360 Wireless N Networking Adapter [Atheros AR7010+AR9280]
+	02ad  Xbox NUI Audio
+	02ae  Xbox NUI Camera
+	02b0  Xbox NUI Motor
+	02b6  Xbox360 Bluetooth Wireless Headset
+	02bb  Kinect Audio
+	02be  Kinect for Windows NUI Audio
+	02bf  Kinect for Windows NUI Camera
+	02c2  Kinect for Windows NUI Motor
+	02d1  Xbox One Controller
+	02d5  Xbox One Digital TV Tuner
+	02dd  Xbox One Controller (Firmware 2015)
+	02e3  Xbox One Elite Controller
+	02e6  Wireless XBox Controller Dongle
+	02ea  Xbox One S Controller
+	02fd  Xbox One S Controller [Bluetooth]
+	0400  Windows Powered Pocket PC 2002
+	0401  Windows Powered Pocket PC 2002
+	0402  Windows Powered Pocket PC 2002
+	0403  Windows Powered Pocket PC 2002
+	0404  Windows Powered Pocket PC 2002
+	0405  Windows Powered Pocket PC 2002
+	0406  Windows Powered Pocket PC 2002
+	0407  Windows Powered Pocket PC 2002
+	0408  Windows Powered Pocket PC 2002
+	0409  Windows Powered Pocket PC 2002
+	040a  Windows Powered Pocket PC 2002
+	040b  Windows Powered Pocket PC 2002
+	040c  Windows Powered Pocket PC 2002
+	040d  Windows Powered Pocket PC 2002
+	040e  Windows Powered Pocket PC 2002
+	040f  Windows Powered Pocket PC 2002
+	0410  Windows Powered Pocket PC 2002
+	0411  Windows Powered Pocket PC 2002
+	0412  Windows Powered Pocket PC 2002
+	0413  Windows Powered Pocket PC 2002
+	0414  Windows Powered Pocket PC 2002
+	0415  Windows Powered Pocket PC 2002
+	0416  Windows Powered Pocket PC 2002
+	0417  Windows Powered Pocket PC 2002
+	0432  Windows Powered Pocket PC 2003
+	0433  Windows Powered Pocket PC 2003
+	0434  Windows Powered Pocket PC 2003
+	0435  Windows Powered Pocket PC 2003
+	0436  Windows Powered Pocket PC 2003
+	0437  Windows Powered Pocket PC 2003
+	0438  Windows Powered Pocket PC 2003
+	0439  Windows Powered Pocket PC 2003
+	043a  Windows Powered Pocket PC 2003
+	043b  Windows Powered Pocket PC 2003
+	043c  Windows Powered Pocket PC 2003
+	043d  Becker Traffic Assist Highspeed 7934
+	043e  Windows Powered Pocket PC 2003
+	043f  Windows Powered Pocket PC 2003
+	0440  Windows Powered Pocket PC 2003
+	0441  Windows Powered Pocket PC 2003
+	0442  Windows Powered Pocket PC 2003
+	0443  Windows Powered Pocket PC 2003
+	0444  Windows Powered Pocket PC 2003
+	0445  Windows Powered Pocket PC 2003
+	0446  Windows Powered Pocket PC 2003
+	0447  Windows Powered Pocket PC 2003
+	0448  Windows Powered Pocket PC 2003
+	0449  Windows Powered Pocket PC 2003
+	044a  Windows Powered Pocket PC 2003
+	044b  Windows Powered Pocket PC 2003
+	044c  Windows Powered Pocket PC 2003
+	044d  Windows Powered Pocket PC 2003
+	044e  Windows Powered Pocket PC 2003
+	044f  Windows Powered Pocket PC 2003
+	0450  Windows Powered Pocket PC 2003
+	0451  Windows Powered Pocket PC 2003
+	0452  Windows Powered Pocket PC 2003
+	0453  Windows Powered Pocket PC 2003
+	0454  Windows Powered Pocket PC 2003
+	0455  Windows Powered Pocket PC 2003
+	0456  Windows Powered Pocket PC 2003
+	0457  Windows Powered Pocket PC 2003
+	0458  Windows Powered Pocket PC 2003
+	0459  Windows Powered Pocket PC 2003
+	045a  Windows Powered Pocket PC 2003
+	045b  Windows Powered Pocket PC 2003
+	045c  Windows Powered Pocket PC 2003
+	045d  Windows Powered Pocket PC 2003
+	045e  Windows Powered Pocket PC 2003
+	045f  Windows Powered Pocket PC 2003
+	0460  Windows Powered Pocket PC 2003
+	0461  Windows Powered Pocket PC 2003
+	0462  Windows Powered Pocket PC 2003
+	0463  Windows Powered Pocket PC 2003
+	0464  Windows Powered Pocket PC 2003
+	0465  Windows Powered Pocket PC 2003
+	0466  Windows Powered Pocket PC 2003
+	0467  Windows Powered Pocket PC 2003
+	0468  Windows Powered Pocket PC 2003
+	0469  Windows Powered Pocket PC 2003
+	046a  Windows Powered Pocket PC 2003
+	046b  Windows Powered Pocket PC 2003
+	046c  Windows Powered Pocket PC 2003
+	046d  Windows Powered Pocket PC 2003
+	046e  Windows Powered Pocket PC 2003
+	046f  Windows Powered Pocket PC 2003
+	0470  Windows Powered Pocket PC 2003
+	0471  Windows Powered Pocket PC 2003
+	0472  Windows Powered Pocket PC 2003
+	0473  Windows Powered Pocket PC 2003
+	0474  Windows Powered Pocket PC 2003
+	0475  Windows Powered Pocket PC 2003
+	0476  Windows Powered Pocket PC 2003
+	0477  Windows Powered Pocket PC 2003
+	0478  Windows Powered Pocket PC 2003
+	0479  Windows Powered Pocket PC 2003
+	047a  Windows Powered Pocket PC 2003
+	047b  Windows Powered Pocket PC 2003
+	04c8  Windows Powered Smartphone 2002
+	04c9  Windows Powered Smartphone 2002
+	04ca  Windows Powered Smartphone 2002
+	04cb  Windows Powered Smartphone 2002
+	04cc  Windows Powered Smartphone 2002
+	04cd  Windows Powered Smartphone 2002
+	04ce  Windows Powered Smartphone 2002
+	04d7  Windows Powered Smartphone 2003
+	04d8  Windows Powered Smartphone 2003
+	04d9  Windows Powered Smartphone 2003
+	04da  Windows Powered Smartphone 2003
+	04db  Windows Powered Smartphone 2003
+	04dc  Windows Powered Smartphone 2003
+	04dd  Windows Powered Smartphone 2003
+	04de  Windows Powered Smartphone 2003
+	04df  Windows Powered Smartphone 2003
+	04e0  Windows Powered Smartphone 2003
+	04e1  Windows Powered Smartphone 2003
+	04e2  Windows Powered Smartphone 2003
+	04e3  Windows Powered Smartphone 2003
+	04e4  Windows Powered Smartphone 2003
+	04e5  Windows Powered Smartphone 2003
+	04e6  Windows Powered Smartphone 2003
+	04e7  Windows Powered Smartphone 2003
+	04e8  Windows Powered Smartphone 2003
+	04e9  Windows Powered Smartphone 2003
+	04ea  Windows Powered Smartphone 2003
+	04ec  Windows Phone (Zune)
+	063e  Zune HD Media Player
+	0640  KIN Phone
+	0641  KIN Phone
+	0642  KIN Phone
+	0707  Wireless Laser Mouse 8000
+	0708  Transceiver v 3.0 for Bluetooth
+	070a  Charon Bluetooth Dongle (DFU)
+	070f  LifeChat LX-3000 Headset
+	0710  Zune Media Player
+	0713  Wireless Presenter Mouse 8000
+	0719  Xbox 360 Wireless Adapter
+	071f  Mouse/Keyboard 2.4GHz Transceiver V2.0
+	0721  LifeCam NX-3000 (UVC-compliant)
+	0723  LifeCam VX-7000 (UVC-compliant)
+	0724  SideWinder Mouse
+	0728  LifeCam VX-5000
+	0730  Digital Media Keyboard 3000
+	0734  Wireless Optical Desktop 700
+	0736  Sidewinder X5 Mouse
+	0737  Compact Optical Mouse 500
+	0745  Nano Transceiver v1.0 for Bluetooth
+	074a  LifeCam VX-500 [1357]
+	0750  Wired Keyboard 600
+	0752  Wired Keyboard 400
+	075d  LifeCam Cinema
+	0761  LifeCam VX-2000
+	0765  Xbox360 Slim Internal Wireless Module (1400) [Marvell 88W8786U]
+	0766  LifeCam VX-800
+	0768  Sidewinder X4
+	076c  Comfort Mouse 4500
+	076d  LifeCam HD-5000
+	0770  LifeCam VX-700
+	0772  LifeCam Studio
+	0779  LifeCam HD-3000
+	077f  LifeChat LX-6000 Headset
+	0780  Comfort Curve Keyboard 3000
+	0797  Optical Mouse 200
+	0799  Surface Pro embedded keyboard
+	07a5  Wireless Receiver 1461C
+	07b2  2.4GHz Transceiver v8.0 used by mouse Wireless Desktop 900
+	07b6  Comfort Curve Keyboard 3000
+	07b9  Wired Keyboard 200
+	07c6  RTL8153 GigE [Surface Ethernet Adapter]
+	07ca  Surface Pro 3 Docking Station Audio Device
+	07cd  Surface Keyboard
+	07f8  Wired Keyboard 600 (model 1576)
+	07fd  Nano Transceiver 1.1
+	0800  Wireless keyboard (All-in-One-Media)
+	0810  LifeCam HD-3000
+	0823  Classic IntelliMouse
+	0900  Surface Dock Hub
+	0901  Surface Dock Hub
+	0902  Surface Dock Hub
+	0903  Surface Dock Hub
+	0904  Surface Dock Extender
+	0905  Surface Dock Audio
+	090b  Hub
+	090c  SD Card
+	091a  Hub
+	0927  RTL8153B GigE [Surface Ethernet Adapter]
+	0955  Hub
+	0957  Hub
+	09a0  RTL8153B GigE [Surface Ethernet Adapter]
+	09c0  Surface Type Cover
+	0a00  Lumia 950 Dual SIM (RM-1118)
+	0b12  Xbox Wireless Controller (model 1914)
+	930a  ISOUSB.SYS Intel 82930 Isochronous IO Test Board
+	ffca  Catalina
+	fff8  Keyboard
+	ffff  Windows CE Mass Storage
 0460  Ace Cad Enterprise Co., Ltd
+	0004  Tablet (5x3.75)
+	0006  LCD Tablet (12x9)
+	0008  Tablet (3x2.25)
 0461  Primax Electronics, Ltd
+	0010  HP PR1101U / Primax PMX-KPR1101U Keyboard
 	0300  G2-300 Scanner
 	0301  G2E-300 Scanner
 	0302  G2-300 #2 Scanner
@@ -622,24 +2560,60 @@
 	0347  Primascan Colorado 2600u/Visioneer 4400 Scanner
 	0360  Colorado 19200 Scanner
 	0361  Colorado 1200u Scanner
+	0363  VistaScan Astra 3600(ENG)
 	0364  LG Electronics Scanworks 600U Scanner
+	0365  VistaScan Astra 3600(ENG)
+	0366  6400
+	0367  VistaScan Astra 3600(ENG)
 	0371  Visioneer Onetouch 8920 Scanner
+	0374  UMAX Astra 2500
+	0375  VistaScan Astra 3600(ENG)
 	0377  Medion MD 5345 Scanner
+	0378  VistaScan Astra 3600(ENG)
 	037b  Medion MD 6190 Scanner
+	037c  VistaScan Astra 3600(ENG)
 	0380  G2-600 Scanner
 	0381  ReadyScan 636i Scanner
 	0382  G2-600 #2 Scanner
 	0383  G2E-600 Scanner
+	038a  UMAX Astra 3000/3600
+	038b  Xerox 2400 Onetouch
+	038c  UMAX Astra 4100
+	0392  Medion/Lifetec/Tevion/Cytron MD 6190
+	03a8  9420M
 	0813  IBM UltraPort Camera
-	0815  Micro Innovations WebCam
+	0815  Micro Innovations IC200 Webcam
 	0819  Fujifilm IX-30 Camera [webcam mode]
 	081a  Fujifilm IX-30 Camera [storage mode]
 	081c  Elitegroup ECS-C11 Camera
 	081d  Elitegroup ECS-C11 Storage
-	4d01  Comfort Keyboard
+	0a00  Micro Innovations Web Cam 320
+	4d01  Comfort Keyboard / Kensington Orbit Elite
 	4d02  Mouse-in-a-Box
 	4d03  Kensington Mouse-in-a-box
 	4d04  Mouse
+	4d06  Balless Mouse (HID)
+	4d0f  HP Optical Mouse
+	4d15  Dell Optical Mouse
+	4d17  Optical Mouse
+	4d20  HP Optical Mouse
+	4d2a  PoPo Elixir Mouse (HID)
+	4d2b  Wireless Laser Mini Mouse (HID)
+	4d2c  PoPo Mini Pointer Mouse (HID)
+	4d2e  Optical Mobile Mouse (HID)
+	4d51  0Y357C PMX-MMOCZUL (B) [Dell Laser Mouse]
+	4d62  HP Laser Mobile Mini Mouse
+	4d75  Rocketfish RF-FLBTAD Bluetooth Adapter
+	4d81  Dell N889 Optical Mouse
+	4d8a  HP Multimedia Keyboard
+	4d91  Laser mouse M-D16DL
+	4d92  Optical mouse M-D17DR
+	4db1  Dell Laptop Integrated Webcam 2Mpix
+	4de3  HP 5-Button Optical Comfort Mouse
+	4de7  webcam
+	4e04  Lenovo Keyboard KB1021
+	4e22  Dell Mouse, 2 Buttons, Modell: MS111-P
+	4e6f  Acer Wired Keyboard Model KBAY211
 0463  MGE UPS Systems
 	0001  UPS
 	ffff  UPS
@@ -647,130 +2621,586 @@
 0467  AT&T Paradyne
 0468  Wieson Technologies Co., Ltd
 046a  Cherry GmbH
-	0001  My3000 Keyboard
+	0001  Keyboard
 	0003  My3000 Hub
+	0004  CyBoard Keyboard
 	0005  XX33 SmartCard Reader Keyboard
-	0023  Cymotion Master Linux Keyboard
+	0008  Wireless Keyboard and Mouse
+	0010  SmartBoard XX44
+	0011  G83 (RS 6000) Keyboard
+	0021  CyMotion Expert Combo
+	0023  Keyboard
+	0027  CyMotion Master Solar Keyboard
+	002a  Wireless Mouse & Keyboard
+	002d  SmartTerminal XX44
+	003c  Raptor Gaming Keyboard
+	003d  Raptor Gaming Keyboard Integrated Hub
+	003e  SmartTerminal ST-2xxx
+	0041  G86 6240 Keyboard
+	0080  eHealth Terminal ST 1503
+	0081  eHealth Keyboard G87 1504
+	00a1  SmartCard Reader Keyboard KC 1000 SC
+	0106  R-300 Wireless Mouse Receiver
+	010d  MX-Board 3.0 Keyboard
+	0180  Strait 3.0
+	b090  Keyboard
+	b091  Mouse
 046b  American Megatrends, Inc.
+	0001  Keyboard
+	0101  PS/2 Keyboard, Mouse & Joystick Ports
+	0301  USB 1.0 Hub
+	0500  Serial & Parallel Ports
+	ff10  Virtual Keyboard and Mouse
 046c  Toshiba Corp., Digital Media Equipment
 046d  Logitech, Inc.
+	0082  Acer Aspire 5672 Webcam
+	0200  WingMan Extreme Joystick
 	0203  M2452 Keyboard
+	0242  Chillstream for Xbox 360
 	0301  M4848 Mouse
 	0401  HP PageScan
 	0402  NEC PageScan
 	040f  Logitech/Storm PageScan
+	0430  Mic (Cordless)
 	0801  QuickCam Home
+	0802  Webcam C200
+	0804  Webcam C250
+	0805  Webcam C300
+	0807  Webcam B500
+	0808  Webcam C600
+	0809  Webcam Pro 9000
+	080a  Portable Webcam C905
+	080f  Webcam C120
 	0810  QuickCam Pro
+	0819  Webcam C210
+	081a  Webcam C260
+	081b  Webcam C310
+	081d  HD Webcam C510
+	0820  QuickCam VC
+	0821  HD Webcam C910
+	0823  HD Webcam B910
+	0825  Webcam C270
+	0826  HD Webcam C525
+	0828  HD Webcam B990
+	082b  Webcam C170
+	082c  HD Webcam C615
+	082d  HD Pro Webcam C920
+	0830  QuickClip
+	0836  B525 HD Webcam
+	0837  BCC950 ConferenceCam
 	0840  QuickCam Express
+	0843  Webcam C930e
 	0850  QuickCam Web
+	085c  C922 Pro Stream Webcam
 	0870  QuickCam Express
 	0890  QuickCam Traveler
+	0892  C920 HD Pro Webcam
+	0893  StreamCam
+	0894  CrystalCam
+	0895  QuickCam for Dell Notebooks
+	0896  OrbiCam
+	0897  QuickCam for Dell Notebooks
+	0899  QuickCam for Dell Notebooks
+	089d  QuickCam E2500 series
 	08a0  QuickCam IM
-	08a2  Labtec WebCam Pro
+	08a1  QuickCam IM with sound
+	08a2  Labtec Webcam Pro
+	08a3  QuickCam QuickCam Chat
+	08a6  QuickCam IM
+	08a7  QuickCam Image
+	08a9  Notebook Deluxe
+	08aa  Labtec Notebooks
+	08ac  QuickCam Cool
+	08ad  QuickCam Communicate STX
+	08ae  QuickCam for Notebooks
+	08af  QuickCam Easy/Cool
 	08b0  QuickCam 3000 Pro [pwc]
 	08b1  QuickCam Notebook Pro
 	08b2  QuickCam Pro 4000
 	08b3  QuickCam Zoom
 	08b4  QuickCam Zoom
 	08b5  QuickCam Sphere
-	08d9  QuickCam Connect
+	08b9  QuickCam IM
+	08bd  Microphone (Pro 4000)
+	08c0  QuickCam Pro 3000
+	08c1  QuickCam Fusion
+	08c2  QuickCam PTZ
+	08c3  Camera (Notebooks Pro)
+	08c5  QuickCam Pro 5000
+	08c6  QuickCam for DELL Notebooks
+	08c7  QuickCam OEM Cisco VT Camera II
+	08c9  QuickCam Ultra Vision
+	08ca  Mic (Fusion)
+	08cb  Mic (Notebooks Pro)
+	08cc  Mic (PTZ)
+	08ce  QuickCam Pro 5000
+	08cf  QuickCam UpdateMe
+	08d0  QuickCam Express
+	08d7  QuickCam Communicate STX
+	08d8  QuickCam for Notebook Deluxe
+	08d9  QuickCam IM/Connect
 	08da  QuickCam Messanger
+	08dd  QuickCam for Notebooks
+	08e0  QuickCam Express
+	08e1  Labtec Webcam
 	08f0  QuickCam Messenger
+	08f1  QuickCam Express
+	08f2  Microphone (Messenger)
+	08f3  QuickCam Express
+	08f4  Labtec Webcam
+	08f5  QuickCam Messenger Communicate
+	08f6  QuickCam Messenger Plus
 	0900  ClickSmart 310
 	0901  ClickSmart 510
 	0903  ClickSmart 820
 	0905  ClickSmart 820
+	0910  QuickCam Cordless
 	0920  QuickCam Express
-	0921  Labtec WebCam
-	0928  Quickcam Express
+	0921  Labtec Webcam
+	0922  QuickCam Live
+	0928  QuickCam Express
+	0929  Labtec Webcam Pro
 	092a  QuickCam for Notebooks
-	092f  QuickCam express Plus
+	092b  Labtec Webcam Plus
+	092c  QuickCam Chat
+	092d  QuickCam Express / Go
+	092e  QuickCam Chat
+	092f  QuickCam Express Plus
 	0950  Pocket Camera
 	0960  ClickSmart 420
 	0970  Pocket750
-	0a01  Logitech USB Headset
-	0b02  BT Mini-Receiver (HID proxy mode)
+	0990  QuickCam Pro 9000
+	0991  QuickCam Pro for Notebooks
+	0992  QuickCam Communicate Deluxe
+	0994  QuickCam Orbit/Sphere AF
+	09a1  QuickCam Communicate MP/S5500
+	09a2  QuickCam Communicate Deluxe/S7500
+	09a4  QuickCam E 3500
+	09a5  Quickcam 3000 For Business
+	09a6  QuickCam Vision Pro
+	09b0  Acer OrbiCam
+	09b2  Fujitsu Webcam
+	09c0  QuickCam for Dell Notebooks Mic
+	09c1  QuickCam Deluxe for Notebooks
+	0a01  USB Headset
+	0a02  Premium Stereo USB Headset 350
+	0a03  Logitech USB Microphone
+	0a04  V20 portable speakers (USB powered)
+	0a07  Z-10 Speakers
+	0a0b  ClearChat Pro USB
+	0a0c  Clear Chat Comfort USB Headset
+	0a10  V10 Notebook Speakers
+	0a13  Z-5 Speakers
+	0a14  USB Headset
+	0a15  G35 Headset
+	0a17  G330 Headset
+	0a1f  G930
+	0a29  H600 [Wireless Headset]
+	0a37  USB Headset H540
+	0a38  Headset H340
+	0a44  Headset H390
+	0a45  960 Headset
+	0a4d  G430 Surround Sound Gaming Headset
+	0a5b  G933 Wireless Headset Dongle
+	0a5d  G933 Headset Battery Charger
+	0a66  [G533 Wireless Headset Dongle]
+	0a8f  H390 headset with microphone
+	0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
+	8801  Video Camera
+	b014  Bluetooth Mouse M336/M337/M535
+	b305  BT Mini-Receiver
 	bfe4  Premium Optical Wheel Mouse
 	c000  N43 [Pilot Mouse]
-	c001  N48/M-BB48 [FirstMouse Plus]
+	c001  N48/M-BB48/M-UK96A [FirstMouse Plus]
 	c002  M-BA47 [MouseMan Plus]
+	c003  MouseMan
 	c004  WingMan Gaming Mouse
+	c005  WingMan Gaming Wheel Mouse
 	c00b  MouseMan Wheel
 	c00c  Optical Wheel Mouse
-	c00e  M-BJ69 Optical Wheel Mouse
-	c012  Optical Mouse
-	c016  M-UV69a Optical Wheel Mouse
+	c00d  MouseMan Wheel+
+	c00e  M-BJ58/M-BJ69 Optical Wheel Mouse
+	c00f  MouseMan Traveler/Mobile
+	c011  Optical MouseMan
+	c012  Mouseman Dual Optical
+	c014  Corded Workstation Mouse
+	c015  Corded Workstation Mouse
+	c016  Optical Wheel Mouse
+	c018  Optical Wheel Mouse
+	c019  Optical Tilt Wheel Mouse
+	c01a  M-BQ85 Optical Wheel Mouse
 	c01b  MX310 Optical Mouse
+	c01c  Optical Mouse
 	c01d  MX510 Optical Mouse
 	c01e  MX518 Optical Mouse
+	c024  MX300 Optical Mouse
 	c025  MX500 Optical Mouse
 	c030  iFeel Mouse
+	c031  iFeel Mouse+
 	c032  MouseMan iFeel
-	c03e  Premium Optical Wheel Mouse
+	c033  iFeel MouseMan+
+	c034  MouseMan Optical
+	c035  Mouse
+	c036  Mouse
+	c037  Mouse
+	c038  Mouse
+	c03d  M-BT96a Pilot Optical Mouse
+	c03e  Premium Optical Wheel Mouse (M-BT58)
+	c03f  M-BT85 [UltraX Optical Mouse]
+	c040  Corded Tilt-Wheel Mouse
+	c041  G5 Laser Mouse
+	c042  G3 Laser Mouse
+	c043  MX320/MX400 Laser Mouse
+	c044  LX3 Optical Mouse
+	c045  Optical Mouse
+	c046  RX1000 Laser Mouse
+	c047  Laser Mouse M-UAL120
+	c048  G9 Laser Mouse
+	c049  G5 Laser Mouse
+	c050  RX 250 Optical Mouse
+	c051  G3 (MX518) Optical Mouse
+	c053  Laser Mouse
+	c054  Bluetooth mini-receiver
+	c058  M115 Mouse
+	c05a  M90/M100 Optical Mouse
+	c05b  M-U0004 810-001317 [B110 Optical USB Mouse]
+	c05d  Optical Mouse
+	c05f  M115 Optical Mouse
+	c061  RX1500 Laser Mouse
+	c062  M-UAS144 [LS1 Laser Mouse]
+	c063  DELL Laser Mouse
+	c064  M110 corded optical mouse (M-B0001)
+	c066  G9x Laser Mouse
+	c068  G500 Laser Mouse
+	c069  M-U0007 [Corded Mouse M500]
+	c06a  USB Optical Mouse
+	c06b  G700 Wireless Gaming Mouse
+	c06c  Optical Mouse
+	c077  M105 Optical Mouse
+	c07c  M-R0017 [G700s Rechargeable Gaming Mouse]
+	c07d  G502 Mouse
+	c07e  G402 Gaming Mouse
+	c080  G303 Gaming Mouse
+	c083  G403 Prodigy Gaming Mouse
+	c084  G203 Gaming Mouse
+	c08b  G502 SE HERO Gaming Mouse
+	c092  G203 LIGHTSYNC Gaming Mouse
+	c101  UltraX Media Remote
+	c110  Harmony 785/880/885 Remote
+	c111  Harmony 525 Remote
+	c112  Harmony 890 Remote
+	c11f  Harmony 900/1100 Remote
+	c121  Harmony One Remote
+	c122  Harmony 650/700 Remote
+	c124  Harmony 300/350 Remote
+	c125  Harmony 200 Remote
+	c126  Harmony Link
+	c129  Harmony Hub
+	c12b  Harmony Touch/Ultimate Remote
+	c201  WingMan Extreme Joystick with Throttle
 	c202  WingMan Formula
 	c207  WingMan Extreme Digital 3D
 	c208  WingMan Gamepad Extreme
 	c209  WingMan Gamepad
 	c20a  WingMan RumblePad
+	c20b  WingMan Action Pad
 	c20c  WingMan Precision
 	c20d  WingMan Attack 2
-	c211  iTouch Cordless Reciever
-	c216  Dual Action Gamepad
-	c218  Logitech RumblePad 2 USB
+	c20e  WingMan Formula GP
+	c211  iTouch Cordless Receiver
+	c212  WingMan Extreme Digital 3D
+	c213  J-UH16 (Freedom 2.4 Cordless Joystick)
+	c214  ATK3 (Attack III Joystick)
+	c215  Extreme 3D Pro
+	c216  F310 Gamepad [DirectInput Mode]
+	c218  F510 Gamepad [DirectInput Mode]
+	c219  F710 Gamepad [DirectInput Mode]
+	c21a  Precision Gamepad
+	c21c  G13 Advanced Gameboard
+	c21d  F310 Gamepad [XInput Mode]
+	c21e  F510 Gamepad [XInput Mode]
+	c21f  F710 Wireless Gamepad [XInput Mode]
+	c221  G11/G15 Keyboard / Keyboard
+	c222  G15 Keyboard / LCD
+	c223  G11/G15 Keyboard / USB Hub
+	c225  G11/G15 Keyboard / G keys
+	c226  G15 Refresh Keyboard
+	c227  G15 Refresh Keyboard
+	c228  G19 Gaming Keyboard
+	c229  G19 Gaming Keyboard Macro Interface
+	c22a  Gaming Keyboard G110
+	c22b  Gaming Keyboard G110 G-keys
+	c22d  G510 Gaming Keyboard
+	c22e  G510 Gaming Keyboard onboard audio
+	c231  G13 Virtual Mouse
+	c232  Gaming Virtual Keyboard
+	c245  G400 Optical Mouse
+	c246  Gaming Mouse G300
+	c247  G100S Optical Gaming Mouse
+	c248  G105 Gaming Keyboard
+	c24a  G600 Gaming Mouse
+	c24c  G400s Optical Mouse
+	c24d  G710 Gaming Keyboard
+	c24e  G500s Laser Gaming Mouse
+	c24f  G29 Driving Force Racing Wheel [PS3]
+	c260  G29 Driving Force Racing Wheel [PS4]
+	c262  G920 Driving Force Racing Wheel
 	c281  WingMan Force
 	c283  WingMan Force 3D
 	c285  WingMan Strike Force 3D
+	c286  Force 3D Pro
+	c287  Flight System G940
 	c291  WingMan Formula Force
 	c293  WingMan Formula Force GP
+	c294  Driving Force
 	c295  Momo Force Steering Wheel
+	c298  Driving Force Pro
+	c299  G25 Racing Wheel
+	c29b  G27 Racing Wheel
+	c29c  Speed Force Wireless Wheel for Wii
 	c2a0  Wingman Force Feedback Mouse
+	c2a1  WingMan Force Feedback Mouse
+	c2ab  G13 Joystick
+	c301  iTouch Keyboard
+	c302  iTouch Pro Keyboard
 	c303  iTouch Keyboard
+	c305  Internet Keyboard
+	c307  Internet Keyboard
 	c308  Internet Navigator Keyboard
-	c309  Internet Keyboard
+	c309  Y-BF37 [Internet Navigator Keyboard]
+	c30a  iTouch Composite
+	c30b  NetPlay Keyboard
+	c30c  Internet Keys (X)
+	c30d  Internet Keys
+	c30e  UltraX Keyboard (Y-BL49)
+	c30f  Logicool HID-Compliant Keyboard (106 key)
+	c311  Y-UF49 [Internet Pro Keyboard]
+	c312  DeLuxe 250 Keyboard
+	c313  Internet 350 Keyboard
+	c315  Classic Keyboard 200
+	c316  HID-Compliant Keyboard
+	c317  Wave Corded Keyboard
+	c318  Illuminated Keyboard
+	c31a  Comfort Wave 450
+	c31b  Compact Keyboard K300
+	c31c  Keyboard K120
+	c31d  Media Keyboard K200
+	c31f  Comfort Keyboard K290
+	c326  Washable Keyboard K310
+	c328  Corded Keyboard K280e
+	c32b  G910 Orion Spark Mechanical Keyboard
+	c332  G502 Proteus Spectrum Optical Mouse
+	c335  G910 Orion Spectrum Mechanical Keyboard
+	c33a  G413 Gaming Keyboard
+	c33f  G815 Mechanical Keyboard
 	c401  TrackMan Marble Wheel
 	c402  Marble Mouse (2-button)
+	c403  Turbo TrackMan Marble FX
 	c404  TrackMan Wheel
 	c408  Marble Mouse (4-button)
 	c501  Cordless Mouse Receiver
+	c502  Cordless Mouse & iTouch Keys
 	c503  Cordless Mouse+Keyboard Receiver
 	c504  Cordless Mouse+Keyboard Receiver
 	c505  Cordless Mouse+Keyboard Receiver
-	c506  MX-700 Cordless Mouse Receiver
+	c506  MX700 Cordless Mouse Receiver
+	c508  Cordless Trackball
+	c509  Cordless Keyboard & Mouse
+	c50a  Cordless Mouse
 	c50b  Cordless Desktop Optical
-	c50e  MX-1000 Cordless Mouse Receiver
+	c50c  Cordless Desktop S510
+	c50d  Cordless Mouse
+	c50e  Cordless Mouse Receiver
+	c510  Cordless Mouse
+	c512  LX-700 Cordless Desktop Receiver
+	c513  MX3000 Cordless Desktop Receiver
+	c514  Cordless Mouse
+	c515  Cordless 2.4 GHz Presenter Presentation remote control
 	c517  LX710 Cordless Desktop Laser
 	c518  MX610 Laser Cordless Mouse
+	c51a  MX Revolution/G7 Cordless Mouse
+	c51b  V220 Cordless Optical Mouse for Notebooks
+	c521  Cordless Mouse Receiver
+	c525  MX Revolution Cordless Mouse
+	c526  Nano Receiver
+	c529  Logitech Keyboard + Mice
+	c52b  Unifying Receiver
+	c52d  R700 Remote Presenter receiver
+	c52e  MK260 Wireless Combo Receiver
+	c52f  Unifying Receiver
+	c531  C-U0007 [Unifying Receiver]
+	c532  Unifying Receiver
+	c534  Unifying Receiver
+	c537  Cordless Mouse Receiver
+	c53a  PowerPlay Wireless Charging System
+	c53d  G631 Keyboard
+	c603  3Dconnexion Spacemouse Plus XT
+	c605  3Dconnexion CADman
+	c606  3Dconnexion Spacemouse Classic
+	c621  3Dconnexion Spaceball 5000
+	c623  3Dconnexion Space Traveller 3D Mouse
+	c625  3Dconnexion Space Pilot 3D Mouse
+	c626  3Dconnexion Space Navigator 3D Mouse
+	c627  3Dconnexion Space Explorer 3D Mouse
+	c628  3Dconnexion Space Navigator for Notebooks
+	c629  3Dconnexion SpacePilot Pro 3D Mouse
+	c62b  3Dconnexion Space Mouse Pro
+	c640  NuLOOQ navigator
+	c702  Cordless Presenter
+	c703  Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth)
+	c704  diNovo Wireless Desktop
+	c705  MX900 Bluetooth Wireless Hub (C-UJ16A)
+	c707  Bluetooth wireless hub
+	c708  Bluetooth wireless hub
 	c709  BT Mini-Receiver (HCI mode)
+	c70a  MX5000 Cordless Desktop
 	c70b  BT Mini-Receiver (HID proxy mode)
 	c70c  BT Mini-Receiver (HID proxy mode)
+	c70d  Bluetooth wireless hub
+	c70e  MX1000 Bluetooth Laser Mouse
+	c70f  Bluetooth wireless hub
+	c712  Bluetooth wireless hub
+	c714  diNovo Edge Keyboard
+	c715  Bluetooth wireless hub
+	c71a  Bluetooth wireless hub
+	c71d  Bluetooth wireless hub
+	c71f  diNovo Mini Wireless Keyboard
+	c720  Bluetooth wireless hub
+	ca03  MOMO Racing
 	ca04  Formula Vibration Feedback Wheel
+	ca84  Cordless Controller for Xbox
+	ca88  Thunderpad for Xbox
+	ca8a  Precision Vibration Feedback Wheel for Xbox
+	caa3  DriveFX Racing Wheel
+	cab1  Cordless Keyboard for Wii HID Receiver
 	d001  QuickCam Pro
+	f301  Controller
 046e  Behavior Tech. Computer Corp.
+	0100  Keyboard
+	3001  Mass Storage Device
+	3002  Mass Storage Device
+	3003  Mass Storage Device
+	3005  Mass Storage Device
+	3008  Mass Storage Device
+	5250  KeyMaestro Multimedia Keyboard
+	5273  KeyMaestro Multimedia Keyboard
+	52e6  Cordless Mouse
+	5308  KeyMaestro Keyboard
+	5408  KeyMaestro Multimedia Keyboard/Hub
+	5500  Portable Keyboard 86+9 keys (Model 6100C US)
+	5550  5 button optical mouse model M873U
+	5720  Smart Card Reader
 	6782  BTC 7932 mouse+keyboard
 046f  Crystal Semiconductor
-0471  Philips
+0471  Philips (or NXP)
 	0101  DSS350 Digital Speaker System
 	0104  DSS330 Digital Speaker System [uda1321]
+	0105  UDA1321
+	014f  GoGear SA9200
+	0160  MP3 Player
+	0161  MP3 Player
+	0163  GoGear SA1100
+	0164  GoGear SA1110/02
+	0165  GoGear SA1330
 	0201  Hub
 	0222  Creative Nomad Jukebox
-	0302  PCA645VC WebCam [pwc]
-	0303  PCA646VC WebCam [pwc]
-	0304  Askey VC010 WebCam [pwc]
-	0307  PCVC675K WebCam [pwc]
-	0308  PCVC680K WebCam [pwc]
-	030c  PCVC690K WebCam [pwc]
-	0310  PCVC730K WebCam [pwc]
+	0302  PCA645VC Webcam [pwc]
+	0303  PCA646VC Webcam [pwc]
+	0304  Askey VC010 Webcam [pwc]
+	0307  PCVC675K Webcam [pwc]
+	0308  PCVC680K Webcam [pwc]
+	030b  PC VGA Camera (Vesta Fun)
+	030c  PCVC690K Webcam [pwc]
+	0310  PCVC730K Webcam [pwc]
 	0311  PCVC740K ToUcam Pro [pwc]
-	0312  PCVC750K WebCam [pwc]
-	0327  WEBc am SPC 6000 NC (WebCam w/ mic)
+	0312  PCVC750K Webcam [pwc]
+	0314  DMVC 1000K
+	0316  DMVC 2000K Video Capture
+	0321  FunCam
+	0322  DMVC1300K PC Camera
+	0325  SPC 200NC PC Camera
+	0326  SPC 300NC PC Camera
+	0327  Webcam SPC 6000 NC (Webcam w/ mic)
+	0328  SPC 700NC PC Camera
+	0329  SPC 900NC PC Camera / ORITE CCD Webcam(PC370R)
+	032d  SPC 210NC PC Camera
+	032e  SPC 315NC PC Camera
+	0330  SPC 710NC PC Camera
+	0331  SPC 1300NC PC Camera
+	0332  SPC 1000NC PC Camera
+	0333  SPC 620NC PC Camera
+	0334  SPC 520/525NC PC Camera
+	0401  Semiconductors CICT Keyboard
+	0402  PS/2 Mouse on Semiconductors CICT Keyboard
+	0406  15 inch Detachable Monitor
+	0407  10 inch Mobile Monitor
+	0408  SG3WA1/74 802.11b WLAN Adapter [Atmel AT76C503A]
 	0471  Digital Speaker System
 	0601  OVU1020 IR Dongle (Kbd+Mouse)
+	0602  ATI Remote Wonder II Input Device
+	0603  ATI Remote Wonder II Controller
+	0608  eHome Infrared Receiver
+	060a  TSU9600 Remote Control
+	060c  Consumer Infrared Transceiver (HP)
+	060d  Consumer Infrared Transceiver (SRM5100)
+	060e  RF Dongle
+	060f  Consumer Infrared Transceiver
+	0613  Infrared Transceiver
+	0617  IEEE802.15.4 RF Dongle
+	0619  TSU9400 Remote Control
+	0666  Hantek DDS-3005 Arbitrary Waveform Generator
+	0700  Semiconductors CICT Hub
 	0701  150P1 TFT Display
+	0809  AVNET Bluetooth Device
 	0811  JR24 CDRW
+	0814  DCCX38/P data cable
+	0815  eHome Infrared Receiver
+	0844  SA2111/02 1GB Flash Audio Player
+	084a  GoGear SA3125
+	084e  GoGear SA60xx (mtp)
+	0888  Hantek DDS-3005 Arbitrary Waveform Generator
+	1103  Digital Speaker System
 	1120  Creative Rhomba MP3 player
+	1125  Nike psa[128max Player
+	1137  HDD065 MP3 player
+	1201  Arima Bluetooth Device
+	1230  Wireless Adapter 11g
+	1232  SNU6500 Wireless Adapter
+	1233  Wireless Adapter Bootloader Download
+	1236  SNU5600 802.11bg
+	1237  TalkTalk SNU5630NS/05 802.11bg
+	1552  ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit
 	1801  Diva MP3 player
+	200a  Wireless Network Adapter
+	200f  802.11n Wireless Adapter
+	2021  SDE3273FC/97 2.5" SATA HDD Enclosure [INIC-1608L]
+	2022  GoGear SA52XX
+	2034  Webcam SPC530NC
+	2036  Webcam SPC1030NC
+	203f  TSU9200 Remote Control
+	2046  TSU9800 Remote Control
+	204e  GoGear RaGa (SA1942/02)
+	205e  TSU9300 Remote Control
+	206c  MCE IR Receiver - Spinel plusf0r ASUS
+	2070  GoGear Mix
+	2076  GoGear Aria
+	2079  GoGear Opus
+	2088  MCE IR Receiver with ALS- Spinel plus for ASUS
+	209e  PTA01 Wireless Adapter
+	20b6  GoGear Vibe
+	20d0  SPZ2000 Webcam [PixArt PAC7332]
+	20e3  GoGear Raga
+	20e4  GoGear ViBE 8GB
+	2160  Mio LINK Heart Rate Monitor
+	21e0  GoGEAR Raga
+	262c  SPC230NC Webcam
+	2721  PTA 317 TV Camera
+	485d  Senselock SenseIV v2.x
+	df55  LPCXpresso LPC-Link
 0472  Chicony Electronics Co., Ltd
-	0065  PFU-65 Keyboard
+	0065  PFU-65 Keyboard [Chicony]
+	b086  Asus USB2.0 Webcam
+	b091  Webcam
 0473  Sanyo Information Business Co., Ltd
 0474  Sanyo Electric Co., Ltd
 	0110  Digital Voice Recorder R200
@@ -778,138 +3208,723 @@
 	022f  C5 Digital Media Camera (mass storage mode)
 	0230  C5 Digital Media Camera (PictBridge mode)
 	0231  C5 Digital Media Camera (PC control mode)
+	0401  Optical Drive
 	0701  SCP-4900 Cellphone
+	071f  Usb Com Port Enumerator
+	0722  W33SA Camera
 0475  Relisys/Teco Information System
+	0100  NEC Petiscan
+	0103  Eclipse 1200U/Episode
+	0210  Scorpio Ultra 3
 0476  AESP
 0477  Seagate Technology, Inc.
 0478  Connectix Corp.
 	0001  QuickCam
 	0002  QuickClip
+	0003  QuickCam Pro
 0479  Advanced Peripheral Laboratories
 047a  Semtech Corp.
+	0004  ScreenCoder UR7HCTS2-USB
 047b  Silitek Corp.
+	0001  Keyboard
 	0002  Keyboard and Mouse
+	0011  SK-1688U Keyboard
+	00f9  SK-1789u Keyboard
 	0101  BlueTooth Keyboard and Mouse
 	020b  SK-3105 SmartCard Reader
+	050e  Internet Compact Keyboard
+	1000  Trust Office Scan USB 19200
 	1002  HP ScanJet 4300c Parallel Port
 047c  Dell Computer Corp.
+	ffff  UPS Tower 500W LV
 047d  Kensington
+	1001  Mouse*in*a*Box
+	1002  Expert Mouse Pro
 	1003  Orbit TrackBall
+	1004  MouseWorks
 	1005  TurboBall
+	1006  TurboRing
 	1009  Orbit TrackBall for Mac
+	1012  PocketMouse
+	1013  Mouse*in*a*Box Optical Pro
+	1014  Expert Mouse Pro Wireless
+	1015  Expert Mouse
+	1016  ADB/USB Orbit
+	1018  Studio Mouse
+	101d  Mouse*in*a*Box Optical Pro
+	101e  Studio Mouse Wireless
 	101f  PocketMouse Pro
+	1020  Expert Mouse Trackball
+	1021  Expert Mouse Wireless
+	1022  Orbit Optical
+	1023  Pocket Mouse Pro Wireless
+	1024  PocketMouse
+	1025  Mouse*in*a*Box Optical Elite Wireless
+	1026  Pocket Mouse Pro
+	1027  StudioMouse
+	1028  StudioMouse Wireless
+	1029  Mouse*in*a*Box Optical Elite
+	102a  Mouse*in*a*Box Optical
+	102b  PocketMouse
+	102c  Iridio
+	102d  Pilot Optical
+	102e  Pilot Optical Pro
+	102f  Pilot Optical Pro Wireless
+	1042  Ci25m Notebook Optical Mouse [Diamond Eye Precision]
+	1043  Ci65m Wireless Notebook Optical Mouse
+	104a  PilotMouse Mini Retractable
+	105d  PocketMouse Bluetooth
+	105e  Bluetooth EDR Dongle
+	1061  PocketMouse Grip
+	1062  PocketMouse Max
+	1063  PocketMouse Max Wireless
+	1064  PocketMouse 2.0 Wireless
+	1065  PocketMouse 2.0
+	1066  PocketMouse Max Glow
+	1067  ValueMouse
+	1068  ValueOpt White
+	1069  ValueOpt Black
+	106a  PilotMouse Laser Wireless Mini
+	106b  PilotMouse Laser - 3 Button
+	106c  PilotMouse Laser - Gaming
+	106d  PilotMouse Laser - Wired
+	106e  PilotMouse Micro Laser
+	1070  ValueOpt Travel
+	1071  ValueOpt RF TX
+	1072  PocketMouse Colour
+	1073  PilotMouse Laser - 6 Button
+	1074  PilotMouse Laser Wireless Mini
+	1075  SlimBlade Presenter Media Mouse
+	1076  SlimBlade Media Mouse
+	1077  SlimBlade Presenter Mouse
+	1152  Bluetooth EDR Dongle
+	2002  Optical Elite Wireless
 	2010  Wireless Presentation Remote
+	2012  Wireless Presenter with Laser Pointer
+	2021  PilotBoard Wireless
+	2030  PilotBoard Wireless
+	2034  SlimBlade Media Notebook Set
+	2041  SlimBlade Trackball
+	2048  Orbit Trackball with Scroll Ring
+	4003  Gravis Xterminator Digital Gamepad
 	4005  Gravis Eliminator GamePad Pro
 	4006  Gravis Eliminator AfterShock
+	4007  Gravis Xterminator Force
 	4008  Gravis Destroyer TiltPad
+	5001  Cabo I Camera
 	5002  VideoCam CABO II
 	5003  VideoCam
+	8018  Expert Wireless Trackball Mouse (K72359WW)
 047e  Agere Systems, Inc. (Lucent)
+	0300  ORiNOCO Card
 	1001  USS720 Parallel Port
+	2892  Systems Soft Modem
+	bad1  Lucent 56k Modem
 	f101  Atlas Modem
 047f  Plantronics, Inc.
-0480  Toshiba America Info. Systems, Inc.
+	0101  Bulk Driver
+	02ee  BT600
+	0301  Bulk Driver
+	0411  Savi Office Base Station
+	0ca1  USB DSP v4 Audio Interface
+	4254  BUA-100 Bluetooth Adapter
+	aa05  DA45
+	ac01  Savi 7xx
+	ad01  GameCom 777 5.1 Headset
+	af01  DA80
+	c008  Audio 655 DSP
+	c00e  Blackwire C310 headset
+	c03b  HD1
+	ca01  Calisto 800 Series
+	da60  DA60
+0480  Toshiba America Inc
+	0001  InTouch Module
+	0004  InTouch Module
+	0011  InTouch Module
+	0014  InTouch Module
+	0100  Stor.E Slim USB 3.0
+	0200  External Disk
+	0820  Canvio Advance Disk
+	0821  Canvio Advance 2TB model DTC920
+	0900  MQ04UBF100
+	a006  External Disk 1.5TB
+	a007  External Disk USB 3.0
+	a009  Stor.E Basics
+	a00d  STOR.E BASICS 500GB
+	a100  Canvio Alu 2TB 2.5" Black External Disk Model HDTH320EK3CA
+	a102  Canvio Alu 2TB 2.5" Black External Disk Model HDTH320EK3CA
+	a202  Canvio Basics HDD
+	a208  Canvio Basics 2TB USB 3.0 Portable Hard Drive
+	b001  Stor.E Partner
+	b207  Canvio Ready
+	d000  External Disk 2TB Model DT01ABA200
+	d010  External Disk 3TB
+	d011  Canvio Desk
 0481  Zenith Data Systems
 0482  Kyocera Corp.
 	000e  FS-1020D Printer
+	000f  FS-1920 Mono Printer
+	0015  FS-1030D printer
+	0100  Finecam S3x
+	0101  Finecam S4
 	0103  Finecam S5
-0483  SGS Thomson Microelectronics
-	1307  Cytronix 6in1 card reader
+	0105  Finecam L3
+	0106  Finecam
+	0107  Digital Camera Device
+	0108  Digital Camera Device
+	0203  AH-K3001V
+	0204  iBurst Terminal
+	0408  FS-1320D Printer
+	0640  ECOSYS M6026cdn
+	069b  ECOSYS M2635dn
+	06b4  ECOSYS M5526cdw
+0483  STMicroelectronics
+	0137  BeWAN ADSL USB ST (blue or green)
+	0138  Unicorn II (ST70138B + MTC-20174TQ chipset)
+	0adb  Android Debug Bridge (ADB) device
+	0afb  Android Fastboot device
+	1307  Cytronix 6in1 Card Reader
 	163d  Cool Icam Digi-MP3
+	2015  TouchChip® Fingerprint Reader
 	2016  Fingerprint Reader
 	2017  Biometric Smart Card Reader
+	2018  BioSimKey
+	2302  Portable Flash Device (PFD)
+	3744  ST-LINK/V1
+	3747  ST Micro Connect Lite
+	3748  ST-LINK/V2
+	374b  ST-LINK/V2.1
+	374d  STLINK-V3 Loader
+	374e  STLINK-V3
+	374f  STLINK-V3
+	3752  ST-LINK/V2.1
+	3753  STLINK-V3
+	4810  ISDN adapter
+	481d  BT Digital Access adapter
+	5000  ST Micro/Ergenic ERG BT-002 Bluetooth Adapter
+	5001  ST Micro Bluetooth Device
+	5710  Joystick in FS Mode
+	5720  Mass Storage Device
+	5721  Interrupt Demo
+	5722  Bulk Demo
+	5730  Audio Speaker
+	5731  Microphone
+	5740  Virtual COM Port
+	5750  LED badge -- mini LED display -- 11x44
+	7270  ST Micro Serial Bridge
 	7554  56k SoftModem
+	8213  ThermaData Logger Cradle
+	8259  Probe
+	91d1  Sensor Hub
+	a171  ThermaData WiFi
+	a2e0  BMeasure instrument
+	df11  STM Device in DFU Mode
+	ff10  Swann ST56 Modem
 0484  Specialix
 0485  Nokia Monitors
 0486  ASUS Computers, Inc.
+	0185  EeePC T91MT HID Touch Panel
 0487  Stewart Connector
 0488  Cirque Corp.
 0489  Foxconn / Hon Hai
 	0502  SmartMedia Card Reader Firmware Loader
 	0503  SmartMedia Card Reader
+	d00c  Rollei Compactline (Storage Mode)
+	d00e  Rollei Compactline (Video Mode)
+	e000  T-Com TC 300
+	e003  Pirelli DP-L10
+	e00d  Broadcom Bluetooth 2.1 Device
+	e00f  Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]
+	e011  Acer Bluetooth module
+	e016  Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]
+	e02c  Atheros AR5BBU12 Bluetooth Device
+	e032  Broadcom BCM20702 Bluetooth
+	e042  Broadcom BCM20702 Bluetooth
+	e04d  Atheros AR3012 Bluetooth
+	e055  BCM43142A0 broadcom bluetooth
 048a  S-MOS Systems, Inc.
 048c  Alps Electric Ireland, Ltd
 048d  Integrated Technology Express, Inc.
+	1165  IT1165 Flash Controller
+	1172  Flash Drive
+	1234  Chipsbank CBM2199 Flash Drive
+	1336  SD/MMC Cardreader
+	1345  Multi Cardreader
+	8297  IT8297 RGB LED Controller
+	9006  IT9135 BDA Afatech DVB-T HDTV Dongle
+	9009  Zolid HD DVD Maker
+	9135  Zolid Mini DVB-T Stick
+	9306  IT930x DVB stick
+	9503  ITE it9503 feature-limited DVB-T transmission chip [ccHDtv]
+	9507  ITE it9507 full featured DVB-T transmission chip [ccHDtv]
+	9910  IT9910 chipset based grabber
+	ff59  Hdmi-CEC Bridge
 048f  Eicon Tech.
 0490  United Microelectronics Corp.
 0491  Capetronic
+	0003  Taxan Monitor Control
 0492  Samsung SemiConductor, Inc.
+	0140  MP3 player
+	0141  MP3 Player
 0493  MAG Technology Co., Ltd
 0495  ESS Technology, Inc.
 0496  Micron Electronics
 0497  Smile International
+	c001  Camera Device
 0498  Capetronic (Kaohsiung) Corp.
 0499  Yamaha Corp.
+	1000  UX256 MIDI I/F
+	1001  MU1000
+	1002  MU2000
+	1003  MU500
+	1004  UW500
+	1005  MOTIF6
+	1006  MOTIF7
+	1007  MOTIF8
+	1008  UX96 MIDI I/F
+	1009  UX16 MIDI I/F
+	100a  EOS BX
+	100c  UC-MX
+	100d  UC-KX
+	100e  S08
+	100f  CLP-150
+	1010  CLP-170
+	1011  P-250
+	1012  TYROS
+	1013  PF-500
+	1014  S90
+	1015  MOTIF-R
+	1016  MDP-5
+	1017  CVP-204
+	1018  CVP-206
+	1019  CVP-208
+	101a  CVP-210
+	101b  PSR-1100
+	101c  PSR-2100
+	101d  CLP-175
+	101e  PSR-K1
+	101f  EZ-J24
+	1020  EZ-250i
+	1021  MOTIF ES 6
+	1022  MOTIF ES 7
+	1023  MOTIF ES 8
+	1024  CVP-301
+	1025  CVP-303
+	1026  CVP-305
+	1027  CVP-307
+	1028  CVP-309
+	1029  CVP-309GP
+	102a  PSR-1500
+	102b  PSR-3000
+	102e  ELS-01/01C
+	1030  PSR-295/293
+	1031  DGX-205/203
+	1032  DGX-305
+	1033  DGX-505
+	1037  PSR-E403
+	103c  MOTIF-RACK ES
+	1054  S90XS Keyboard/Music Synthesizer
+	160f  P-105
+	1613  Clavinova CLP535
+	1617  PSR-E353 digital keyboard
+	1704  Steinberg UR44
+	2000  DGP-7
+	2001  DGP-5
+	3001  YST-MS55D USB Speaker
+	3003  YST-M45D USB Speaker
+	4000  NetVolante RTA54i Broadband&ISDN Router
+	4001  NetVolante RTW65b Broadband Wireless Router
+	4002  NetVolante RTW65i Broadband&ISDN Wireless Router
+	4004  NetVolante RTA55i Broadband VoIP Router
+	5000  CS1D
+	5001  DSP1D
+	5002  DME32
+	5003  DM2000
+	5004  02R96
+	5005  ACU16-C
+	5006  NHB32-C
+	5007  DM1000
+	5008  01V96
+	5009  SPX2000
+	500a  PM5D
+	500b  DME64N
+	500c  DME24N
 	6001  CRW2200UX Lightspeed 2 External CD-RW Drive
+	7000  DTX
+	7010  UB99
 049a  Gandalf Technologies, Ltd
 049b  Curtis Computer Products
 049c  Acer Advanced Labs, Inc.
 	0002  Keyboard (???)
 049d  VLSI Technology
 049f  Compaq Computer Corp.
+	0002  InkJet Color Printer
 	0003  iPAQ PocketPC
 	000e  Internet Keyboard
+	0012  InkJet Color Printer
 	0018  PA-1/PA-2 MP3 Player
+	0019  InkJet Color Printer
 	001a  S4 100 Scanner
+	001e  IJ650 Inkjet Printer
+	001f  WL215 Adapter
 	0021  S200 Scanner
+	0027  Bluetooth Multiport Module by Compaq
+	002a  1400P Inkjet Printer
+	002b  A3000
+	002c  Lexmark X125
 	0032  802.11b Adapter [ipaq h5400]
-	0033  802.11b Adapter [orinoco]
+	0033  Wireless LAN MultiPort W100 [Intersil PRISM 2.5]
+	0036  Bluetooth Multiport Module
 	0051  KU-0133 Easy Access Interner Keyboard
+	0076  Wireless LAN MultiPort W200
+	0080  GPRS Multiport
+	0086  Bluetooth Device
+	504a  Personal Jukebox PJB100
 	505a  Linux-USB "CDC Subset" Device, or Itsy (experimental)
 	8511  iPAQ Networking 10/100 Ethernet [pegasus2]
 04a0  Digital Equipment Corp.
 04a1  SystemSoft Corp.
+	fff0  Telex Composite Device
 04a2  FirePower Systems
 04a3  Trident Microsystems, Inc.
 04a4  Hitachi, Ltd
+	0004  DVD-CAM DZ-MV100A Camcorder
+	001e  DVDCAM USB HS Interface
 04a5  Acer Peripherals Inc. (now BenQ Corp.)
 	0001  Keyboard
+	0002  API Ergo K/B
+	0003  API Generic K/B Mouse
 	12a6  AcerScan C310U
 	1a20  Prisa 310U
 	1a2a  Prisa 620U
 	2022  Prisa 320U/340U
 	2040  Prisa 620UT
+	205e  ScanPrisa 640BU
 	2060  Prisa 620U+/640U
 	207e  Prisa 640BU
+	209e  ScanPrisa 640BT
+	20ae  S2W 3000U
 	20b0  S2W 3300U/4300U
 	20be  Prisa 640BT
 	20c0  Prisa 1240UT
 	20de  S2W 4300U+
+	20f8  Benq 5000
 	20fc  Benq 5000
 	20fe  SW2 5300U
-	3003  Benq WebCam
+	2137  Benq 5150/5250
+	2202  Benq 7400UT
+	2311  Benq 5560
+	3003  Benq Webcam
 	3008  Benq 1500
 	300a  Benq 3410
 	300c  Benq 1016
 	3019  Benq DC C40
+	4000  P30 Composite Device
+	4013  BenQ-Siemens EF82/SL91
+	4044  BenQ-Siemens SF71
+	4045  BenQ-Siemens E81
+	4048  BenQ M7
+	6001  Mass Storage Device
+	6002  Mass Storage Device
+	6003  ATA/ATAPI Adapter
+	6004  Mass Storage Device
+	6005  Mass Storage Device
+	6006  Mass Storage Device
+	6007  Mass Storage Device
+	6008  Mass Storage Device
+	6009  Mass Storage Device
+	600a  Mass Storage Device
+	600b  Mass Storage Device
+	600c  Mass Storage Device
+	600d  Mass Storage Device
+	600e  Mass Storage Device
+	600f  Mass Storage Device
+	6010  Mass Storage Device
+	6011  Mass Storage Device
+	6012  Mass Storage Device
+	6013  Mass Storage Device
+	6014  Mass Storage Device
+	6015  Mass Storage Device
+	6125  MP3 Player
+	6180  MP3 Player
+	6200  MP3 Player
+	7500  Hi-Speed Mass Storage Device
+	9000  AWL300 Wireless Adapter
+	9001  AWL400 Wireless Adapter
 	9213  Kbd Hub
 04a6  Nokia Display Products
+	00b9  Audio
+	0180  Hub Type P
+	0181  HID Monitor Controls
 04a7  Visioneer
+	0100  StrobePro
+	0101  Strobe Pro Scanner (1.01)
+	0102  StrobePro Scanner
 	0211  OneTouch 7600 Scanner
 	0221  OneTouch 5300 Scanner
+	0223  OneTouch 8200
 	0224  OneTouch 4800 USB/Microtek Scanport 3000
+	0225  VistaScan Astra 3600(ENG)
 	0226  OneTouch 5300 USB
+	0229  OneTouch 7100
+	022a  OneTouch 6600
+	022c  OneTouch 9000/9020
 	0231  6100 Scanner
 	0311  6200 EPP/USB Scanner
 	0321  OneTouch 8100 EPP/USB Scanner
 	0331  OneTouch 8600 EPP/USB Scanner
+	0341  6400
+	0361  VistaScan Astra 3600(ENG)
+	0362  OneTouch 9320
+	0371  OneTouch 8700/8920
+	0380  OneTouch 7700
+	0382  Photo Port 7700
+	0390  9650
+	03a0  Xerox 4800 One Touch
+	0410  OneTouch Pro 8800/8820
+	0421  9450 USB
+	0423  9750 Scanner
+	0424  Strobe XP 450
+	0425  Strobe XP 100
+	0426  Strobe XP 200
+	0427  Strobe XP 100
+	0444  OneTouch 7300
+	0445  CardReader 100
+	0446  Xerox DocuMate 510
+	0447  XEROX DocuMate 520
+	0448  XEROX DocuMate 250
+	0449  Xerox DocuMate 252
+	044a  Xerox 6400
+	044c  Xerox DocuMate 262
+	0474  Strobe XP 300
+	0475  Xerox DocuMate 272
+	0478  Strobe XP 220
+	0479  Strobe XP 470
+	047a  9450
+	047b  9650
+	047d  9420
+	0480  9520
+	048f  Strobe XP 470
+	0491  Strobe XP 450
+	0493  9750
+	0494  Strobe XP 120
+	0497  Patriot 430
+	0498  Patriot 680
+	0499  Patriot 780
+	049b  Strobe XP 100
+	04a0  7400
+	04ac  Xerox Travel Scanner 100
+	04bb  strobe 400 scanner
+	04cd  Xerox Travel Scanner 150
+	04ee  Duplex Combo Scanner
 04a8  Multivideo Labs, Inc.
+	0101  Hub
+	0303  Peripheral Switch
+	0404  Peripheral Switch
 04a9  Canon, Inc.
+	1005  BJ Printer Hub
+	1035  PD Printer Storage
+	1050  BJC-8200
 	1051  BJC-3000 Color Printer
+	1052  BJC-6100
+	1053  BJC-6200
+	1054  BJC-6500
+	1055  BJC-85
 	1056  BJC-2110 Color Printer
+	1057  LR1
+	105a  BJC-55
 	105b  S600 Printer
+	105c  S400
 	105d  S450 Printer
+	105e  S800
 	1062  S500 Printer
+	1063  S4500
 	1064  S300 Printer
+	1065  S100
+	1066  S630
+	1067  S900
+	1068  S9000
+	1069  S820
 	106a  S200 Printer
 	106b  S520 Printer
 	106d  S750 Printer
+	106e  S820D
+	1070  S530D
 	1072  I850 Printer
 	1073  I550 Printer
 	1074  S330 Printer
+	1076  i70
+	1077  i950
+	107a  S830D
+	107b  i320
+	107c  i470D
+	107d  i9100
+	107e  i450
+	107f  i860
+	1082  i350
+	1084  i250
+	1085  i255
+	1086  i560
+	1088  i965
+	108a  i455
+	108b  i900D
+	108c  i475D
+	108d  PIXMA iP2000
+	108f  i80
 	1090  i9900 Photo Printer
+	1091  PIXMA iP1500
+	1093  PIXMA iP4000
 	1094  PIXMA iP3000x Printer
+	1095  PIXMA iP6000D
+	1097  PIXMA iP5000
+	1098  PIXMA iP1000
+	1099  PIXMA iP8500
+	109c  PIXMA iP4000R
+	109d  iP90
+	10a0  PIXMA iP1600 Printer
+	10a2  iP4200
+	10a4  iP5200R
+	10a5  iP5200
+	10a7  iP6210D
+	10a8  iP6220D
+	10a9  iP6600D
 	10b6  PIXMA iP4300 Printer
+	10b7  PIXMA iP5300 Printer
+	10c2  PIXMA iP1800 Printer
+	10c4  Pixma iP4500 Printer
+	10c9  PIXMA iP4600 Printer
+	10ca  PIXMA iP3600 Printer
+	10e3  PIXMA iX6850 Printer
+	12fe  Printer in service mode
+	1404  W6400PG
+	1405  W8400PG
+	150f  BIJ2350 PCL
+	1510  BIJ1350 PCL
+	1512  BIJ1350D PCL
+	1601  DR-2080C Scanner
+	1607  DR-6080 Scanner
+	1608  DR-2580C Scanner
+	1609  DR-3080CII
+	160a  DR-2050C Scanner
+	1700  PIXMA MP110 Scanner
+	1701  PIXMA MP130 Scanner
+	1702  MP410 Composite
+	1703  MP430 Composite
+	1704  MP330 Composite
+	1706  PIXMA MP750 Scanner
+	1707  PIXMA MP780/MP790
+	1708  PIXMA MP760/MP770
+	1709  PIXMA MP150 Scanner
+	170a  PIXMA MP170 Scanner
+	170b  PIXMA MP450 Scanner
+	170c  PIXMA MP500 Scanner
+	170d  PIXMA MP800 Scanner
+	170e  PIXMA MP800R
+	1710  MP950
+	1712  PIXMA MP530
+	1713  PIXMA MP830 Scanner
+	1714  MP160
+	1715  PIXMA MP180
+	1716  PIXMA MP460
+	1717  PIXMA MP510
+	1718  PIXMA MP600
+	1719  PIXMA MP600R
+	171a  PIXMA MP810
+	171b  PIXMA MP960
+	171c  PIXMA MX7600
+	1721  PIXMA MP210
+	1722  PIXMA MP220
+	1723  PIXMA MP470
+	1724  PIXMA MP520 series
+	1725  PIXMA MP610
+	1726  PIXMA MP970
+	1727  PIXMA MX300
+	1728  PIXMA MX310 series
+	1729  PIXMA MX700
+	172b  MP140 ser
+	172c  PIXMA MX850
+	172d  PIXMA MP980
+	172e  PIXMA MP630
+	172f  PIXMA MP620
+	1730  PIXMA MP540
+	1731  PIXMA MP480
+	1732  PIXMA MP240
+	1733  PIXMA MP260
+	1734  PIXMA MP190
+	1735  PIXMA MX860
+	1736  PIXMA MX320 series
+	1737  PIXMA MX330
+	173a  PIXMA MP250
+	173b  PIXMA MP270 All-In-One Printer
+	173c  PIXMA MP490
+	173d  PIXMA MP550
+	173e  PIXMA MP560
+	173f  PIXMA MP640
+	1740  PIXMA MP990
+	1741  PIXMA MX340
+	1742  PIXMA MX350
+	1743  PIXMA MX870
+	1746  PIXMA MP280
+	1747  PIXMA MP495
+	1748  PIXMA MG5100 Series
+	1749  PIXMA MG5200 Series
+	174a  PIXMA MG6100 Series
+	174b  PIXMA MG8100 Series
+	174d  PIXMA MX360
+	174e  PIXMA MX410
+	174f  PIXMA MX420
+	1750  PIXMA MX880 Series
+	1752  PIXMA MG3100 Series
+	1753  PIXMA MG4100 Series
+	1754  PIXMA MG5300 Series
+	1755  PIXMA MG6200 Series
+	1756  PIXMA MG8200 Series
+	1757  PIXMA MP493
+	1759  PIXMA MX370 Series
+	175b  PIXMA MX430 Series
+	175c  PIXMA MX510 Series
+	175d  PIXMA MX710 Series
+	175e  PIXMA MX890 Series
+	175f  PIXMA MP230
+	1762  PIXMA MG3200 Series
+	1763  PIXMA MG4200 Series
+	1764  PIXMA MG5400 Series
+	1765  PIXMA MG6300 Series
+	1766  PIXMA MX390 Series
+	1768  PIXMA MX450 Series
+	1769  PIXMA MX520 Series
+	176a  PIXMA MX720 Series
+	176b  PIXMA MX920 Series
+	176d  PIXMA MG2500 Series
+	176e  PIXMA MG3500 Series
+	176f  PIXMA MG6500 Series
+	1770  PIXMA MG6400 Series
+	1771  PIXMA MG5500 Series
+	1772  PIXMA MG7100 Series
+	1774  PIXMA MX470 Series
+	1775  PIXMA MX530 Series
+	177c  PIXMA MG7500 Series
+	177e  PIXMA MG6600 Series
+	177f  PIXMA MG5600 Series
+	1780  PIXMA MG2900 Series
+	1787  PIXMA MX490 Series
+	178a  PIXMA MG3600 Series
+	178d  PIXMA MG6853
+	180b  PIXMA MG3000 series
+	1856  PIXMA TS6250
+	1900  CanoScan LiDE 90
+	1901  CanoScan 8800F
+	1904  CanoScan LiDE 100
+	1905  CanoScan LiDE 200
+	1906  CanoScan 5600F
+	1907  CanoScan LiDE 700F
+	1909  CanoScan LiDE 110
+	190a  CanoScan LiDE 210
+	190d  CanoScan 9000F Mark II
+	190e  CanoScan LiDE 120
+	190f  CanoScan LiDE 220
+	1913  CanoScan LiDE 300
+	2200  CanoScan LiDE 25
 	2201  CanoScan FB320U
 	2202  CanoScan FB620U
 	2204  CanoScan FB630U
@@ -925,14 +3940,135 @@
 	220f  CanoScan 8000F
 	2210  CanoScan 9900F
 	2212  CanoScan 5000F
-	2213  LiDE 50/LiDE 35
+	2213  CanoScan LiDE 50/LiDE 35/LiDE 40
+	2214  CanoScan LiDE 80
 	2215  CanoScan 3000/3000F/3000ex
 	2216  CanoScan 3200F
 	2217  CanoScan 5200F
+	2219  CanoScan 9950F
+	221b  CanoScan 4200F
+	221c  CanoScan LiDE 60
 	221e  CanoScan 8400F
+	221f  CanoScan LiDE 500F
+	2220  CanoScan LIDE 25
+	2224  CanoScan LiDE 600F
 	2225  CanoScan LiDE 70
+	2228  CanoScan 4400F
+	2229  CanoScan 8600F
+	2602  MultiPASS C555
+	2603  MultiPASS C755
+	260a  LBP810
+	260e  LBP-2000
+	2610  MPC600F
 	2611  SmartBase MPC400
+	2612  MultiPASS C855
+	2617  LBP1210
+	261a  iR1600
+	261b  iR1610
+	261c  iC2300
+	261f  MPC200 Printer
+	2621  iR2000
+	2622  iR2010
+	2623  FAX-B180C
+	2629  FAXPHONE L75
 	262b  LaserShot LBP-1120 Printer
+	262c  imageCLASS D300
+	262d  iR C3200
+	262f  PIXMA MP730
+	2630  PIXMA MP700
+	2631  LASER CLASS 700
+	2632  FAX-L2000
+	2633  LASERCLASS 500
+	2634  PC-D300/FAX-L400/ICD300
+	2635  MPC190
+	2636  LBP3200
+	2637  iR C6800
+	2638  iR C3100
+	263c  PIXMA MP360
+	263d  PIXMA MP370
+	263e  PIXMA MP390
+	263f  PIXMA MP375R
+	2646  MF5530 Scanner Device V1.9.1
+	2647  MF5550 Composite
+	264c  PIXMA MP740
+	264d  PIXMA MP710
+	264e  MF5630
+	264f  MF5650 (FAX)
+	2650  iR 6800C EUR
+	2651  iR 3100C EUR
+	2654  LBP3600
+	2655  FP-L170/MF350/L380/L398
+	2656  iR1510-1670 CAPT Printer
+	2657  LBP3210
+	2659  MF8100
+	265b  CAPT Printer
+	265c  iR C3220
+	265d  MF5730
+	265e  MF5750
+	265f  MF5770
+	2660  MF3110
+	2663  iR3570/iR4570
+	2664  iR2270/iR2870
+	2665  iR C2620
+	2666  iR C5800
+	2667  iR85PLUS
+	2669  iR105PLUS
+	266a  LBP3000
+	266b  iR8070
+	266c  iR9070
+	266d  iR 5800C EUR
+	266e  CAPT Device
+	266f  iR2230
+	2670  iR3530
+	2671  iR5570/iR6570
+	2672  iR C3170
+	2673  iR 3170C EUR
+	2674  FAX-L120
+	2675  iR2830
+	2676  LBP2900
+	2677  iR C2570
+	2678  iR 2570C EUR
+	2679  LBP5000
+	267a  iR2016
+	267b  iR2020
+	267d  MF7100 series
+	267e  LBP3300
+	2684  MF3200 series
+	2686  MF6500 series
+	2687  iR4530
+	2688  LBP3460
+	2689  FAX-L180/L380S/L398S
+	268a  LC310/L390/L408S
+	268b  LBP3500
+	268c  iR C6870
+	268d  iR 6870C EUR
+	268e  iR C5870
+	268f  iR 5870C EUR
+	2691  iR7105
+	26a1  LBP5300
+	26a3  MF4100 series
+	26a4  LBP5100
+	26b0  MF4600 series
+	26b4  MF4010 series
+	26b5  MF4200 series
+	26b6  FAX-L140/L130
+	26b9  LBP3310
+	26ba  LBP5050
+	26da  LBP3010/LBP3018/LBP3050
+	26db  LBP3100/LBP3108/LBP3150
+	26e6  iR1024
+	26ea  LBP9100C
+	26ee  MF4320-4350
+	26f1  LBP7200C
+	26ff  LBP6300
+	271a  LBP6000
+	271b  LBP6200
+	271c  LBP7010C/7018C
+	2736  I-SENSYS MF4550d
+	2737  MF4410
+	2742  imageRUNNER1133 series
+	2771  LBP6020
+	2796  LBP6230/6240
 	3041  PowerShot S10
 	3042  CanoScan FS4000US Film Scanner
 	3043  PowerShot S20
@@ -942,6 +4078,7 @@
 	3047  Digital IXUS
 	3048  PowerShot G1
 	3049  PowerShot Pro90 IS
+	304a  CP-10
 	304b  IXY Digital 300
 	304c  PowerShot S300
 	304d  Digital IXUS 300
@@ -960,6 +4097,7 @@
 	3060  EOS D60
 	3061  PowerShot A100
 	3062  PowerShot A200
+	3063  CP-100
 	3065  PowerShot S200
 	3066  Digital IXUS 330
 	3067  MV550i Digital Video Camera
@@ -972,7 +4110,7 @@
 	306f  PowerShot G3 (ptp)
 	3070  PowerShot S230
 	3071  PowerShot S230 (ptp)
-	3072  PowerShot SD100 / Digital IXUS 2 (ptp)
+	3072  PowerShot SD100 / Digital IXUS II (ptp)
 	3073  PowerShot A70 (ptp)
 	3074  PowerShot A60 (ptp)
 	3075  IXUS 400 Camera
@@ -980,8 +4118,9 @@
 	3077  PowerShot S50
 	3078  ZR70MC Digital Camcorder
 	307a  MV650i (normal mode)
-	307b  MV630i Difital Video Camera
-	307c  MV630i (normal mode)
+	307b  MV630i Digital Video Camera
+	307c  CP-200
+	307d  CP-300
 	307f  Optura 20
 	3080  MVX150i (normal mode) / Optura 20 (normal mode)
 	3081  Optura 10
@@ -999,6 +4138,11 @@
 	309a  PowerShot A80
 	309b  Digital IXUS (ptp)
 	309c  PowerShot S1 IS
+	309d  Powershot Pro 1
+	309f  Camera
+	30a0  Camera
+	30a1  Camera
+	30a2  Camera
 	30a8  Elura 60E/Optura 40 (ptp)
 	30a9  MVX25i (normal mode) / Optura 40 (normal mode)
 	30b1  PowerShot S70 (normal mode) / PowerShot S70 (PTP mode)
@@ -1012,6 +4156,8 @@
 	30b9  Powershot A85
 	30ba  PowerShot S410 Digital Elph
 	30bb  PowerShot A95
+	30bd  CP-220
+	30be  CP-330
 	30bf  Digital IXUS 40
 	30c0  Digital IXUS 30 (PTP mode) / PowerShot SD200 (PTP mode)
 	30c1  Digital IXUS 50 (normal mode) / IXY Digital 55 (normal mode) / PowerShot A520 (PTP mode) / PowerShot SD400 (normal mode)
@@ -1024,19 +4170,236 @@
 	30ef  EOS 350D (ptp)
 	30f0  PowerShot S2 IS (PTP mode)
 	30f2  Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode)
+	30f4  PowerShot SD30 / Ixus iZoom / IXY DIGITAL L3
+	30f5  SELPHY CP500
+	30f6  SELPHY CP400
+	30f8  Powershot A430
 	30f9  PowerShot A410 (PTP mode)
+	30fa  PowerShot S80
 	30fc  PowerShot A620 (PTP mode)
 	30fd  PowerShot A610 (normal mode)/PowerShot A610 (PTP mode)
+	30fe  Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode)
 	30ff  Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode)
+	3100  PowerShot TX1
+	310b  SELPHY CP600
 	310e  Digital IXUS 50 (PTP mode)
-	3116  Digital IXUS 750 (PTP mode)
+	310f  PowerShot A420
+	3110  EOS Digital Rebel XTi
+	3115  PowerShot SD900 / Digital IXUS 900 Ti / IXY DIGITAL 1000
+	3116  Digital IXUS 750 / PowerShot SD550 (PTP mode)
 	3117  PowerShot A700
+	3119  PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS
+	311a  PowerShot S3 IS
+	311b  PowerShot A540
+	311c  PowerShot SD600 DIGITAL ELPH / DIGITAL IXUS 60 / IXY DIGITAL 70
+	3125  PowerShot G7
+	3126  PowerShot A530
+	3127  SELPHY CP710
+	3128  SELPHY CP510
+	312d  Elura 100
+	3136  PowerShot SD800 IS / Digital IXUS 850 IS / IXY DIGITAL 900 IS
+	3137  PowerShot SD40 / Digital IXUS i7 IXY / DIGITAL L4
 	3138  PowerShot A710 IS
+	3139  PowerShot A640
+	313a  PowerShot A630
+	3141  SELPHY ES1
+	3142  SELPHY CP730
+	3143  SELPHY CP720
+	3145  EOS 450D
+	3146  EOS 40D
+	3147  EOS 1Ds Mark III
+	3148  PowerShot S5 IS
+	3149  PowerShot A460
+	314b  PowerShot SD850 IS DIGITAL ELPH / Digital IXUS 950 IS / IXY DIGITAL 810 IS
+	314c  PowerShot A570 IS
+	314d  PowerShot A560
+	314e  PowerShot SD750 DIGITAL ELPH / DIGITAL IXUS 75 / IXY DIGITAL 90
+	314f  PowerShot SD1000 DIGITAL ELPH / DIGITAL IXUS 70 / IXY DIGITAL 10
+	3150  PowerShot A550
+	3155  PowerShot A450
+	315a  PowerShot G9
+	315b  PowerShot A650 IS
+	315d  PowerShot A720
+	315e  PowerShot SX100 IS
+	315f  PowerShot SD950 IS DIGITAL ELPH / DIGITAL IXUS 960 IS / IXY DIGITAL 2000 IS
+	3160  Digital IXUS 860 IS
+	3170  SELPHY CP750
+	3171  SELPHY CP740
+	3172  SELPHY CP520
+	3173  PowerShot SD890 IS DIGITAL ELPH / Digital IXUS 970 IS / IXY DIGITAL 820 IS
+	3174  PowerShot SD790 IS DIGITAL ELPH / Digital IXUS 90 IS / IXY DIGITAL 95 IS
+	3175  IXY Digital 25 IS
+	3176  PowerShot A590
+	3177  PowerShot A580
+	317a  PC1267 [Powershot A470]
+	3184  Digital IXUS 80 IS (PTP mode)
+	3185  SELPHY ES2
+	3186  SELPHY ES20
+	318d  PowerShot SX100 IS
+	318e  PowerShot A1000 IS
+	318f  PowerShot G10
+	3191  PowerShot A2000 IS
+	3192  PowerShot SX110 IS
+	3193  PowerShot SD990 IS DIGITAL ELPH / Digital IXUS 980 IS / IXY DIGITAL 3000 IS
+	3195  PowerShot SX1 IS
+	3196  PowerShot SD880 IS DIGITAL ELPH / Digital IXUS 870 IS / IXY DIGITAL 920 IS
+	3199  EOS 5D Mark II
+	319a  EOS 7D
+	319b  EOS 50D
+	31aa  SELPHY CP770
+	31ab  SELPHY CP760
+	31ad  PowerShot E1
+	31af  SELPHY ES3
+	31b0  SELPHY ES30
+	31b1  SELPHY CP530
+	31bc  PowerShot D10
+	31bd  PowerShot SD960 IS DIGITAL ELPH / Digital IXUS 110 IS / IXY DIGITAL 510 IS
+	31be  PowerShot A2100 IS
+	31bf  PowerShot A480
+	31c0  PowerShot SX200 IS
+	31c1  PowerShot SD970 IS DIGITAL ELPH / Digital IXUS 990 IS / IXY DIGITAL 830 IS
+	31c2  PowerShot SD780 IS DIGITAL ELPH / Digital IXUS 100 IS / IXY DIGITAL 210 IS
+	31c3  PowerShot A1100 IS
+	31c4  PowerShot SD1200 IS DIGITAL ELPH / Digital IXUS 95 IS / IXY DIGITAL 110 IS
+	31cf  EOS Rebel T1i / EOS 500D / EOS Kiss X3
+	31dd  SELPHY CP780
+	31df  PowerShot G11
+	31e0  PowerShot SX120 IS
+	31e1  PowerShot S90
+	31e4  PowerShot SX20 IS
+	31e5  Digital IXUS 200 IS
+	31e6  PowerShot SD940 IS DIGITAL ELPH / Digital IXUS 120 IS / IXY DIGITAL 220 IS
+	31e7  SELPHY CP790
+	31ea  EOS Rebel T2i / EOS 550D / EOS Kiss X4
+	31ee  SELPHY ES40
+	31ef  PowerShot A495
+	31f0  PowerShot A490
+	31f1  PowerShot A3100 IS / PowerShot A3150 IS
+	31f2  PowerShot A3000 IS
+	31f3  PowerShot Digital ELPH SD1400 IS
+	31f4  PowerShot SD1300 IS / IXUS 105
+	31f5  Powershot SD3500 IS / IXUS 210 IS
+	31f6  PowerShot SX210 IS
+	31f7  Powershot SD4000 IS / IXUS 300 HS / IXY 30S
+	31f8  Powershot SD4500 IS / IXUS 1000 HS / IXY 50S
 	31ff  Digital IXUS 55
+	3209  Vixia HF S21 A
+	320f  PowerShot G12
+	3210  Powershot SX30 IS
+	3211  PowerShot SX130 IS
+	3212  Powershot S95
+	3214  SELPHY CP800
+	3215  EOS 60D
+	3218  EOS 600D / Rebel T3i (ptp)
+	3219  EOS 1D X
+	3223  PowerShot A3300 IS
+	3224  PowerShot A3200 IS
+	3225  PowerShot ELPH 500 HS / IXUS 310 HS
+	3226  PowerShow A800
+	3227  PowerShot ELPH 100 HS / IXUS 115 HS
+	3228  PowerShot SX230 HS
+	3229  PowerShot ELPH 300 HS / IXUS 220 HS
+	322a  PowerShot A2200
+	322b  Powershot A1200
+	322c  PowerShot SX220 HS
+	3233  PowerShot G1 X
+	3234  PowerShot SX150 IS
+	3235  PowerShot ELPH 510 HS / IXUS 1100 HS
+	3236  PowerShot S100
+	3237  PowerShot ELPH 310 HS / IXUS 230 HS
+	3238  PowerShot SX40 HS
+	323a  EOS 5D Mark III
+	323b  EOS Rebel T4i
+	323d  EOS M
+	323e  PowerShot A1300
+	323f  PowerShot A810
+	3240  PowerShot ELPH 320 HS / IXUS 240 HS
+	3241  PowerShot ELPH 110 HS / IXUS 125 HS
+	3242  PowerShot D20
+	3243  PowerShot A4000 IS
+	3244  PowerShot SX260 HS
+	3245  PowerShot SX240 HS
+	3246  PowerShot ELPH 530 HS / IXUS 510 HS
+	3247  PowerShot ELPH 520 HS / IXUS 500 HS
+	3248  PowerShot A3400 IS
+	3249  PowerShot A2400 IS
+	324a  PowerShot A2300
+	3250  EOS 6D
+	3252  EOS 1D C
+	3253  EOS 70D
+	3255  SELPHY CP900
+	3256  SELPHY CP810
+	3258  PowerShot G15
+	3259  PowerShot SX50 HS
+	325a  PowerShot SX160 IS
+	325b  PowerShot S110
+	325c  PowerShot SX500 IS
+	325e  PowerShot N
+	325f  PowerShot SX280 HS
+	3260  PowerShot SX270 HS
+	3261  PowerShot A3500 IS
+	3262  PowerShot A2600
+	3263  PowerShot SX275 HS
+	3264  PowerShot A1400
+	3265  Powershot ELPH 130 IS / IXUS 140
+	3266  Powershot ELPH 120 IS / IXUS 135
+	3268  PowerShot ELPH 330 HS / IXUS 255 HS
+	326f  EOS 7D Mark II
+	3270  EOS 100D
+	3271  PowerShot A2500
+	3272  EOS 700D
+	3274  PowerShot G16
+	3275  PowerShot S120
+	3276  PowerShot SX170 IS
+	3277  PowerShot SX510 HS
+	3278  PowerShot S200
+	327a  SELPHY CP910
+	327b  SELPHY CP820
+	327d  Powershot ELPH 115 IS / IXUS 132
+	327f  EOS Rebel T5 / EOS 1200D / EOS Kiss X70
+	3284  PowerShot D30
+	3285  PowerShot SX700 HS
+	3286  PowerShot SX600 HS
+	3287  PowerShot ELPH 140 IS / IXUS 150
+	3288  Powershot ELPH 135 / IXUS 145
+	3289  PowerShot ELPH 340 HS / IXUS 265 HS
+	328a  PowerShot ELPH 150 IS / IXUS 155
+	328b  PowerShot N Facebook(R) Ready
+	3299  EOS M3
+	329a  PowerShot SX60 HS
+	329b  PowerShot SX520 HS
+	329c  PowerShot SX400 IS
+	329d  PowerShot G7 X
+	329f  PowerShot SX530 HS
+	32a0  EOS M10
+	32a6  PowerShot SX710 HS
+	32a7  PowerShot SX610 HS
+	32a8  PowerShot G3 X
+	32aa  Powershot ELPH 160 / IXUS 160
+	32ab  PowerShot ELPH 350HS / IXUS 275 HS
+	32ac  PowerShot ELPH 170 IS / IXUS 170
+	32ad  PowerShot SX410 IS
+	32b1  SELPHY CP1200
+	32b2  PowerShot G9 X
+	32b3  PowerShot G5 X
+	32b4  EOS Rebel T6
+	32bb  EOS M5
+	32bf  PowerShot SX420 IS
+	32c0  PowerShot ELPH 190IS
+	32c1  PowerShot ELPH 180 / IXUS 175
+	32c2  PowerShot SX720 HS
+	32c5  EOS M6
+	32cc  EOS 200D
+	32d1  EOS M100
+	32d2  EOS M50
+	32d4  Powershot ELPH 185 / IXUS 185 / IXY 200
+	32d5  PowerShot SX430 IS
+	32db  SELPHY CP1300
 04aa  DaeWoo Telecom, Ltd
 04ab  Chromatic Research
 04ac  Micro Audiometrics Corp.
 04ad  Dooin Electronics
+	2501  Bluetooth Device
 04af  Winnov L.P.
 04b0  Nikon Corp.
 	0102  Coolpix 990
@@ -1062,6 +4425,8 @@
 	011d  Coolpix 3700 (ptp)
 	0121  Coolpix 3200 (ptp)
 	0122  Coolpix 2200 (ptp)
+	0124  Coolpix 8400 (mass storage mode)
+	0125  Coolpix 8400 (ptp)
 	0126  Coolpix 8800
 	0129  Coolpix 4800 (ptp)
 	012c  Coolpix 4100 (storage)
@@ -1069,9 +4434,14 @@
 	012e  Coolpix 5600 (ptp)
 	0130  Coolpix 4600 (ptp)
 	0135  Coolpix 5900 (ptp)
-	0142  Coolpix P2 (ptp)
 	0136  Coolpix 7900 (storage)
 	0137  Coolpix 7900 (ptp)
+	013a  Coolpix 100 (storage)
+	013b  Coolpix 100 (ptp)
+	0141  Coolpix P2 (storage)
+	0142  Coolpix P2 (ptp)
+	0163  Coolpix P5100 (ptp)
+	0169  Coolpix P50 (ptp)
 	0202  Coolpix SQ (ptp)
 	0203  Coolpix 4200 (mass storage mode)
 	0204  Coolpix 4200 (ptp)
@@ -1079,6 +4449,7 @@
 	0206  Coolpix 5200 (ptp)
 	0301  Coolpix 2000 (storage)
 	0302  Coolpix 2000 (ptp)
+	0317  Coolpix L20 (ptp)
 	0402  DSC D100 (ptp)
 	0403  D2H (mass storage mode)
 	0404  D2H SLR (ptp)
@@ -1089,21 +4460,52 @@
 	040a  D50 (ptp)
 	040c  D2Hs
 	040e  DSC D70s (ptp)
+	040f  D200 (mass storage mode)
+	0410  D200 (ptp)
+	0413  D40 (mass storage mode)
+	041e  D60 digital camera (mass storage mode)
+	0422  D700 (ptp)
+	0423  D5000
+	0424  D3000
+	0425  D300S
+	0428  D7000
+	0429  D5100
+	042a  D800 (ptp)
+	0430  D7100
+	0436  D810
+	043f  D5600
+	0f03  PD-10 Wireless Printer Adapter
 	4000  Coolscan LS 40 ED
+	4001  LS 50 ED/Coolscan V ED
+	4002  Super Coolscan LS-5000 ED
 04b1  Pan International
 04b3  IBM Corp.
+	3003  Rapid Access III Keyboard
 	3004  Media Access Pro Keyboard
+	300a  Rapid Access IIIe Keyboard
 	3016  UltraNav Keyboard Hub
 	3018  UltraNav Keyboard
+	301a  2-port low-power hub
 	301b  SK-8815 Keyboard
+	301c  Enhanced Performance Keyboard
+	3020  Enhanced Performance Keyboard
+	3025  NetVista Full Width Keyboard
 	3100  NetVista Mouse
 	3103  ScrollPoint Pro Mouse
+	3104  ScrollPoint Wireless Mouse
+	3105  ScrollPoint Optical (HID)
 	3107  ThinkPad 800dpi Optical Travel Mouse
 	3108  800dpi Optical Mouse w/ Scroll Point
 	3109  Optical ScrollPoint Pro Mouse
 	310b  Red Wheel Mouse
+	310c  Wheel Mouse
 	4427  Portable CD ROM
+	4482  Serial Converter
+	4484  SMSC USB20H04 3-Port Hub [ThinkPad X4 UltraBase, Wistron S Note-3 Media Slice]
+	4485  ThinkPad Dock Hub
+	4524  40 Character Vacuum Fluorescent Display
 	4525  Double sided CRT
+	4535  4610 Suremark Printer
 	4550  NVRAM (128 KB)
 	4554  Cash Drawer
 	4580  Hub w/ NVRAM
@@ -1111,88 +4513,371 @@
 	4604  Keyboard w/ Card Reader
 	4671  4820 LCD w/ MSR/KB
 04b4  Cypress Semiconductor Corp.
-	0000  Dacal DC-101 CD Library
 	0001  Mouse
 	0002  CY7C63x0x Thermometer
+	0008  CDC ACM serial port
+	0033  Mouse
+	0060  Wireless optical mouse
+	00f3  FX3 micro-controller (DFU mode)
+	0100  Cino FuzzyScan F760-B
+	0101  Keyboard/Hub
+	0102  Keyboard with APM
+	0130  MyIRC Remote Receiver
+	0306  Telephone Receiver
+	0407  Optical Skype Mouse
+	0818  AE-SMKD92-* [Thumb Keyboard]
+	0bad  MetaGeek Wi-Spy
 	1002  CY7C63001 R100 FM Radio
+	1006  Human Interface Device
+	2050  hub
+	2830  Opera1 DVB-S (cold state)
+	3813  NANO BIOS Programmer
+	4235  Monitor 02 Driver
+	4381  SCAPS USC-1 Scanner Controller
+	4611  Storage Adapter FX2 (CY)
+	4616  Flash Disk (TPP)
+	4624  DS-Xtreme Flash Card
+	4717  West Bridge
+	5201  Combi Keyboard-Hub (Hub)
+	5202  Combi Keyboard-Hub (Keyboard)
 	5500  HID->COM RS232 Adapter
+	5a9b  Dacal CD/DVD Library D-101/DC-300/DC-016RW
+	6370  ViewMate Desktop Mouse CC2201
+	6502  CY4609
+	6506  CY4603
+	650a  CY4613
 	6560  CY7C65640 USB-2.0 "TetraHub"
-	6830  USB-2.0 IDE Adapter
-	7417  Wireless PC Lock
+	6570  Unprogrammed CY7C65632/34 hub HX2VL
+	6572  Unprogrammed CY7C65642 hub
+	6830  CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI
+	6831  Storage Adapter ISD-300LP (CY)
+	7417  Wireless PC Lock/Ultra Mouse
+	8329  USB To keyboard/Mouse Converter
 	8613  CY7C68013 EZ-USB FX2 USB 2.0 Development Kit
+	8614  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
+	861f  Anysee E30 USB 2.0 DVB-T Receiver
+	bca1  Barcode Reader
 	cc04  Centor USB RACIA-ALVAR USB PORT
 	cc06  Centor-P RACIA-ALVAR USB PORT
 	d5d5  CY7C63x0x Zoltrix Z-Boxer GamePad
+	de61  Barcode Reader
+	de64  Barcode Reader
 	f000  CY30700 Licorice evaluation board
+	f111  CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit
+	f115  PSoC FirstTouch Programmer
+	f231  DELLY Changer 4in1 universal IR remote
+	f232  Mono embedded computer
+	fd10  Gembird MSIS-PM
+	fd13  Energenie EG-PMS
+	fd15  Energenie EG-PMS2
 04b5  ROHM LSI Systems USA, LLC
+	3064  Hantek DSO-3064
 04b6  Hint Corp.
 04b7  Compal Electronics, Inc.
 04b8  Seiko Epson Corp.
 	0001  Stylus Color 740 / Photo 750
 	0002  ISD Smart Cable for Mac
 	0003  ISD Smart Cable
-	0005  Stylus Printer
-	0101  Perfection 636
+	0004  Printer
+	0005  Printer
+	0006  Printer
+	0007  Printer
+	0015  Stylus Photo R3000
+	0101  GT-7000U [Perfection 636]
 	0102  GT-2200
-	0103  Perfection 610
-	0104  Perfection 1200
-	0105  StylusScan 2000
+	0103  GT-6600U [Perfection 610]
+	0104  GT-7600UF [Perfection 1200U/1200U Photo]
+	0105  Stylus Scan 2000
 	0106  Stylus Scan 2500
-	0107  Expression 1600U
-	0109  Expression 1640 XL
-	010a  Perfection 1640SU
-	010b  Perfection 1240
-	010c  Perfection 640
-	010e  Perfection 1680
-	010f  Perfection 1250
-	0110  Perfection 1650
-	0112  Perfection 2450
+	0107  ES-2000 [Expression 1600U]
+	0108  CC-700
+	0109  ES-8500 [Expression 1640 XL]
+	010a  GT-8700/GT-8700F [Perfection 1640SU/1640SU PHOTO]
+	010b  GT-7700U [Perfection 1240U]
+	010c  GT-6700U [Perfection 640]
+	010d  CC-500L
+	010e  ES-2200 [Perfection 1680]
+	010f  GT-7200U [Perfection 1250/1250 PHOTO]
+	0110  GT-8200U/GT-8200UF [Perfection 1650/1650 PHOTO]
+	0112  GT-9700F [Perfection 2450 PHOTO]
 	0114  Perfection 660
-	011b  Perfection 2400 Photo
-	011c  Perfection 3200
-	011d  Perfection 1260 Photo
-	011e  Perfection 1660 Photo
-	011f  Perfection 1670
-	0121  Perfection 2480 Photo
-	0202  Receipt Printer M129C
+	0116  GT-9400UF [Perfection 3170]
+	0118  GT-F600 [Perfection 4180]
+	0119  GT-X750 [Perfection 4490 Photo]
+	011a  CC-550L [1000 ICS]
+	011b  GT-9300UF [Perfection 2400 PHOTO]
+	011c  GT-9800F [Perfection 3200]
+	011d  GT-7300U [Perfection 1260/1260 PHOTO]
+	011e  GT-8300UF [Perfection 1660 PHOTO]
+	011f  GT-8400UF [Perfection 1670/1670 PHOTO]
+	0120  GT-7400U [Perfection 1270]
+	0121  GT-F500/GT-F550 [Perfection 2480/2580 PHOTO]
+	0122  GT-F520/GT-F570 [Perfection 3590 PHOTO]
+	0126  ES-7000H [GT-15000]
+	0128  GT-X700 [Perfection 4870]
+	0129  ES-10000G [Expression 10000XL]
+	012a  GT-X800 [Perfection 4990 PHOTO]
+	012b  ES-H300 [GT-2500]
+	012c  GT-X900 [Perfection V700/V750 Photo]
+	012d  GT-F650 [GT-S600/Perfection V10/V100]
+	012e  GT-F670 [Perfection V200 Photo]
+	012f  GT-F700 [Perfection V350]
+	0130  GT-X770 [Perfection V500]
+	0131  GT-F720 [GT-S620/Perfection V30/V300 Photo]
+	0133  GT-1500 [GT-D1000]
+	0135  GT-X970
+	0136  ES-D400 [GT-S80]
+	0137  ES-D200 [GT-S50]
+	0138  ES-H7200 [GT-20000]
+	013a  GT-X820 [Perfection V600 Photo]
+	0142  GT-F730 [GT-S630/Perfection V33/V330 Photo]
+	0143  GT-S55
+	0144  GT-S85
+	0151  Perfection V800 Photo
+	0202  Interface Card UB-U05 for Thermal Receipt Printers [M129C/TM-T70/TM-T88IV]
+	0401  CP 800 Digital Camera
 	0402  PhotoPC 850z
 	0403  PhotoPC 3000z
+	0509  JVC PIX-MC10
 	0601  Stylus Photo 875DC Card Reader
 	0602  Stylus Photo 895 Card Reader
-	0801  Stylus CX5200
-	0802  Stylus CX3200
-	080c  ME100
-	0811  Stylus Photo RX620 all-in-one
+	0801  CC-600PX [Stylus CX5200/CX5400/CX6600]
+	0802  CC-570L [Stylus CX3100/CX3200]
+	0803  Printer (Composite Device)
+	0804  Storage Device
+	0805  Stylus CX6300/CX6400
+	0806  PM-A850 [Stylus Photo RX600/610]
+	0807  Stylus Photo RX500/510
+	0808  Stylus CX5200/CX5300/CX5400
+	0809  Storage Device
+	080a  F-3200
+	080c  ME100 [Stylus CX1500]
+	080d  Stylus CX4500/4600
+	080e  PX-A550 [CX-3500/3600/3650 MFP]
+	080f  Stylus Photo RX420/RX425/RX430
+	0810  PM-A900 [Stylus Photo RX700]
+	0811  PM-A870 [Stylus Photo RX620/RX630]
+	0812  MFP Composite Device
+	0813  Stylus CX6500/6600
+	0814  PM-A700
+	0815  LP-A500 [AcuLaser CX1]
+	0816  Printer (Composite Device)
+	0817  LP-M5500/LP-M5500F
+	0818  Stylus CX3700/CX3800/DX3800
+	0819  PX-A650 [Stylus CX4700/CX4800/DX4800/DX4850]
+	081a  PM-A750 [Stylus Photo RX520/RX530]
+	081b  MFP Composite Device
+	081c  PM-A890 [Stylus Photo RX640/RX650]
+	081d  PM-A950
+	081e  MFP Composite Device
+	081f  Stylus CX7700/7800
+	0820  Stylus CX4100/CX4200/DX4200
+	0821  Stylus CX5700F/CX5800F
+	0822  Storage Device
+	0823  MFP Composite Device
+	0824  Storage Device
+	0825  MFP Composite Device
+	0826  Storage Device
+	0827  PM-A820 [Stylus Photo RX560/RX580/RX585/RX590]
+	0828  PM-A970
+	0829  PM-T990
+	082a  PM-A920
+	082b  Stylus CX5900/CX5000/DX5000/DX5050
+	082c  Storage Device
+	082d  Storage Device
+	082e  PX-A720 [Stylus CX5900/CX6000/DX6000]
+	082f  PX-A620 [Stylus CX3900/DX4000/DX4050]
+	0830  ME 200 [Stylus CX2800/CX2900]
+	0831  Stylus CX6900F/CX7000F/DX7000F
+	0832  MFP Composite Device
+	0833  LP-M5600
+	0834  LP-M6000
+	0835  AcuLaser CX21
+	0836  PM-T960
+	0837  PM-A940 [Stylus Photo RX680/RX685/RX690]
+	0838  PX-A640 [CX7300/CX7400/DX7400]
+	0839  PX-A740 [CX8300/CX8400/DX8400]
+	083a  PX-FA700 [CX9300F/CX9400Fax/DX9400F]
+	083b  MFP Composite Device
+	083c  PM-A840S [Stylus Photo RX595/RX610]
+	083d  MFP Composite Device
+	083e  MFP Composite Device
+	083f  Stylus CX4300/CX4400/CX5500/CX5600/DX4400/DX4450
+	0841  PX-401A [ME 300/Stylus NX100]
+	0843  LP-M5000
+	0844  EP-901A/EP-901F [Artisan 800/Stylus Photo PX800FW]
+	0846  EP-801A [Artisan 700/Stylus Photo PX700W/TX700W]
+	0847  PX-601F [ME Office 700FW/Stylus Office BX600FW/TX600FW]
+	0848  ME Office 600F/Stylus Office BX300F/TX300F
+	0849  Stylus SX205
+	084a  PX-501A [Stylus NX400]
+	084d  PX-402A [Stylus SX115/Stylus NX110 Series]
+	084f  Multifunctional Printer Scanner [ME Office 510 / Epson Stylus SX215]
+	0850  EP-702A [Stylus Photo PX650/TX650 Series]
+	0851  Stylus SX410
+	0852  EP-802A [Artisan 710 Series/Stylus Photo PX710W/TX720W Series]
+	0853  EP-902A [Artisan 810 Series/Stylus Photo PX810FW Series]
+	0854  ME OFFICE 650FN Series/Stylus Office BX310FN/TX520FN Series
+	0855  PX-602F [Stylus Office BX610FW/TX620FW Series]
+	0856  PX-502A [Stylus SX515W]
+	085c  ME 320/330 Series [Stylus SX125]
+	085d  PX-603F [ME OFFICE 960FWD Series/Stylus Office BX625FWD/TX620FWD Series]
+	085e  PX-503A [ME OFFICE 900WD Series/Stylus Office BX525WD]
+	085f  Stylus Office BX320FW/TX525FW Series
+	0860  EP-903A/EP-903F [Artisan 835/Stylus Photo PX820FWD Series]
+	0861  EP-803A/EP-803AW [Artisan 725/Stylus Photo PX720WD/TX720WD Series]
+	0862  EP-703A [Stylus Photo PX660 Series]
+	0863  ME OFFICE 620F Series/Stylus Office BX305F/BX305FW/TX320F
+	0864  ME OFFICE 560W Series
+	0865  ME OFFICE 520 Series
+	0866  AcuLaser MX20DN/MX20DNF/MX21DNF
+	0869  PX-1600F
+	086a  PX-673F [Stylus Office BX925FWD]
+	0870  Stylus Office BX305FW Plus
+	0871  K200 Series
+	0872  K300 Series
+	0873  L200 Series
+	0878  EP-704A
+	0879  EP-904A/EP-904F [Artisan 837/Stylus Photo PX830FWD Series]
+	087b  EP-804A/EP-804AR/EP-804AW [Stylus Photo PX730WD/Artisan 730 Series]
+	087c  PX-1700F
+	087d  PX-B750F/WP-4525 Series
+	087f  PX-403A
+	0880  PX-434A [Stylus NX330 Series]
+	0881  PX-404A [ME OFFICE 535]
+	0883  ME 340 Series/Stylus NX130 Series
+	0884  Stylus NX430W Series
+	0885  Stylus NX230/SX235W Series
+	088f  Stylus Office BX635FWD
+	0890  ME OFFICE 940FW Series/Stylus Office BX630FW Series
+	0891  Stylus Office BX535WD
+	0892  Stylus Office BX935FWD
+	0893  EP-774A
+	0e03  Thermal Receipt Printer [TM-T20]
+	1114  XP-440 [Expression Home Small-in-One Printer]
+	1129  ET-4750 [WorkForce ET-4750 EcoTank All-in-One]
+	1168  Workforce WF-7820/7840 Series
 04b9  Rainbow Technologies, Inc.
 	0300  SafeNet USB SuperPro/UltraPro
 	1000  iKey 1000 Token
 	1001  iKey 1200 Token
+	1002  iKey Token
+	1003  iKey Token
+	1004  iKey Token
+	1005  iKey Token
+	1006  iKey Token
 	1200  iKey 2000 Token
+	1201  iKey Token
 	1202  iKey 2032 Token
+	1203  iKey Token
+	1204  iKey Token
+	1205  iKey Token
+	1206  iKey 4000 Token
 	1300  iKey 3000 Token
+	1301  iKey 3000
+	1302  iKey Token
+	1303  iKey Token
+	1304  iKey Token
+	1305  iKey Token
+	1306  iKey Token
+	8000  SafeNet Sentinel Hardware Key
 04ba  Toucan Systems, Ltd
 04bb  I-O Data Device, Inc.
+	0101  USB2-IDE/ATAPI Bridge Adapter
+	014a  HDCL-UT
+	0201  USB2-IDE/ATAPI Bridge Adapter
+	0204  DVD Multi-plus unit iU-CD2
+	0206  DVD Multi-plus unit DVR-UEH8
+	0301  Storage Device
+	0314  USB-SSMRW SD-card
+	0319  USB2-IDE/ATAPI Bridge Adapter
+	031a  USB2-IDE/ATAPI Bridge Adapter
+	031b  USB2-IDE/ATAPI Bridge Adapter
+	031e  USB-SDRW SD-card
+	0502  Nogatech Live! (BT)
+	0528  GV-USB Video Capture
+	0901  USB ETT
 	0904  ET/TX Ethernet [pegasus]
 	0913  ET/TX-S Ethernet [pegasus2]
+	0919  USB WN-B11
 	0922  IOData AirPort WN-B11/USBS 802.11b
+	0930  ETG-US2
+	0937  WN-WAG/USL Wireless LAN Adapter
+	0938  WN-G54/USL Wireless LAN Adapter
+	093b  WN-GDN/USB
+	093f  WNGDNUS2 802.11n
+	0944  WHG-AGDN/US Wireless LAN Adapter
+	0945  WN-GDN/US3 Wireless LAN Adapter
+	0947  WN-G150U Wireless LAN Adapter
+	0948  WN-G300U Wireless LAN Adapter
+	0a03  Serial USB-RSAQ1
+	0a07  USB2-iCN Adapter
+	0a08  USB2-iCN Adapter
+	0c01  FM-10 Pro Disk
 04bd  Toshiba Electronics Taiwan Corp.
 04be  Telia Research AB
 04bf  TDK Corp.
 	0100  MediaReader CF
+	0115  USB-PDC Adapter UPA9664
+	0116  USB-cdmaOne Adapter UCA1464
+	0117  USB-PHS Adapter UHA6400
+	0118  USB-PHS Adapter UPA6400
+	0135  MediaReader Dual
+	0202  73S1121F Smart Card Reader-
+	0309  Bluetooth USB dongle
+	030a  IBM Bluetooth Ultraport Module
+	030b  Bluetooth Device
+	030c  Ultraport Bluetooth Device
+	0310  Integrated Bluetooth
+	0311  Integrated Bluetooth Device
+	0317  Bluetooth UltraPort Module from IBM
+	0318  IBM Integrated Bluetooth
+	0319  Bluetooth Adapter
 	0320  Bluetooth Adapter
+	0321  Bluetooth Device
+	0a28  INDI AV-IN Device
 04c1  U.S. Robotics (3Com)
+	0020  56K Voice Pro
+	0022  56K Voice Pro
+	007e  ISDN TA
 	0082  OfficeConnect Analog Modem
 	008f  Pro ISDN TA
-	009d  HomeConnect WebCam [vicam]
+	0097  OfficeConnect Analog
+	009d  HomeConnect Webcam [vicam]
+	00a9  ISDN Pro TA-U
+	00b9  HomeConnect IDSL Modem
 	3021  56k Voice FaxModem Pro
 04c2  Methode Electronics Far East PTE, Ltd
 04c3  Maxi Switch, Inc.
+	1102  Mouse
+	2102  Mouse
 04c4  Lockheed Martin Energy Research
 04c5  Fujitsu, Ltd
 	1029  fi-4010c Scanner
+	1033  fi-4110CU
 	1041  fi-4120c Scanner
 	1042  fi-4220c Scanner
+	105b  AH-F401U Air H device
+	1084  PalmSecure Sensor V2
+	1096  fi-5110EOX
+	1097  fi-5110C
+	10ae  fi-4120C2
+	10af  fi-4220C2
+	10c7  fi-60f scanner
 	10e0  fi-5120c Scanner
+	10e1  fi-5220C
+	10e7  fi-5900C
+	10fe  S500
+	1104  KD02906 Line Thermal Printer
+	114f  fi-6130
+	1150  fi-6230
+	11f3  fi-6130Z
+	125a  PalmSecure Sensor Device - MP
+	132e  fi-7160
+	159f  ScanSnap iX1500
+	200f  Sigma DP2 (Mass Storage)
+	2010  Sigma DP2 (PictBridge)
+	201d  SATA 3.0 6Gbit/s Adaptor [GROOVY]
 04c6  Toshiba America Electronic Components
 04c7  Micro Macro Technologies
 04c8  Konica Corp.
@@ -1201,65 +4886,317 @@
 	0722  e-mini
 	0723  KD-200Z Camera
 	0726  KD-310Z Camera
+	0728  Revio C2 Mass Storage Device
+	0729  Revio C2 Digital Camera
 	072c  Revio KD20M
 	072d  Revio KD410Z
 04ca  Lite-On Technology Corp.
+	0020  USB Keyboard
+	004b  Keyboard
+	004f  SK-9020 keyboard
+	008a  Acer Wired Mouse Model SM-9023
+	1766  HID Monitor Controls
+	2004  Bluetooth 4.0 [Broadcom BCM20702A0]
+	2006  Broadcom BCM43142A0 Bluetooth Device
+	2007  Broadcom BCM43142A0 Bluetooth Device
+	3005  Atheros Bluetooth
+	300b  Atheros AR3012 Bluetooth
+	300d  Atheros AR3012 Bluetooth
+	300f  Atheros AR3012 Bluetooth
+	3014  Qualcomm Atheros Bluetooth
+	3015  Qualcomm Atheros QCA9377 Bluetooth
+	7022  HP HD Webcam
+	7025  HP HD Webcam
+	7046  TOSHIBA Web Camera - HD
+	9304  Hub
+	f01c  TT1280DA DVB-T TV Tuner
 04cb  Fuji Photo Film Co., Ltd
-	0100  FinePix 1300 / 1400 / 4700 Zoom digital camera
-	0103  FinePix NX-700 printer
-	0104  FinePix A101/2600 Zoom (PC-Cam Mode)
-	0108  FinePix F601 Zoom (Disk mode)
-	0109  FinePix F601 Zoom (PC-Cam mode)
-	010a  FinePix S602 Zoom (Disk mode)
-	010b  FinePix S602 Zoom (PC-Cam mode)
-	0110  FinePix M603 (mass storage mode)
-	0114  FinePix F401 Zoom (Disk mode)
-	0115  FinePix F401 Zoom (PC-Cam mode)
-	0116  FinePix A203 (Disk mode)
-	0117  FinePix A203 (PC-Cam mode)
-	011a  FinePix S304/3800 (Disk mode)
-	011b  FinePix S304/3800 (PC-Cam mode)
-	011c  FinePix 2650 (Disk mode)
-	012c  FinePix S7000 Zoom (Disk mode)
-	012d  FinePix S7000 Zoom (PC-Cam mode)
-	0130  Finepix S5000 Camera (Disk mode)
-	0131  Finepix S5000 Camera (PC-Cam mode)
-	0142  FinePix S7000 Zoom (PTP mode)/(PictBridge mode) / FinePix A330 (PictBridge mode)
-	0148  FinePix A330 (mass storage mode)
-	0168  FinePix E500
-	0177  Finepix F10 Camera (Disk mode)
-	0179  Finepix F10 Camera (PTP mode)
-	0192  FinePix E900
-04cc  Philips Semiconductors
+	0100  FinePix 30i/40i/50i, A101/201, 1300/2200, 1400/2400/2600/2800/4500/4700/4800/4900/6800/6900 Zoom
+	0103  FinePix NX-500/NX-700 printer
+	0104  FinePix A101, 2600/2800/4800/6800 Zoom (PC CAM)
+	0108  FinePix F601 Zoom (DSC)
+	0109  FinePix F601 Zoom (PC CAM)
+	010a  FinePix S602 (Pro) Zoom (DSC)
+	010b  FinePix S602 (Pro) Zoom (PC CAM)
+	010d  FinePix S2 pro
+	010e  FinePix F402 Zoom (DSC)
+	010f  FinePix F402 Zoom (PC CAM)
+	0110  FinePix M603 Zoom (DSC)
+	0111  FinePix M603 Zoom (PC CAM)
+	0112  FinePix A202, A200 Zoom (DSC)
+	0113  FinePix A202, A200 Zoom (PC CAM)
+	0114  FinePix F401 Zoom (DSC)
+	0115  FinePix F401 Zoom (PC CAM)
+	0116  FinePix A203 Zoom (DSC)
+	0117  FinePix A203 Zoom (PC CAM)
+	0118  FinePix A303 Zoom (DSC)
+	0119  FinePix A303 Zoom (PC CAM)
+	011a  FinePix S304/3800 Zoom (DSC)
+	011b  FinePix S304/3800 Zoom (PC CAM)
+	011c  FinePix A204/2650 Zoom (DSC)
+	011d  FinePix A204/2650 Zoom (PC CAM)
+	0120  FinePix F700 Zoom (DSC)
+	0121  FinePix F700 Zoom (PC CAM)
+	0122  FinePix F410 Zoom (DSC)
+	0123  FinePix F410 Zoom (PC CAM)
+	0124  FinePix A310 Zoom (DSC)
+	0125  FinePix A310 Zoom (PC CAM)
+	0126  FinePix A210 Zoom (DSC)
+	0127  FinePix A210 Zoom (PC CAM)
+	0128  FinePix A205(S) Zoom (DSC)
+	0129  FinePix A205(S) Zoom (PC CAM)
+	012a  FinePix F610 Zoom (DSC)
+	012b  FinePix Digital Camera 030513
+	012c  FinePix S7000 Zoom (DSC)
+	012d  FinePix S7000 Zoom (PC CAM)
+	012f  FinePix Digital Camera 030731
+	0130  FinePix S5000 Zoom (DSC)
+	0131  FinePix S5000 Zoom (PC CAM)
+	013b  FinePix Digital Camera 030722
+	013c  FinePix S3000 Zoom (DSC)
+	013d  FinePix S3000 Zoom (PC CAM)
+	013e  FinePix F420 Zoom (DSC)
+	013f  FinePix F420 Zoom (PC CAM)
+	0142  FinePix S7000 Zoom (PTP)
+	0148  FinePix A330 Zoom (DSC)
+	0149  FinePix A330 Zoom (UVC)
+	014a  FinePix A330 Zoom (PTP)
+	014b  FinePix A340 Zoom (DSC)
+	014c  FinePix A340 Zoom (UVC)
+	0159  FinePix F710 Zoom (DSC)
+	0165  FinePix S3500 Zoom (DSC)
+	0168  FinePix E500 Zoom (DSC)
+	0169  FinePix E500 Zoom (UVC)
+	016b  FinePix E510 Zoom (DSC)
+	016c  FinePix E510 Zoom (PC CAM)
+	016e  FinePix S5500 Zoom (DSC)
+	016f  FinePix S5500 Zoom (UVC)
+	0171  FinePix E550 Zoom (DSC)
+	0172  FinePix E550 Zoom (UVC)
+	0177  FinePix F10 (DSC)
+	0179  Finepix F10 (PTP)
+	0186  FinePix S5200/S5600 Zoom (DSC)
+	0188  FinePix S5200/S5600 Zoom (PTP)
+	018e  FinePix S9500 Zoom (DSC)
+	018f  FinePix S9500 Zoom (PTP)
+	0192  FinePix E900 Zoom (DSC)
+	0193  FinePix E900 Zoom (PTP)
+	019b  FinePix F30 (PTP)
+	01af  FinePix A700 (PTP)
+	01bf  FinePix F6000fd/S6500fd Zoom (PTP)
+	01c0  FinePix F20 (PTP)
+	01c1  FinePix F31fd (PTP)
+	01c3  FinePix S5 Pro
+	01c4  FinePix S5700 Zoom (PTP)
+	01c5  FinePix F40fd (PTP)
+	01c6  FinePix A820 Zoom (PTP)
+	01d2  FinePix A800 Zoom (PTP)
+	01d3  FinePix A920 (PTP)
+	01d4  FinePix F50fd (PTP)
+	01d5  FinePix F47 (PTP)
+	01e7  Fujifilm A850 Digital Camera
+	01f7  FinePix J250 (PTP)
+	01fd  A160
+	023e  FinePix AX300
+	0240  FinePix S2950 Digital Camera
+	0241  FinePix S3200 Digital Camera
+	0278  FinePix JV300
+	02c5  FinePix S9900W Digital Camera (PTP)
+	02e0  X-T200 Digital Camera
+	5006  ASK-300
+04cc  ST-Ericsson
 	1122  Hub
+	1520  USB 2.0 Hub (Avocent KVM)
 	1521  USB 2.0 Hub
+	1a62  GW Instek GSP-830 Spectrum Analyzer (HID)
+	2323  Ux500 serial debug port
+	2533  NFC device (PN533)
 	8116  Camera
 04cd  Tatung Co. Of America
 04ce  ScanLogic Corp.
 	0002  SL11R-IDE IDE Bridge
+	0100  USB2PRN Printer Class
+	0300  Phantom 336CX - C3 scanner
+	04ce  SL11DEMO, VID: 0x4ce, PID: 0x4ce
+	07d1  SL11R, VID: 0x4ce, PID: 0x07D1
 04cf  Myson Century, Inc.
-	8818  USB2.0 to ATAPI Bridge Controller 
+	0022  OCZ Alchemy Series Elixir II Keyboard
+	0800  MTP800 Mass Storage Device
+	8810  CS8810 Mass Storage Device
+	8811  CS8811 Mass Storage Device
+	8813  CS8813 Mass Storage Device
+	8818  USB2.0 to ATAPI Bridge Controller
+	8819  USB 2.0 SD/MMC Reader
+	9920  CS8819A2-114 Mass Storage Device
 04d0  Digi International
 04d1  ITT Canon
 04d2  Altec Lansing Technologies
+	0070  ADA70 Speakers
+	0305  Non-Compliant Audio Device
 	0311  ADA-310 Speakers
+	2060  Claritel-i750 - vp
 	ff05  ADA-305 Speakers
+	ff47  Lansing HID Audio Controls
+	ff49  Lansing HID Audio Controls
 04d3  VidUS, Inc.
 04d4  LSI Logic, Inc.
 04d5  Forte Technologies, Inc.
 04d6  Mentor Graphics
 04d7  Oki Semiconductor
+	1be4  Bluetooth Device
 04d8  Microchip Technology, Inc.
+	0002  PicoLCD 20x2
+	0003  PICkit 2 Microcontroller Programmer
+	000a  CDC RS-232 Emulation Demo
+	000b  PIC18F2550 (32K Flashable 10 Channel, 10 Bit A/D USB Microcontroller)
+	0032  PICkit1
+	0033  PICkit2
+	0036  PICkit Serial Analyzer
+	00e0  PIC32 Starter Board
+	04cd  28Cxxx EEPROM Programmer
+	0a04  AGP LIN Serial Analyzer
 	8000  In-Circuit Debugger
+	8001  ICD2 in-circuit debugger
+	8101  PIC24F Starter Kit
+	8107  Microstick II
+	8108  ChipKit Pro MX7 (PIC32MX)
+	9004  Microchip REAL ICE
+	9009  ICD3
+	900a  PICkit3
+	9012  PICkit4
+	9015  ICD 4 In-Circuit Debugger
+	c001  PicoLCD 20x4
+	e11c  TL866CS EEPROM Programmer [MiniPRO]
+	ed16  BeamiRC 2.0 CNC remote controller analoge
+	edb4  micro PLC (ATSAMD51G19A) [Black Brix ECU II]
+	edb5  ATMEGA32U4 [Black Brix ECU]
+	f2c4  Macareux-labs Hygrometry Temperature Sensor
+	f2f7  Yepkit YKUSH
+	f3aa  Macareux-labs Usbce Bootloader mode
+	f437  SBE Tech Ultrasonic Anemometer
+	f4b5  SmartScope
+	f5fe  TrueRNG
+	f8da  Hughski Ltd. ColorHug
+	f8e8  Harmony 300/350 Remote
+	f91c  SPROG IIv3
+	faff  Dangerous Prototypes BusPirate v4 Bootloader mode
+	fb00  Dangerous Prototypes BusPirate v4
+	fbb2  GCUSB-nStep stepper motor controller
+	fbba  DiscFerret Magnetic Disc Analyser (bootloader mode)
+	fbbb  DiscFerret Magnetic Disc Analyser (active mode)
+	fc1e  Bachrus Speedometer Interface
+	fc92  Open Bench Logic Sniffer
+	ffee  Devantech USB-ISS
+	ffef  PICoPLC [APStech]
 04d9  Holtek Semiconductor, Inc.
+	0006  Wired Keyboard (78/79 key) [RPI Wired Keyboard 5]
+	0022  Portable Keyboard
+	0348  Keyboard
+	0407  Keyboard [TEX Shinobi]
+	048e  Optical Mouse
+	0499  Optical Mouse
+	1135  Mouse [MGK-15BU/MLK-15BU]
+	1203  Keyboard
+	1400  PS/2 keyboard + mouse controller
+	1503  Keyboard
+	1603  Keyboard
+	1702  Keyboard LKS02
+	1818  Keyboard [Diatec Filco Majestouch 2]
+	2011  Keyboard [Diatec Filco Majestouch 1]
+	2013  Keyboard [Das Keyboard]
+	2206  Fujitsu Siemens Mouse Esprimo Q
+	2221  Keyboard
+	2323  Keyboard
+	2519  Shenzhen LogoTech 2.4GHz receiver
+	2832  HT82A832R Audio MCU
+	2834  HT82A834R Audio MCU
+	4545  Keyboard [Diatec Majestouch 2 Tenkeyless]
+	a01c  wireless multimedia keyboard with trackball [Trust ADURA 17911]
+	a050  Chatman V1
+	a052  USB-zyTemp
+	a055  Keyboard
+	a075  Optical Gaming Mouse
+	a096  Keyboard
+	a09f  E-Signal LUOM G10 Mechanical Gaming Mouse
+	a100  Mouse [HV-MS735]
+	a11b  Mouse [MX-3200]
+	a153  Optical Gaming Mouse
+	a29f  Microarray fingerprint reader
+	b534  LGT8F328P Microprocessor
+	e002  MCU
+	fc2a  Gaming Mouse [Redragon M709]
+	fc30  Gaming Mouse [Redragon M711]
+	fc4d  Gaming Mouse [Redragon M908]
+	fc55  Venus MMO Gaming Mouse
 04da  Panasonic (Matsushita)
+	0901  LS-120 Camera
+	0912  SDR-S10
+	0b01  CD-R/RW Drive
+	0b03  SuperDisk 240MB
+	0d01  CD-R Drive KXL-840AN
+	0d09  CD-R Drive KXL-RW32AN
+	0d0a  CD-R Drive KXL-CB20AN
+	0d0d  CDRCB03
+	0d0e  DVD-ROM & CD-R/RW
+	0d14  DVD-RAM MLT08
+	0f07  KX-MB2030 Multifunction Laser Printer
+	0f40  Printer
+	104d  Elite Panaboard UB-T880 (HID)
+	104e  Elite Panaboard Pen Adaptor (HID)
+	1500  MFSUSB Driver
+	1800  DY-WL10 802.11abgn Adapter [Broadcom BCM4323]
+	1b00  MultiMediaCard
 	2121  EB-VS6
+	2316  DVC Mass Storage Device
+	2317  DVC USB-SERIAL Driver for WinXP
+	2318  NV-GS11/230/250 (webcam mode)
 	2319  NV-GS15 (webcam mode)
-	2372  Lumix DMC-FZ10 Camera
-	2374  DMC-FZ20
+	231a  NV-GS11/230/250 (DV mode)
+	231d  DVC Web Camera Device
+	231e  DVC DV Stream Device
+	2372  Lumix Camera (Storage mode)
+	2374  Lumix Camera (PTP mode)
+	2451  HDC-SD9
+	245b  HC-X920K (3MOS Full HD video camcorder)
+	2477  SDR-H85 Camcorder (PC mode)
+	2478  SDR-H85 Camcorder (recorder mode - SD card)
+	2479  SDR-H85 Camcorder (recorder mode - HDD)
+	2497  HDC-TM700
+	250c  Gobi Wireless Modem (QDL mode)
+	250d  Gobi Wireless Modem
+	3904  N5HBZ0000055 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
+	3908  N5HBZ0000062 802.11abgn Wireless Adapter [Atheros AR9374v1.1]
+	3c04  JT-P100MR-20 [ePassport Reader]
 04db  Hypertec Pty, Ltd
 04dc  Huan Hsin Holdings, Ltd
 04dd  Sharp Corp.
+	13a6  MFC2000
+	6006  AL-1216
+	6007  AL-1045
+	6008  AL-1255
+	6009  AL-1530CS
+	600a  AL-1540CS
+	600b  AL-1456
+	600c  AL-1555
+	600d  AL-1225
+	600e  AL-1551CS
+	600f  AR-122E
+	6010  AR-152E
+	6011  AR-157E
+	6012  SN-1045
+	6013  SN-1255
+	6014  SN-1456
+	6015  SN-1555
+	6016  AR-153E
+	6017  AR-122E N
+	6018  AR-153E N
+	6019  AR-152E N
+	601a  AR-157E N
+	601b  AL-1217
+	601c  AL-1226
+	601d  AR-123E
+	6021  IS01
+	7002  DVC Ver.1.0
 	7004  VE-CG40U Digital Still Camera
 	7005  VE-CG30 Digital Still Camera
 	7007  VL-Z7S Digital Camcorder
@@ -1267,17 +5204,29 @@
 	8005  Zaurus A-300
 	8006  Zaurus SL-B500/SL-5600 PDA
 	8007  Zaurus C-700 PDA
+	9009  AR-M160
 	9014  IM-DR80 Portable NetMD Player
 	9031  Zaurus C-750/C-760/C-860/SL-C3000 PDA
 	9032  Zaurus SL-6000
+	903a  GSM GPRS
 	9050  Zaurus C-860 PDA
 	9056  Viewcam Z
+	9073  AM-900
+	9074  GSM GPRS
+	90a9  Sharp Composite
+	90d0  USB-to-Serial Comm. Port
 	90f2  Sharp 3G GSM USB Control
+	9120  WS004SH
+	9122  WS007SH
+	9123  W-ZERO3 ES Smartphone
+	91a3  922SH Internet Machine
+	939a  IS03
 04de  MindShare, Inc.
 04df  Interlink Electronics
 04e1  Iiyama North America, Inc.
 	0201  Monitor Hub
 04e2  Exar Corp.
+	1410  XR21V1410 USB-UART IC
 04e3  Zilog, Inc.
 04e4  ACC Microelectronics
 04e5  Promise Technology
@@ -1288,33 +5237,315 @@
 	0005  eUSB SmartMedia/CompactFlash Card Reader
 	0006  eUSB SmartMedia Card Reader
 	0007  Hifd
-	0101  eUSB ATA Bridge
+	0009  eUSB ATA/ATAPI Adapter
+	000a  eUSB CompactFlash Adapter
+	000b  eUSCSI Bridge
+	000c  eUSCSI Bridge
+	000d  Dazzle MS
+	0012  Dazzle SD/MMC
+	0101  eUSB ATA Bridge (Sony Spressa USB CDRW)
+	0311  Dazzle DM-CF
+	0312  Dazzle DM-SD/MMC
+	0313  Dazzle SM
+	0314  Dazzle MS
+	0322  e-Film Reader-5
 	0325  eUSB ORCA Quad Reader
+	0327  Digital Media Reader
+	03fe  DMHS2 DFU Adapter
+	0406  eUSB SmartDM Reader
+	04e6  eUSB DFU Adapter
+	04e7  STCII DFU Adapter
+	04e8  eUSBDM DFU Adapter
+	04e9  DM-E DFU Adapter
 	0500  Veridicom 5thSense Fingerprint Sensor and eUSB SmartCard
+	0701  DCS200 Loader Device
+	0702  DVD Creation Station 200
+	0703  DVC100 Loader Device
+	0704  Digital Video Creator 100
+	1001  SCR300 Smart Card Reader
 	1010  USBAT-2 CompactFlash Card Reader
+	1014  e-Film Reader-3
+	1020  USBAT ATA/ATAPI Adapter
+	2007  RSA SecurID ComboReader
+	2009  Citibank Smart Card Reader
+	200a  Reflex v.2 Smart Card Reader
+	200d  STR391 Reader
 	5111  SCR331-DI SmartCard Reader
 	5113  SCR333 SmartCard Reader
+	5114  SCR331-DI SmartCard Reader
 	5115  SCR335 SmartCard Reader
-	5116  SCR331-LC1 SmartCard Reader
+	5116  SCR331-LC1 / SCR3310 SmartCard Reader
+	5117  SCR3320 - Smart Card Reader
+	5118  Expresscard SIM Card Reader
+	5119  SCR3340 - ExpressCard54 Smart Card Reader
+	511b  SmartCard Reader
+	511d  SCR3311 Smart Card Reader
+	5120  SCR331-DI SmartCard Reader
+	5121  SDI010 Smart Card Reader
+	5151  SCR338 Keyboard Smart Card Reader
+	5292  SCL011 RFID reader
+	5410  SCR35xx Smart Card Reader
+	5591  SCL3711-NFC&RW
+	5810  uTrust 2700 R Smart Card Reader
+	e000  SCRx31 Reader
 	e001  SCR331 SmartCard Reader
 	e003  SPR532 PinPad SmartCard Reader
 04e7  Elo TouchSystems
 	0001  TouchScreen
+	0002  Touchmonitor Interface 2600 Rev 2
+	0004  4000U CarrollTouch® Touchmonitor Interface
+	0007  2500U IntelliTouch® Touchmonitor Interface
+	0008  3000U AccuTouch® Touchmonitor Interface
+	0009  4000U CarrollTouch® Touchmonitor Interface
+	0020  Touchscreen Interface (2700)
+	0021  Touchmonitor Interface
+	0030  4500U CarrollTouch® Touchmonitor Interface
+	0032  Touchmonitor Interface
+	0033  Touchmonitor Interface
+	0041  5010 Surface Capacitive Touchmonitor Interface
+	0042  Touchmonitor Interface
+	0050  2216 AccuTouch® Touchmonitor Interface
+	0071  Touchmonitor Interface
+	0072  Touchmonitor Interface
+	0081  Touchmonitor Interface
+	0082  Touchmonitor Interface
+	00ff  Touchmonitor Interface
 04e8  Samsung Electronics Co., Ltd
+	0001  Printer Bootloader
+	0100  Kingston Flash Drive (128MB)
 	0110  Connect3D Flash Drive
 	0111  Connect3D Flash Drive
+	0300  E2530 / GT-C3350 Phones (Mass storage mode)
+	04e8  Galaxy (MIDI mode)
 	1003  MP3 Player and Recorder
+	1006  SDC-200Z
+	130c  NX100
+	1323  WB700 Camera
+	1f05  S2 Portable [JMicron] (500GB)
+	1f06  HX-MU064DA portable harddisk
+	2018  WIS09ABGN LinkStick Wireless LAN Adapter
+	2035  Digital Photo Frame Mass Storage
+	2036  Digital Photo Frame Mini Monitor
+	3004  ML-4600
+	3005  Docuprint P1210
+	3008  ML-6060 laser printer
 	300c  ML-1210 Printer
+	300e  Laser Printer
+	3104  ML-3550N
+	3210  ML-5200A Laser Printer
+	3226  Laser Printer
+	3228  Laser Printer
+	322a  Laser Printer
+	322c  Laser Printer
+	3230  ML-1440
+	3232  Laser Printer
+	3236  ML-1450
+	3238  ML-1430
 	323a  ML-1710 Printer
+	323b  Phaser 3130
+	323c  Laser Printer
+	323d  Phaser 3120
+	323e  Laser Printer
+	3240  Laser Printer
+	3242  ML-1510 Laser Printer
+	3248  Color Laser Printer
+	324a  Laser Printer
 	324c  ML-1740 Printer
+	324d  Phaser 3121
+	3256  ML-1520 Laser Printer
+	325b  Xerox Phaser 3117 Laser Printer
+	325f  Phaser 3425 Laser Printer
 	3260  CLP-510 Color Laser Printer
 	3268  ML-1610 Mono Laser Printer
+	326c  ML-2010P Mono Laser Printer
+	3276  ML-3050/ML-3051 Laser Printer
+	327e  ML-2510 Series
+	328e  CLP-310 Color Laser Printer
+	3292  ML-1640 Series Laser Printer
+	3296  ML-2580N Mono Laser Printer
+	3297  ML-191x/ML-252x Laser Printer
+	329f  CLP-325 Color Laser Printer
+	3301  ML-1660 Series
+	330c  ML-1865
+	330f  ML-216x Series Laser Printer
+	3310  ML-331x Series Laser Printer
+	3315  ML-2540 Series Laser Printer
+	331e  M262x/M282x Xpress Series Laser Printer
+	3409  SCX-4216F Scanner
+	340c  SCX-5x15 series
+	340d  SCX-6x20 series
+	340e  MFP 560 series
+	340f  Printing Support
+	3412  SCX-4x20 series
+	3413  SCX-4100 Scanner
+	3415  Composite Device
+	3419  Composite Device
+	341a  Printing Support
+	341b  SCX-4200 series
+	341c  Composite Device
+	341d  Composite Device
+	341f  Composite Device
+	3420  Composite Device
+	3426  SCX-4500 Laser Printer
+	342d  SCX-4x28 Series
+	344f  SCX-3400 Series
+	347e  C48x Series Color Laser Multifunction Printer
+	3605  InkJet Color Printer
+	3606  InkJet Color Printer
+	3609  InkJet Color Printer
+	3902  InkJet Color Printer
+	3903  Xerox WorkCentre XK50cx
+	390f  InkJet Color Printer
+	3911  SCX-1020 series
+	4005  GT-S8000 Jet (msc)
+	4f1f  GT-S8000 Jet (mtp)
+	5000  YP-MF series
+	5001  YP-100
+	5002  YP-30
+	5003  YP-700
+	5004  YP-30
+	5005  YP-300
+	5006  YP-750
+	500d  MP3 Player
+	5010  Yepp YP-35
+	5011  YP-780
+	5013  YP-60
+	5015  yepp upgrade
+	501b  MP3 Player
+	5021  Yepp YP-ST5
+	5026  YP-MT6V
+	5027  YP-T7
+	502b  YP-F1
+	5032  YP-J70
+	503b  YP-U1 MP3 Player
+	503d  YP-T7F
+	5041  YP-Z5
+	5050  YP-U2 MP3 Player
+	5051  YP-F2R
+	5055  YP-T9
+	507d  YP-U3 (mtp)
+	507f  YP-T9J
+	5080  Yepp YP-K3 (msc)
+	5081  Yepp YP-K3 (mtp)
+	5082  YP-P2 (msc)
+	5083  YP-P2 (mtp)
+	508a  YP-T10
+	508b  YP-S5 MP3 Player
+	508c  YP-S5
+	5090  YP-S3 (msc)
+	5091  YP-S3 (mtp)
+	5092  YP-U4 (msc)
+	5093  YP-U4 (mtp)
+	5095  YP-S2
+	510f  YP-R1
+	5119  Yepp YP-P3
+	511c  YP-Q2
+	5121  YP-U5
+	5123  Yepp YP-M1
+	5a00  YP-NEU
+	5a01  YP-NDU
 	5a03  Yepp MP3 Player
-	6601  Z100 Mobile Phone
-	663f  SGH-E720
+	5a04  YP-800
+	5a08  YP-90
+	5a0f  Meizu M6 MiniPlayer
+	5b01  Memory Stick Reader/Writer
+	5b02  Memory Stick Reader/Writer
+	5b03  Memory Stick Reader/Writer
+	5b04  Memory Stick Reader/Writer
+	5b05  Memory Stick Reader/Writer
+	5b11  SEW-2001u Card
+	5f00  NEXiO Sync
+	5f01  NEXiO Sync
+	5f02  NEXiO Sync
+	5f03  NEXiO Sync
+	5f04  NEXiO Sync
+	5f05  STORY Station 1TB
+	6032  G2 Portable hard drive
+	6033  G2 Portable device
+	6034  G2 Portable hard drive
+	60b3  M2 Portable Hard Drive
+	60c4  M2 Portable Hard Drive USB 3.0
+	6124  D3 Station External Hard Drive
+	6125  D3 Station External Hard Drive
+	61b5  M3 Portable Hard Drive 2TB
+	61b6  M3 Portable Hard Drive 1TB
+	61b7  M3 Portable Hard Drive 4TB
+	61f3  Portable SSD T3 (MU-PT250B, MU-PT500B)
+	61f5  Portable SSD T5
+	6601  Mobile Phone
+	6602  Galaxy
+	6603  Galaxy
+	6611  MITs Sync
+	6613  MITs Sync
+	6615  MITs Sync
+	6617  MITs Sync
+	6619  MITs Sync
+	661b  MITs Sync
+	661e  Handheld
+	6620  Handheld
+	6622  Handheld
+	6624  Handheld
+	662e  MITs Sync
+	6630  MITs Sync
+	6632  MITs Sync
+	663e  D900e/B2100 Phone
+	663f  SGH-E720/SGH-E840
+	6640  Usb Modem Enumerator
+	6651  i8510 Innov8
+	6702  X830
+	6708  U600 Phone
+	6709  U600
+	6734  Juke
+	6759  D900e/B2100 Media Player
+	675a  D900e/B2100 Mass Storage
+	675b  D900e Camera
+	6772  Standalone LTE device (Trial)
+	6795  S5230
+	6802  Standalone HSPA device
+	6806  Composite LTE device (Trial)
+	6807  Composite HSPA device
+	681c  Galaxy Portal/Spica/S
+	681d  Galaxy Portal/Spica Android Phone
+	6843  E2530 Phone (Samsung Kies mode)
+	684e  Wave (GT-S8500)
+	685b  GT-I9100 Phone [Galaxy S II] (mass storage mode)
+	685c  GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)
+	685d  GT-I9100 Phone [Galaxy S II] (Download mode)
+	685e  GT-I9100 / GT-C3350 Phones (USB Debugging mode)
+	6860  Galaxy A5 (MTP)
+	6863  Galaxy series, misc. (tethering mode)
+	6864  GT-I9070 (network tethering, USB debugging enabled)
+	6865  Galaxy (PTP mode)
+	6866  Galaxy (debugging mode)
+	6868  Escape Composite driver for Android Phones: Modem+Diagnostic+ADB
+	6875  GT-B3710 Standalone LTE device (Commercial)
+	6876  GT-B3710 LTE Modem
+	6877  Galaxy S
+	687a  GT-E2370 mobile phone
+	6888  GT-B3730 Composite LTE device (Commercial)
+	6889  GT-B3730 Composite LTE device (Commercial)
+	689a  LTE Storage Driver [CMC2xx]
+	689e  GT-S5670 [Galaxy Fit]
+	68aa  Reality
+	7011  SEW-2003U Card
+	7021  Bluetooth Device
+	7061  eHome Infrared Receiver
+	7080  Anycall SCH-W580
+	7081  Human Interface Device
+	7301  Fingerprint Device
+	8001  Handheld
+	8002  Portable SSD 500GB Model Number: MU - P8500B
+	8003  Portable SSD T1
+	d003  GT-I9003
+	e020  SERI E02 SCOM 6200 UMTS Phone
+	e021  SERI E02 SCOM 6200 Virtual UARTs
+	e022  SERI E02 SCOM 6200 Flash Load Disk
+	f000  Intensity 3 (Mass Storage Mode)
+	ff30  SG_iMON
 04e9  PC-Tel, Inc.
 04ea  Brooktree Corp.
 04eb  Northstar Systems, Inc.
+	e004  eHome Infrared Transceiver
 04ec  Tokyo Electron Device, Ltd
 04ed  Annabooks
 04ef  Pacific Electronic International, Inc.
@@ -1322,17 +5553,140 @@
 04f1  Victor Company of Japan, Ltd
 	0001  GC-QX3 Digital Still Camera
 	0004  GR-DVL815U Digital Video Camera
+	0006  DV Camera Storage
 	0008  GZ-MG30AA/MC500E Digital Video Camera
 	0009  GR-DX25EK Digital Video Camera
 	000a  GR-D72 Digital Video Camera
+	1001  GC-A50 Camera Device
+	3008  MP-PRX1 Ethernet
+	3009  MP-XP7250 WLAN Adapter
 04f2  Chicony Electronics Co., Ltd
 	0001  KU-8933 Keyboard
 	0002  NT68P81 Keyboard
 	0110  KU-2971 Keyboard
+	0111  KU-9908 Keyboard
 	0112  KU-8933 Keyboard with PS/2 Mouse port
-	0116  KU-2971 German Keyboard
+	0116  KU-2971/KU-0325 Keyboard
+	0200  KBR-0108
+	0201  Gaming Keyboard KPD0250
+	0220  Wireless HID Receiver
+	0402  Genius LuxeMate i200 Keyboard
+	0403  KU-0420 keyboard
+	0418  KU-0418 Tactical Pad
+	0618  RG-0618U Wireless HID Receiver & KG-0609 Wireless Keyboard with Touchpad
+	0718  wired mouse
+	0760  Acer KU-0760 Keyboard
+	0833  KU-0833 Keyboard
+	0841  HP Multimedia Keyboard
+	0860  2.4G Multimedia Wireless Kit
+	0939  Amazon Basics mouse
+	1061  HP KG-1061 Wireless Keyboard+Mouse
+	1121  Periboard 717 Mini Wireless Keyboard
+	a001  E-Video DC-100 Camera
+	a120  ORITE CCD Webcam(PC370R)
+	a121  ORITE CCD Webcam(PC370R)
+	a122  ORITE CCD Webcam(PC370R)
+	a123  ORITE CCD Webcam(PC370R)
+	a124  ORITE CCD Webcam(PC370R)
+	a128  PC Camera (SN9C202 + OV7663 + EEPROM)
+	a133  Gateway Webcam
+	a136  LabTec Webcam 5500
+	a147  Medion Webcam
+	a204  DSC WIA Device (1300)
+	a208  DSC WIA Device (2320)
 	a209  Labtec DC-2320
+	a20a  DSC WIA Device (3310)
+	a20c  DSC WIA Device (3320)
+	a210  Audio Device
+	b008  USB 2.0 Camera
+	b009  Integrated Camera
+	b010  Integrated Camera
+	b012  1.3 MPixel UVC Webcam
+	b013  USB 2.0 Camera
+	b015  VGA 24fps UVC Webcam
+	b016  VGA 30fps UVC Webcam
+	b018  2M UVC Webcam
+	b021  ViewSonic 1.3M, USB2.0 Webcam
+	b022  Gateway USB 2.0 Webcam
+	b023  Gateway USB 2.0 Webcam
+	b024  USB 2.0 Webcam
+	b025  Camera
+	b027  Gateway USB 2.0 Webcam
+	b028  VGA UVC Webcam
+	b029  1.3M UVC Webcam
+	b036  Asus Integrated 0.3M UVC Webcam
+	b044  Acer CrystalEye Webcam
+	b057  integrated USB webcam
+	b059  CKF7037 HP webcam
+	b064  CNA7137 Integrated Webcam
+	b070  Camera
+	b071  2.0M UVC Webcam / CNF7129
+	b083  CKF7063 Webcam (HP)
+	b091  Webcam
+	b104  CNF7069 Webcam
+	b107  CNF7070 Webcam
+	b14c  CNF8050 Webcam
+	b159  CNF8243 Webcam
+	b15c  Sony Vaio Integrated Camera
+	b175  4-Port Hub
+	b1aa  Webcam-101
+	b1ac  HP Laptop Integrated Webcam [2 MP Fixed]
+	b1b4  Lenovo Integrated Camera
+	b1b9  Asus Integrated Webcam
+	b1bb  2.0M UVC WebCam
+	b1cf  Lenovo Integrated Camera
+	b1d6  CNF9055 Toshiba Webcam
+	b1d8  1.3M Webcam
+	b1e4  Toshiba Integrated Webcam
+	b213  Fujitsu Integrated Camera
+	b217  Lenovo Integrated Camera (0.3MP)
+	b221  integrated camera
+	b230  Integrated HP HD Webcam
+	b249  HP Integrated Webcam
+	b257  Lenovo Integrated Camera
+	b26b  Sony Visual Communication Camera
+	b272  Lenovo EasyCamera
+	b2b0  Camera
+	b2b9  Lenovo Integrated Camera UVC
+	b2da  thinkpad t430s camera
+	b2db  Thinkpad T430 camera
+	b2ea  Integrated Camera [ThinkPad]
+	b2f4  HP Webcam-50
+	b330  Asus 720p CMOS webcam
+	b354  UVC 1.00 device HD UVC WebCam
+	b394  Integrated Camera
+	b3eb  HP 720p HD Monitor Webcam
+	b3f6  HD WebCam (Acer)
+	b3fd  HD WebCam (Asus N-series)
+	b40e  HP Truevision HD camera
+	b444  Lenovo Integrated Webcam
+	b49f  Bluetooth (RTL8723BE)
+	b563  Integrated Camera
+	b5ab  Integrated Camera
+	b5ac  Integrated IR Camera
+	b5ce  Integrated Camera
+	b5cf  Integrated IR Camera
+	b5db  HP Webcam
+	b604  Integrated Camera (1280x720@30)
+	b681  ThinkPad T490 Webcam
 04f3  Elan Microelectronics Corp.
+	000a  Touchscreen
+	0103  ActiveJet K-2024 Multimedia Keyboard
+	016f  Touchscreen
+	01a4  Wireless Keyboard
+	0201  Touchscreen
+	0210  Optical Mouse
+	0212  Laser Mouse
+	0214  Lynx M9 Optical Mouse
+	0230  3D Optical Mouse
+	0232  Mouse
+	0234  Optical Mouse
+	0235  Optical Mouse
+	02f4  2.4G Cordless Mouse
+	0381  Touchscreen
+	04a0  Dream Cheeky Stress/Panic Button
+	0c28  fingerprint sensor [FeinTech FPS00200]
+	2234  Touchscreen
 04f4  Harting Elektronik, Inc.
 04f5  Fujitsu-ICL Systems, Inc.
 04f6  Norand Corp.
@@ -1340,40 +5694,640 @@
 04f8  FuturePlus Systems
 04f9  Brother Industries, Ltd
 	0002  HL-1050 Laser Printer
+	0005  Printer
 	0006  HL-1240 Laser Printer
 	0007  HL-1250 Laser Printer
 	0008  HL-1270 Laser Printer
+	0009  Printer
+	000a  P2500 series
+	000b  Printer
+	000c  Printer
 	000d  HL-1440 Laser Printer
-	010f  MFC 5100C
-	0111  MFC 6800
+	000e  HL-1450 series
+	000f  HL-1470N series
+	0010  Printer
+	0011  Printer
+	0012  Printer
+	0013  Printer
+	0014  Printer
+	0015  Printer
+	0016  Printer
+	0017  Printer
+	0018  Printer
+	001a  HL-1430 Laser Printer
+	001c  Printer
+	001e  Printer
+	0020  HL-5130 series
+	0021  HL-5140 series
+	0022  HL-5150D series
+	0023  HL-5170DN series
+	0024  Printer
+	0025  Printer
+	0027  HL-2030 Laser Printer
+	0028  Printer
+	0029  Printer
+	002a  HL-52x0 series
+	002b  HL-5250DN Printer
+	002c  Printer
+	002d  Printer
+	0037  HL-3040CN series
+	0038  HL-3070CW series
+	0039  HL-5340 series
+	0041  HL-2250DN Laser Printer
+	0042  HL-2270DW Laser Printer
+	004d  HL-6180DW series
+	0080  HL-L6250DN series
+	0100  MFC8600/9650 series
+	0101  MFC9600/9870 series
+	0102  MFC9750/1200 series
+	0104  MFC-8300J
+	0105  MFC-9600J
+	0106  MFC-7300C
+	0107  MFC-7400C
+	0108  MFC-9200C
+	0109  MFC-830
+	010a  MFC-840
+	010b  MFC-860
+	010c  MFC-7400J
+	010d  MFC-9200J
+	010e  MFC-3100C Scanner
+	010f  MFC-5100C
+	0110  MFC-4800 Scanner
+	0111  MFC-6800
+	0112  DCP1000 Port(FaxModem)
+	0113  MFC-8500
+	0114  MFC9700 Port(FaxModem)
+	0115  MFC-9800 Scanner
+	0116  DCP1400 Scanner
+	0119  MFC-9660
+	011a  MFC-9860
+	011b  MFC-9880
+	011c  MFC-9760
+	011d  MFC-9070
+	011e  MFC-9180
+	011f  MFC-9160
+	0120  MFC580 Port(FaxModem)
+	0121  MFC-590
+	0122  MFC-5100J
+	0124  MFC-4800J
+	0125  MFC-6800J
+	0127  MFC-9800J
+	0128  MFC-8500J
+	0129  Imagistics 2500 (MFC-8640D clone)
+	012b  MFC-9030
+	012e  FAX4100e IntelliFax 4100e
+	012f  FAX-4750e
+	0130  FAX-5750e
+	0132  MFC-5200C RemovableDisk
+	0135  MFC-100 Scanner
+	0136  MFC-150CL Scanner
+	013c  MFC-890 Port
+	013d  MFC-5200J
+	013e  MFC-4420C RemovableDisk
+	013f  MFC-4820C RemovableDisk
+	0140  DCP-8020
+	0141  DCP-8025D
+	0142  MFC-8420
+	0143  MFC-8820D
+	0144  DCP-4020C RemovableDisk
+	0146  MFC-3220C
+	0147  FAX-1820C Printer
+	0148  MFC-3320CN
+	0149  FAX-1920CN Printer
+	014a  MFC-3420C
+	014b  MFC-3820CN
+	014c  DCP-3020C
+	014d  FAX-1815C Printer
+	014e  MFC-8820J
+	014f  DCP-8025J
+	0150  MFC-8220 Port(FaxModem)
+	0151  MFC-8210J
+	0153  DCP-1000J
+	0157  MFC-3420J Printer
+	0158  MFC-3820JN Port(FaxModem)
+	015d  MFC Composite Device
+	015e  DCP-8045D
+	015f  MFC-8440
+	0160  MFC-8840D
+	0161  MFC-210C
+	0162  MFC-420CN Remote Setup Port
+	0163  MFC-410CN RemovableDisk
+	0165  MFC-620CN
+	0166  MFC-610CLN RemovableDisk
+	0168  MFC-620CLN
+	0169  DCP-110C RemovableDisk
+	016b  DCP-310CN RemovableDisk
+	016c  FAX-2440C Printer
+	016d  MFC-5440CN
+	016e  MFC-5840CN Remote Setup Port
+	0170  FAX-1840C Printer
+	0171  FAX-1835C Printer
+	0172  FAX-1940CN Printer
+	0173  MFC-3240C Remote Setup Port
+	0174  MFC-3340CN RemovableDisk
+	017b  Imagistics sx2100
+	0180  MFC-7420
+	0181  MFC-7820N Port(FaxModem)
+	0182  DCP-7010
+	0183  DCP-7020
+	0184  DCP-7025 Printer
+	0185  MFC-7220 Printer
+	0186  Composite Device
+	0187  FAX-2820 Printer
+	0188  FAX-2920 Printer
+	018a  MFC-9420CN
+	018c  DCP-115C
+	018d  DCP-116C
+	018e  DCP-117C
+	018f  DCP-118C
+	0190  DCP-120C
+	0191  DCP-315CN
+	0192  DCP-340CW
+	0193  MFC-215C
+	0194  MFC-425CN
+	0195  MFC-820CW Remote Setup Port
+	0196  MFC-820CN Remote Setup Port
+	0197  MFC-640CW
+	019a  MFC-840CLN Remote Setup Port
+	01a2  MFC-8640D
+	01a3  Composite Device
+	01a4  DCP-8065DN Printer
+	01a5  MFC-8460N Port(FaxModem)
+	01a6  MFC-8860DN Port(FaxModem)
+	01a7  MFC-8870DW Printer
+	01a8  DCP-130C
+	01a9  DCP-330C
+	01aa  DCP-540CN
+	01ab  MFC-240C
+	01ae  DCP-750CW RemovableDisk
+	01af  MFC-440CN
+	01b0  MFC-660CN
+	01b1  MFC-665CW
+	01b2  MFC-845CW
+	01b4  MFC-460CN
+	01b5  MFC-630CD
+	01b6  MFC-850CDN
+	01b7  MFC-5460CN
+	01b8  MFC-5860CN
+	01ba  MFC-3360C
+	01bd  MFC-8660DN
+	01be  DCP-750CN RemovableDisk
+	01bf  MFC-860CDN
+	01c0  DCP-128C
+	01c1  DCP-129C
+	01c2  DCP-131C
+	01c3  DCP-329C
+	01c4  DCP-331C
+	01c5  MFC-239C
+	01c9  DCP-9040CN
+	01ca  MFC-9440CN
+	01cb  DCP-9045CDN
+	01cc  MFC-9840CDW
+	01ce  DCP-135C
+	01cf  DCP-150C
+	01d0  DCP-350C
+	01d1  DCP-560CN
+	01d2  DCP-770CW
+	01d3  DCP-770CN
+	01d4  MFC-230C
+	01d5  MFC-235C
+	01d6  MFC-260C
+	01d7  MFC-465CN
+	01d8  MFC-680CN
+	01d9  MFC-685CW
+	01da  MFC-885CW
+	01db  MFC-480CN
+	01dc  MFC-650CD
+	01dd  MFC-870CDN
+	01de  MFC-880CDN
+	01df  DCP-155C
+	01e0  MFC-265C
+	01e1  DCP-153C
+	01e2  DCP-157C
+	01e3  DCP-353C
+	01e4  DCP-357C
+	01e7  MFC-7340
+	01e9  DCP-7040
+	01ea  DCP-7030
+	01eb  MFC-7320
+	01ec  MFC-9640CW
+	01f4  MFC-5890CN
+	0204  DCP-165C
+	020a  MFC-8670DN
+	020c  DCP-9042CDN
+	020d  MFC-9450CDN
+	0216  MFC-8880DN
+	0217  MFC-8480DN
+	0219  MFC-8380DN
+	021a  MFC-8370DN
+	021b  DCP-8070D
+	021c  MFC-9320CW
+	021d  MFC-9120CN
+	021e  DCP-9010CN
+	021f  DCP-8085DN
+	0220  MFC-9010CN
+	0222  DCP-195C
+	0223  DCP-365CN
+	0224  DCP-375CW
+	0225  DCP-395CN
+	0227  DCP-595CN
+	0228  MFC-255CW
+	0229  MFC-295CN
+	022a  MFC-495CW
+	022b  MFC-495CN
+	022c  MFC-795CW
+	022d  MFC-675CD
+	022e  MFC-695CDN
+	022f  MFC-735CD
+	0230  MFC-935CDN
+	0234  DCP-373CW
+	0235  DCP-377CW
+	0236  DCP-390CN
+	0239  MFC-253CW
+	023a  MFC-257CW
+	023e  DCP-197C
+	023f  MFC-8680DN
+	0240  MFC-J950DN
+	0245  MFC-9560CDW
+	0248  DCP-7055 scanner/printer
+	024e  MFC-7460DN
+	0253  DCP-J125
+	0254  DCP-J315W
+	0255  DCP-J515W
+	0256  DCP-J515N
+	0257  DCP-J715W
+	0258  DCP-J715N
+	0259  MFC-J220
+	025a  MFC-J410
+	025b  MFC-J265W
+	025c  MFC-J415W
+	025d  MFC-J615W
+	025e  MFC-J615N
+	025f  MFC-J700D
+	0260  MFC-J800D
+	0261  MFC-J850DN
+	026b  MFC-J630W
+	026d  MFC-J805D
+	026e  MFC-J855DN
+	026f  MFC-J270W
+	0270  MFC-7360N
+	0273  DCP-7057 scanner/printer
+	0276  MFC-5895CW
+	0278  MFC-J410W
+	0279  DCP-J525W
+	027a  DCP-J525N
+	027b  DCP-J725DW
+	027c  DCP-J725N
+	027d  DCP-J925DW
+	027e  MFC-J955DN
+	027f  MFC-J280W
+	0280  MFC-J435W
+	0281  MFC-J430W
+	0282  MFC-J625DW
+	0283  MFC-J825DW
+	0284  MFC-J825N
+	0285  MFC-J705D
+	0287  MFC-J860DN
+	0288  MFC-J5910DW
+	0289  MFC-J5910CDW
+	028a  DCP-J925N
+	028d  MFC-J835DW
+	028f  MFC-J425W
+	0290  MFC-J432W
+	0291  DCP-8110DN
+	0292  DCP-8150DN
+	0293  DCP-8155DN
+	0294  DCP-8250DN
+	0295  MFC-8510DN
+	0296  MFC-8520DN
+	0298  MFC-8910DW
+	0299  MFC-8950DW
+	029a  MFC-8690DW
+	029c  MFC-8515DN
+	029e  MFC-9125CN
+	029f  MFC-9325CW
+	02a0  DCP-J140W
+	02a5  MFC-7240
+	02a6  FAX-2940
+	02a7  FAX-2950
+	02a8  MFC-7290
+	02ab  FAX-2990
+	02ac  DCP-8110D
+	02ad  MFC-9130CW
+	02ae  MFC-9140CDN
+	02af  MFC-9330CDW
+	02b0  MFC-9340CDW
+	02b1  DCP-9020CDN
+	02b2  MFC-J810DN
+	02b3  MFC-J4510DW
+	02b4  MFC-J4710DW
+	02b5  DCP-8112DN
+	02b6  DCP-8152DN
+	02b7  DCP-8157DN
+	02b8  MFC-8512DN
+	02ba  MFC-8912DW
+	02bb  MFC-8952DW
+	02bc  DCP-J540N
+	02bd  DCP-J740N
+	02be  MFC-J710D
+	02bf  MFC-J840N
+	02c0  DCP-J940N
+	02c1  MFC-J960DN
+	02c2  DCP-J4110DW
+	02c3  MFC-J4310DW
+	02c4  MFC-J4410DW
+	02c5  MFC-J4610DW
+	02c6  DCP-J4210N
+	02c7  MFC-J4510N
+	02c8  MFC-J4910CDW
+	02c9  MFC-J4810DN
+	02ca  MFC-8712DW
+	02cb  MFC-8710DW
+	02cc  MFC-J2310
+	02cd  MFC-J2510
+	02ce  DCP-7055W
+	02cf  DCP-7057W
+	02d0  DCP-1510
+	02d1  MFC-1810
+	02d3  DCP-9020CDW
+	02d4  MFC-8810DW
+	02dd  DCP-J4215N
+	02de  DCP-J132W
+	02df  DCP-J152W
+	02e0  DCP-J152N
+	02e1  DCP-J172W
+	02e2  DCP-J552DW
+	02e3  DCP-J552N
+	02e4  DCP-J752DW
+	02e5  DCP-J752N
+	02e6  DCP-J952N
+	02e7  MFC-J245
+	02e8  MFC-J470DW
+	02e9  MFC-J475DW
+	02ea  MFC-J285DW
+	02eb  MFC-J650DW
+	02ec  MFC-J870DW
+	02ed  MFC-J870N
+	02ee  MFC-J720D
+	02ef  MFC-J820DN
+	02f0  MFC-J980DN
+	02f1  MFC-J890DN
+	02f2  MFC-J6520DW
+	02f3  MFC-J6570CDW
+	02f4  MFC-J6720DW
+	02f5  MFC-J6920DW
+	02f6  MFC-J6970CDW
+	02f7  MFC-J6975CDW
+	02f8  MFC-J6770CDW
+	02f9  DCP-J132N
+	02fa  MFC-J450DW
+	02fb  MFC-J875DW
+	02fc  DCP-J100
+	02fd  DCP-J105
+	02fe  MFC-J200
+	02ff  MFC-J3520
+	0300  MFC-J3720
+	030f  DCP-L8400CDN
+	0310  DCP-L8450CDW
+	0311  MFC-L8600CDW
+	0312  MFC-L8650CDW
+	0313  MFC-L8850CDW
+	0314  MFC-L9550CDW
+	0318  MFC-7365DN
+	0320  MFC-L2740DW
+	0321  DCP-L2500D
+	0322  DCP-L2520DW
+	0324  DCP-L2520D
+	0326  DCP-L2540DN
+	0328  DCP-L2540DW
+	0329  DCP-L2560DW
+	0330  HL-L2380DW
+	0331  MFC-L2700DW
+	0335  FAX-L2700DN
+	0337  MFC-L2720DW
+	0338  MFC-L2720DN
+	0339  DCP-J4120DW
+	033a  MFC-J4320DW
+	033c  MFC-J2320
+	033d  MFC-J4420DW
+	0340  MFC-J4620DW
+	0341  MFC-J2720
+	0342  MFC-J4625DW
+	0343  MFC-J5320DW
+	0346  MFC-J5620DW
+	0347  MFC-J5720DW
+	0349  DCP-J4220N
+	034b  MFC-J4720N
+	034e  MFC-J5720CDW
+	034f  MFC-J5820DN
+	0350  MFC-J5620CDW
+	0351  DCP-J137N
+	0353  DCP-J557N
+	0354  DCP-J757N
+	0355  DCP-J957N
+	0356  MFC-J877N
+	0357  MFC-J727D
+	0358  MFC-J987DN
+	0359  MFC-J827DN
+	035a  MFC-J897DN
+	035b  DCP-1610W
+	035c  DCP-1610NW
+	035d  MFC-1910W
+	035e  MFC-1910NW
+	0360  DCP-1618W
+	0361  MFC-1919NW
+	0364  MFC-J5625DW
+	0365  MFC-J4520DW
+	0366  MFC-J5520DW
+	0367  DCP-7080D
+	0368  DCP-7080
+	0369  DCP-7180DN
+	036a  DCP-7189DW
+	036b  MFC-7380
+	036c  MFC-7480D
+	036d  MFC-7880DN
+	036e  MFC-7889DW
+	036f  DCP-9022CDW
+	0370  MFC-9142CDN
+	0371  MFC-9332CDW
+	0372  MFC-9342CDW
+	0373  MFC-L2700D
+	0376  DCP-1600
+	0377  MFC-1900
+	0378  DCP-1608
+	0379  DCP-1619
+	037a  MFC-1906
+	037b  MFC-1908
+	037c  ADS-2000e
+	037d  ADS-2100e
+	037e  ADS-2500We
+	037f  ADS-2600We
+	0380  DCP-J562DW
+	0381  DCP-J562N
+	0383  DCP-J962N
+	0384  MFC-J480DW
+	0385  MFC-J485DW
+	0386  MFC-J460DW
+	0388  MFC-J680DW
+	0389  MFC-J880DW
+	038a  MFC-J885DW
+	038b  MFC-J880N
+	038c  MFC-J730DN
+	038d  MFC-J990DN
+	038e  MFC-J830DN
+	038f  MFC-J900DN
+	0390  MFC-J5920DW
+	0392  MFC-L2705DW
+	0393  DCP-T300
+	0394  DCP-T500W
+	0395  DCP-T700W
+	0396  MFC-T800W
+	0397  DCP-J963N
+	03b3  MFC-J6925DW
+	03b4  MFC-J6573CDW
+	03b5  MFC-J6973CDW
+	03b6  MFC-J6990CDW
+	03bb  MFC-L2680W
+	03bc  MFC-L2700DN
+	03bd  DCP-J762N
+	03fd  ADS-2700W
+	043f  MFC-L3770CDW
+	0440  MFC-9350CDW
+	0441  MFC-L3750CDW
+	0442  MFC-L3745CDW
+	0443  MFC-L3735CDN
+	0444  MFC-9150CDN
+	0445  MFC-L3730CDN
+	0446  MFC-L3710CW
+	0447  DCP-9030CDN
+	0448  DCP-L3550CDW
+	044a  HL-L3290CDW
+	044b  DCP-L3510CDW
+	044c  DCP-L3551CDW
+	1000  Printer
+	1002  Printer
+	2002  PTUSB Printing
 	2004  PT-2300/2310 p-Touch Laber Printer
-	2015  QL-500 P-touch label printer
+	2007  PT-2420PC P-touch Label Printer
+	2015  QL-500 label printer
+	2016  QL-550 printer
+	201a  PT-18R P-touch label printer
+	201b  QL-650TD Label Printer
+	2020  QL-1050 Label Printer
+	2027  QL-560 Label Printer
+	2028  QL-570 Label Printer
+	202a  QL-1060N Label Printer
+	202b  PT-7600 P-touch Label Printer
+	202c  PT-1230PC P-touch Label Printer E mode
+	202d  PT-2430PC P-touch Label Printer
+	2030  PT-1230PC P-touch Label Printer EL mode
+	2041  PT-2730 P-touch Label Printer
+	2042  QL-700 Label Printer
+	2043  QL-710W Label Printer
+	2044  QL-720NW Label Printer
+	204d  QL-720NW Label Printer (mass storage mode)
+	2061  PT-P700 P-touch Label Printer
+	2064  PT-P700 P-touch Label Printer RemovableDisk
+	2074  PT-D600 P-touch Label Printer
+	209b  QL-800 Label Printer
+	209c  QL-810W Label Printer
+	209d  QL-820NWB Label Printer
+	20a7  QL-1100 Label Printer
+	20a8  QL-1110NWB Label Printer
+	20a9  QL-1100 Label Printer (mass storage)
+	20aa  QL-1110NWB Label Printer (mass storage)
+	20ab  QL-1115NWB Label Printer
+	20ac  QL-1115NWB Label Printer (mass storage)
+	20c0  QL-600 Label Printer
+	2100  Card Reader Writer
+	2102  Sewing machine
+	60a0  ADS-2000
+	60a1  ADS-2100
+	60a4  ADS-2500W
+	60a5  ADS-2600W
+	60a6  ADS-1000W
+	60a7  ADS-1100W
+	60a8  ADS-1500W
+	60a9  ADS-1600W
 04fa  Dallas Semiconductor
 	2490  DS1490F 2-in-1 Fob, 1-Wire adapter
 	4201  DS4201 Audio DAC
 04fb  Biostar Microtech International Corp.
 04fc  Sunplus Technology Co., Ltd
-	0003  CM1092 Optical Scroller Mouse
+	0003  CM1092 / Wintech CM-5098 Optical Mouse
+	0005  USB OpticalWheel Mouse
+	0013  ViewMate Desktop Mouse CC2201
+	0015  ViewMate Desktop Mouse CC2201
+	00d3  00052486 / Laser Mouse M1052 [hama]
+	0171  SPCA1527A/SPCA1528 SD card camera (Mass Storage mode)
+	0201  SPCP825 RS232C Adapter
+	0232  Fingerprint
+	0538  Wireless Optical Mouse 2.4G [Bright]
 	0561  Flexcam 100
-	504a  SPCA504a Digital Camera
-	504b  Aiptek, 1.3 mega PockerCam
+	05d8  Wireless keyboard/mouse
+	05da  SPEEDLINK SNAPPY Wireless Mouse Nano
+	0c15  SPIF215A SATA bridge
+	0c25  SATALink SPIF225A
+	1528  SPCA1527A/SPCA1528 SD card camera (webcam mode)
+	1533  Mass Storage
+	2080  ASUS Webcam
+	500c  CA500C Digital Camera
+	504a  Aiptek Mini PenCam 1.3
+	504b  Aiptek Mega PockerCam 1.3/Maxell MaxPocket LE 1.3
+	5330  Digitrex 2110
 	5331  Vivitar Vivicam 10
+	5360  Sunplus Generic Digital Camera
+	5563  Digital Media Player MP3/WMA [The Sharper Image]
+	5720  Card Reader Driver
+	6333  Siri A9 UVC chipset
 	7333  Finet Technology Palmpix DC-85
+	757a  Aiptek, MP315 MP3 Player
 	ffff  PureDigital Ritz Disposable
 04fd  Soliton Systems, K.K.
+	0003  Smart Card Reader II
 04fe  PFU, Ltd
+	0006  Happy Hacking Keyboard Lite2
 04ff  E-CMOS Corp.
 0500  Siam United Hi-Tech
+	0001  DART Keyboard Mouse
+	0002  DART-2 Keyboard
 0501  Fujikura DDK, Ltd
 0502  Acer, Inc.
+	0001  Handheld
+	0736  Handheld
+	15b1  PDA n311
+	1631  c10 Series
+	1632  c20 Series
+	16e1  n10 Handheld Sync
+	16e2  n20 Pocket PC Sync
+	16e3  n30 Handheld Sync
+	2008  Liquid Gallant Duo E350 (preloader)
+	3202  Liquid
+	3203  Liquid (Debug mode)
+	3230  BeTouch E120
+	3317  Liquid
+	3325  Iconia tablet A500
+	3341  Iconia tablet A500
+	33c3  Liquid Gallant Duo E350
+	33c4  Liquid Gallant Duo E350 (debug mode)
+	33c7  Liquid Gallant Duo E350 (USB tethering)
+	33c8  Liquid Gallant Duo E350 (debug mode, USB tethering)
 	d001  Divio NW801/DVC-V6+ Digital Camera
 0503  Hitachi America, Ltd
 0504  Hayes Microcomputer Products
 0506  3Com Corp.
+	009d  HomeConnect Camera
 	00a0  3CREB96 Bluetooth Adapter
+	00a1  Bluetooth Device
+	00a2  Bluetooth Device
+	00df  3Com Home Connect lite
+	0100  HomeConnect ADSL Modem Driver
 	03e8  3C19250 Ethernet [klsi]
+	0a01  3CRSHEW696 Wireless Adapter
 	0a11  3CRWE254G72 802.11g Adapter
-	00df  3Com Home Connect lite
+	11f8  HomeConnect 3C460
+	2922  HomeConnect Cable Modem External with
+	3021  U.S.Robotics 56000 Voice FaxModem Pro
 	4601  3C460B 10/100 Ethernet Adapter
 	f002  3CP4218 ADSL Modem (pre-init)
 	f003  3CP4218 ADSL Modem
@@ -1382,33 +6336,114 @@
 	0011  Konami ParaParaParadise Controller
 0508  Clarion Co., Ltd
 0509  Aztech Systems, Ltd
+	0801  ADSL Modem
+	0802  ADSL Modem (RFC1483)
+	0806  DSL Modem
+	080f  Binatone ADSL500 Modem Network Interface
+	0812  Pirelli ADSL Modem Network Interface
 050a  Cinch Connectors
 050b  Cable System International
 050c  InnoMedia, Inc.
 050d  Belkin Components
-	0012  Bluetooth USB Adapter F8T012
+	0004  Direct Connect
+	0012  F8T012 Bluetooth Adapter
+	0013  F8T013 Bluetooth Adapter
+	0017  B8T017 Bluetooth+EDR 2.1 / F4U017 USB 2.0 7-port Hub
+	003a  Universal Media Reader
+	0050  F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a]
+	0081  F8T001v2 Bluetooth
+	0083  Bluetooth Device
+	0084  F8T003v2 Bluetooth
 	0102  Flip KVM
 	0103  F5U103 Serial Adapter [etek]
+	0106  VideoBus II Adapter, Video
 	0108  F1DE108B KVM
 	0109  F5U109/F5U409 PDA Adapter
 	0115  SCSI Adapter
+	0119  F5U120-PC Dual PS/2 Ports / F5U118-UNV ADB Adapter
 	0121  F5D5050 100Mbps Ethernet
+	0122  Ethernet Adapter
+	0131  Bluetooth Device with trace filter
+	016a  Bluetooth Mini Dongle
+	0200  Nostromo SpeedPad n52te Gaming Keyboard
+	0201  Peripheral Switch
 	0208  USBView II Video Adapter [nt1004]
+	0210  F5U228 Hi-Speed USB 2.0 DVD Creator
+	0211  F5U211 USB 2.0 15-in-1 Media Reader & Writer
 	0224  F5U224 USB 2.0 4-Port Hub
 	0234  F5U234 USB 2.0 4-Port Hub
+	0237  F5U237 USB 2.0 7-Port Hub
+	0240  F5U240 USB 2.0 CF Card Reader
+	0249  USB 2 Flash Media Device
+	0257  F5U257 Serial
+	0304  FSU304 USB 2.0 - 4 Ports Hub
+	0307  USB 2.0 - 7 ports Hub [FSU307]
+	038c  F2CU038 HDMI Adapter
+	0409  F5U409 Serial
+	0416  Staples 12416 7 port desktop hub
+	0551  F6C550-AVR UPS
+	065a  F8T065BF Mini Bluetooth 4.0 Adapter
+	0706  2-N-1 7-Port Hub (Lower half)
+	0802  Nostromo n40 Gamepad
 	0803  Nostromo 1745 GamePad
 	0805  Nostromo N50 GamePad
+	0815  Nostromo n52 HID SpeedPad Mouse Wheel
+	0826  ErgoFit Wireless Optical Mouse (HID)
+	0980  HID UPS Battery
+	1004  F9L1004 802.11n Surf N300 XR Wireless Adapter [Realtek RTL8192CU]
+	1102  F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS]
+	1103  F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573]
+	1106  F9L1106v1 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+	1109  F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]
+	110a  F9L1101v2 802.11abgn Wireless Adapter [Realtek RTL8192DU]
+	11f2  ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS]
+	1202  F5U120-PC Parallel Printer Port
 	1203  F5U120-PC Serial Port
-	3101  F1DF102U Flip Hub
-	3201  F1DF102U Flip KVM
-	7050  F5D7050 ver 1000 WiFi
+	2103  F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]
+	21f1  N300 WLAN N Adapter [ISY]
+	21f2  RTL8192CU 802.11n WLAN Adapter [ISY IWL 4000]
+	258a  F5U258 Host to Host cable
+	3101  F1DF102U/F1DG102U Flip Hub
+	3201  F1DF102U/F1DG102U Flip KVM
+	4050  ZD1211B
+	5055  F5D5055 Gigabit Network Adapter [AX88xxx]
+	6050  F6D6050 802.11abgn Wireless Adapter [Broadcom BCM4323]
+	6051  F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201]
+	615a  F7D4101 / F9L1101v1 802.11abgn Wireless Adapter [Broadcom BCM4323]
+	7050  F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887]
+	7051  F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB]
+	705a  F5D7050 Wireless G Adapter v3000 [Ralink RT2571W]
+	705b  Wireless G Adapter
+	705c  F5D7050 Wireless G Adapter v4000 [Zydas ZD1211B]
+	705e  F5D7050 Wireless G Adapter v5000 [Realtek RTL8187B]
+	706a  2-N-1 7-Port Hub (Upper half)
+	8053  F5D8053 N Wireless USB Adapter v1000/v4000 [Ralink RT2870]
+	805c  F5D8053 N Wireless Adapter v3000 [Ralink RT2870]
+	805e  F5D8053 N Wireless USB Adapter v5000 [Realtek RTL8192U]
+	815c  F5D8053 N Wireless USB Adapter v3000 [Ralink RT2870]
+	815f  F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU]
+	825a  F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870]
+	825b  F5D8055 N+ Wireless Adapter v2000 [Ralink RT3072]
+	845a  F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU]
+	905b  F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573]
+	905c  F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573]
+	935a  F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT3070]
+	935b  F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070]
+	945a  F7D1101 v1 Basic Wireless Adapter [Realtek RTL8188SU]
+	945b  F7D1101 v2 Basic Wireless Adapter [Ralink RT3370]
+	d321  Dynex DX-NUSB 802.11bgn Wireless Adapter [Broadcom BCM43231]
 050e  Neon Technology, Inc.
 050f  KC Technology, Inc.
+	0001  Hub
 	0003  KC82C160S Hub
 	0180  KC-180 IrDA Dongle
 	0190  KC2190 USB Host-to-Host cable
 0510  Sejin Electron, Inc.
+	0001  Keyboard
+	1000  Keyboard with PS/2 Mouse Port
+	e001  Mouse
 0511  N'Able (DataBook) Technologies, Inc.
+	002b  AOC DVB
 0512  Hualon Microelectronics Corp.
 0513  digital-X, Inc.
 0514  FCI Electronics
@@ -1417,13 +6452,21 @@
 0517  Butterfly Communications
 0518  EzKEY Corp.
 	0001  USB to PS2 Adaptor v1.09
+	0002  EZ-9900C Keyboard
 0519  Star Micronics Co., Ltd
+	0003  TSP100ECO/TSP100II
 	c002  Xlive Bluetooth XBM-100S MP3 Player
 051a  WYSE Technology
+	a005  Smart Display Version 9973
 051b  Silicon Graphics
 051c  Shuttle, Inc.
+	0005  VFD Module
+	c001  eHome Infrared Receiver
+	c002  eHome Infrared Receiver
 051d  American Power Conversion
-	0002  Uninterruptible Power Supply 
+	0001  UPS
+	0002  Uninterruptible Power Supply
+	0003  UPS
 051e  Scientific Atlanta, Inc.
 051f  IO Systems (Elite Electronics), Inc.
 0520  Taiwan Semiconductor Manufacturing Co.
@@ -1432,22 +6475,43 @@
 0523  ATEN GmbH
 0524  Sola Electronics
 0525  Netchip Technology, Inc.
+	100d  RFMD Bluetooth Device
 	1080  NET1080 USB-USB Bridge
+	1200  SSDC Adapter II
+	1265  File-backed Storage Gadget
+	3424  V30x/V4xx fingerprint sensor [Lumidigm]
+	a0f0  Cambridge Electronic Devices Power1401 mk 2
+	a140  USB Clik! 40
+	a141  (OME) PocketZip 40 MP3 Player Driver
+	a220  GVC Bluetooth Wireless Adapter
 	a4a0  Linux-USB "Gadget Zero"
 	a4a1  Linux-USB Ethernet Gadget
 	a4a2  Linux-USB Ethernet/RNDIS Gadget
 	a4a3  Linux-USB user-mode isochronous source/sink
 	a4a4  Linux-USB user-mode bulk source/sink
-	a4a5  Linux-USB File Storage Gadget
+	a4a5  Linux-USB File-backed Storage Gadget
 	a4a6  Linux-USB Serial Gadget
 	a4a7  Linux-USB Serial Gadget (CDC ACM mode)
 	a4a8  Linux-USB Printer Gadget
+	a4a9  Linux-USB OBEX Gadget
+	a4aa  Linux-USB CDC Composite Gadge (Ethernet and ACM)
+	a4ab  Linux-USB Multifunction Composite Gadget
+	a4ac  Linux-USB HID Gadget
 0526  Temic MHS S.A.
 0527  ALTRA
 0528  ATI Technologies, Inc.
 	7561  TV Wonder
+	7562  TV Wonder, Edition (FN5)
+	7563  TV Wonder, Edition (FI)
+	7564  TV Wonder, Edition (FQ)
+	7565  TV Wonder, Edition (NTSC+)
+	7566  TV Wonder, Edition (FN5)
+	7567  TV Wonder, Edition (FI)
+	7568  TV Wonder, Edition (FQ)
+	7569  Live! Pro (A)
+	756a  Live! Pro Audio (O)
 0529  Aladdin Knowledge Systems
-	0001  HASP v0.06
+	0001  HASP copy protection dongle
 	030b  eToken R1 v3.1.3.x
 	0313  eToken R1 v3.2.3.x
 	031b  eToken R1 v3.3.3.x
@@ -1458,15 +6522,21 @@
 	042a  eToken R2 v2.5.4.x
 	050c  eToken Pro v4.1.5.x
 	0514  eToken Pro v4.2.5.4
+	0600  eToken Pro 64k (4.2)
+	0620  Token JC
 052a  Crescent Heart Software
 052b  Tekom Technologies, Inc.
+	0102  Ca508A HP1020 Camera v.1.3.1.6
 	0801  Yakumo MegaImage 37
 	1512  Yakumo MegaImage IV
-	1513  Aosta CX100 WebCam
-	1514  Aosta CX100 WebCam Storage
+	1513  Aosta CX100 Webcam
+	1514  Aosta CX100 Webcam Storage
 	1905  Yakumo MegaImage 47
 	1911  Yakumo MegaImage 47 SL
+	2202  WDM Still Image Capture
+	2203  Sound Vision Stream Driver
 	3a06  DigiLife DDV-5120A
+	d001  P35U Camera Capture
 052c  Canon Information Systems, Inc.
 052d  Avid Electronics Corp.
 052e  Standard Microsystems Corp.
@@ -1478,10 +6548,13 @@
 0534  Motorola, Inc.
 0535  LIH TZU Electric Co., Ltd
 0536  Hand Held Products (Welch Allyn, Inc.)
+	01a0  PDT
 0537  Inventec Corp.
 0538  Caldera International, Inc. (SCO)
 0539  Shyh Shiun Terminals Co., Ltd
-053a  Preh Werke GmbH & Co. KG
+053a  PrehKeyTec GmbH
+	0b00  Hub
+	0b01  Preh MCI 3100
 053b  Global Village Communication
 053c  Institut of Microelectronic & Mechatronic Systems
 053d  Silicon Architect
@@ -1493,23 +6566,69 @@
 0543  ViewSonic Corp.
 	00fe  G773 Monitor Hub
 	00ff  P815 Monitor Hub
+	0bf2  airpanel V150 Wireless Smart Display
+	0bf3  airpanel V110 Wireless Smart Display
+	0ed9  Color Pocket PC V35
+	0f01  airsync Wi-Fi Wireless Adapter
+	1527  Color Pocket PC V36
+	1529  Color Pocket PC V37
+	152b  Color Pocket PC V38
+	152e  Pocket PC
+	1921  Communicator Pocket PC
+	1922  Smartphone
+	1923  Pocket PC V30
+	1a11  Wireless 802.11g Adapter
+	1e60  TA310 - ATSC/NTSC/PAL Driver(PCM4)
 	4153  ViewSonic G773 Control (?)
 0544  Cristie Electronics, Ltd
 0545  Xirlink, Inc.
+	7333  Trution Web Camera
 	8002  IBM NetCamera
-	800c  Veo StingRay
-	8080  IBM C-It WebCam
-	810a  Veo Advanced Connect WebCam
+	8009  Veo PC Camera
+	800c  Veo Stingray
+	800d  Veo PC Camera
+	8080  IBM C-It Webcam
+	808a  Veo PC Camera
+	808b  Veo Stingray
+	808d  Veo PC Camera
+	810a  Veo Advanced Connect Webcam
+	810b  Veo PC Camera
+	810c  Veo PC Camera
+	8135  Veo Mobile/Advanced Web Camera
+	813a  Veo PC Camera
+	813b  Veo PC Camera
+	813c  Veo Mobile/Advanced Web Camera
+	8333  Veo Stingray/Connect Web Camera
+	888c  eVision 123 digital camera
+	888d  eVision 123 digital camera
 0546  Polaroid Corp.
 	0daf  PDC 2300Z
 	1bed  PDC 1320 Camera
 	3097  PDC 310
+	3155  PDC 3070 Camera
+	3187  Digital Camera
+	3191  Ion 80 Camera
+	3273  PDC 2030 Camera
+	3304  a500 Digital Camera
+	dccf  Sound Vision Stream Driver
 0547  Anchor Chips, Inc.
+	0001  ICSI Bluetooth Device
+	0080  I3SYSTEM HYUNY
+	1002  Python2 WDM Encoder
+	1006  Hantek DSO-2100 UF
 	2131  AN2131 EZUSB Microcontroller
 	2235  AN2235 EZUSB-FX Microcontroller
+	2710  EZ-Link Loader (EZLNKLDR.SYS)
 	2720  AN2720 USB-USB Bridge
 	2727  Xircom PGUNET USB-USB Bridge
-	2810  Cypress USB ATAPI Bridge
+	2750  EZ-Link (EZLNKUSB.SYS)
+	2810  Cypress ATAPI Bridge
+	4018  AmScope MU1803
+	4d90  AmScope MD1900 camera
+	6010  AmScope MU1000 camera
+	6510  Touptek UCMOS05100KPA
+	7000  PowerSpec MCE460 Front Panel LED Display
+	7777  Bluetooth Device
 	9999  AN2131 uninitialized (?)
 0548  Tyan Computer Corp.
 	1005  EZ Cart II GameBoy Flash Programmer
@@ -1517,50 +6636,242 @@
 054a  Fujitsu Microelectronics, Inc.
 054b  New Media Corp.
 054c  Sony Corp.
-	0010  DSC-S30/S70/S75/F505V/F505/FD92 Cybershot/Mavica Digital Camera
+	0001  HUB
+	0002  Standard HUB
+	0010  Cyber-shot, Mavica (msc)
+	0014  Nogatech USBVision (SY)
+	0022  Storage Adapter V2 (TPP)
 	0023  CD Writer
 	0024  Mavica CD-1000 Camera
 	0025  NW-MS7 Walkman MemoryStick Reader
+	002b  Portable USB Harddrive V2
 	002c  USB Floppy Disk Drive
 	002d  MSAC-US1 MemoryStick Reader
-	002e  Sony HandyCam MemoryStick Reader
+	002e  HandyCam MemoryStick Reader
+	0030  Storage Adapter V2 (TPP)
 	0032  MemoryStick MSC-U01 Reader
+	0035  Network Walkman (E)
+	0036  Net MD
+	0037  MG Memory Stick Reader/Writer
 	0038  Clie PEG-S300/D PalmOS PDA
+	0039  Network Walkman (MS)
+	003c  VAIO-MX LCD Control
+	0045  Digital Imaging Video
+	0046  Network Walkman
+	0049  UP-D895
+	004a  Memory Stick Hi-Fi System
+	004b  Memory Stick Reader/Writer
 	004e  DSC-xxx (ptp)
+	0056  MG Memory Stick Reader/Writer
 	0058  Clie PEG-N7x0C PalmOS PDA Mass Storage
 	0066  Clie PEG-N7x0C/PEG-T425 PalmOS PDA Serial
+	0067  CMR-PC3 Webcam
 	0069  Memorystick MSC-U03 Reader
+	006c  FeliCa S310 [PaSoRi]
 	006d  Clie PEG-T425 PDA Mass Storage
+	006f  Network Walkman (EV)
+	0073  Storage CRX1750U
+	0075  Net MD
+	0076  Storage Adapter ACR-U20
+	007c  Net MD
+	007f  IC Recorder (MS)
+	0080  Net MD
+	0081  Net MD
+	0084  Net MD
+	0085  Net MD
+	0086  Net MD
 	008b  Micro Vault 64M Mass Storage
+	0095  Clie s360
 	0099  Clie NR70 PDA Mass Storage
 	009a  Clie NR70 PDA Serial
+	00ab  Visual Communication Camera (PCGA-UVC10)
+	00af  DPP-EX Series Digital Photo Printer
+	00bf  IC Recorder (S)
 	00c0  Handycam DCR-30
+	00c6  Net MD
+	00c7  Net MD
 	00c8  MZ-N710 Minidisc Walkman
+	00c9  Net MD
 	00ca  MZ-DN430 Minidisc Walkman
 	00cb  MSAC-US20 Memory Stick Reader
+	00da  Clie nx60
+	00e8  Network Walkman (MS)
+	00e9  Handheld
+	00eb  Net MD
+	0101  Net MD
+	0103  IC Recorder (ST)
 	0105  Micro Vault Hub
 	0107  VCC-U01 Visual Communication Camera
+	0110  Digital Imaging Video
+	0113  Net MD
+	0116  IC Recorder (P)
 	0144  Clie PEG-TH55 PDA
+	0147  Visual Communication Camera (PCGA-UVC11)
 	014c  Aiwa AM-NX9 Net MD Music Recorder MDLP
 	014d  Memory Stick Reader/Writer
+	0154  Eyetoy Audio Device
+	0155  Eyetoy Video Device
+	015f  IC Recorder (BM)
 	0169  Clie PEG-TJ35 PDA Serial
 	016a  Clie PEG-TJ35 PDA Mass Storage
+	016b  Mobile HDD
+	016d  IC Recorder (SX)
+	016e  DPP-EX50 Digital Photo Printer
+	0171  Fingerprint Sensor 3500
+	017e  Net MD
+	017f  Hi-MD WALKMAN
+	0180  Net MD
+	0181  Hi-MD WALKMAN
+	0182  Net MD
+	0183  Hi-MD WALKMAN
+	0184  Net MD
+	0185  Hi-MD WALKMAN
+	0186  Net MD
+	0187  Hi-MD MZ-NH600 WALKMAN
+	0188  Net MD
+	018a  Net MD
+	018b  Hi-MD SOUND GATE
 	019e  Micro Vault 1.0G Mass Storage
+	01ad  ATRAC HDD PA
+	01bb  FeliCa S320 [PaSoRi]
+	01bd  MRW62E Multi-Card Reader/Writer
 	01c3  NW-E55 Network Walkman
+	01c6  MEMORY P-AUDIO
+	01c7  Printing Support
+	01c8  PSP Type A
+	01c9  PSP Type B
 	01d0  DVD+RW External Drive DRU-700A
-	01fa  Sony IC Recorder (P)
+	01d5  IC RECORDER
+	01de  VRD-VC10 [Video Capture]
+	01e7  UP-D897
+	01e8  UP-DR150 Photo Printer
+	01e9  Net MD
+	01ea  Hi-MD WALKMAN
+	01ee  IC RECORDER
+	01fa  IC Recorder (P)
 	01fb  NW-E405 Network Walkman
+	020f  Device
+	0210  ATRAC HDD PA
+	0219  Net MD
+	021a  Hi-MD WALKMAN
+	021b  Net MD
+	021c  Hi-MD WALKMAN
+	021d  Net MD
+	0226  UP-CR10L
+	0227  Printing Support
+	022c  Net MD
+	022d  Hi-MD AUDIO
+	0233  ATRAC HDD PA
+	0236  Mobile HDD
 	023b  DVD+RW External Drive DRU-800UL
+	023c  Net MD
+	023d  Hi-MD WALKMAN
+	0243  MicroVault Flash Drive
+	024b  Vaio VGX Mouse
+	0257  IFU-WLM2 USB Wireless LAN Module (Wireless Mode)
+	0258  IFU-WLM2 USB Wireless LAN Module (Memory Mode)
+	0259  IC RECORDER
+	0267  Tachikoma Device
+	0268  Batoh Device / PlayStation 3 Controller
+	0269  HDD WALKMAN
+	026a  HDD WALKMAN
+	0271  IC Recorder (P)
+	027c  NETWORK WALKMAN
+	027e  SONY Communicator
+	027f  IC RECORDER
+	0286  Net MD
+	0287  Hi-MD WALKMAN
+	0290  VGP-UVC100 Visual Communication Camera
+	029b  PRS-500 eBook reader
+	02a5  MicroVault Flash Drive
+	02af  Handycam DCR-DVD306E
+	02c4  Device
+	02d1  DVD RW
+	02d2  PSP Slim
+	02d4  UP-CX1
+	02d8  SBAC-US10 SxS PRO memory card reader/writer
+	02e1  FeliCa S330 [PaSoRi]
+	02ea  PlayStation 3 Memory Card Adaptor
+	02f9  DSC-H9
+	0317  WALKMAN
+	031a  Walkman NWD-B103F
+	031e  PRS-300/PRS-505 eBook reader
+	0325  NWZ-A818
+	033e  DSC-W120/W290
+	0346  Handycam DCR-SR55E
+	0348  HandyCam HDR-TG3E
+	035b  Walkman NWZ-A828
+	035c  NWZ-A726/A728/A729
+	035f  UP-DR200 Photo Printer
+	0360  M2 Card Reader
+	0382  Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
+	0385  Walkman NWZ-E436F
+	0387  IC Recorder (P)
+	03bc  Webbie HD - MHS-CM1
+	03c3  UP-DR80MD
+	03c4  Stryker SDP1000
+	03c5  UP-DR80
+	03cc  SD Card Reader
+	03d1  DPF-X95
+	03d3  DR-BT100CX
+	03d5  PlayStation Move motion controller
+	03fc  WALKMAN [NWZ-E345]
+	03fd  Walkman NWZ-E443
+	042f  PlayStation Move navigation controller
+	0440  DSC-H55
+	0485  MHS-PM5 HD camcorder
+	04cb  WALKMAN NWZ-E354
+	0541  DSC-HX100V [Cybershot Digital Still Camera]
+	05c4  DualShock 4 [CUH-ZCT1x]
+	0689  Walkman NWZ-B173F
+	06bb  WALKMAN NWZ-F805
+	06c3  RC-S380
+	07c3  ILCE-6000 (aka Alpha-6000) in Mass Storage mode
+	07c4  ILCE-6000 (aka Alpha-6000) in Mass Storage mode
+	082f  Walkman NWZW Series
+	0847  WG-C10 Portable Wireless Server
+	0877  UP-D898/X898 series
+	0884  MDR-ZX770BN [Wireless Noise Canceling Stereo Headset]
+	088c  Portable Headphone Amplifier
+	08b7  ILCE-6000 (aka Alpha-6000) in MTP mode
+	094e  ILCE-6000 (aka Alpha-6000) in PC Remote mode
+	0994  ILCE-6000 (aka Alpha-6000) in charging mode
+	09cc  DualShock 4 [CUH-ZCT2x]
+	0ba0  Dualshock4 Wireless Adaptor
+	0bb5  Headset MDR-1000X
+	0c02  ILCE-7M3 [A7III] in Mass Storage mode
+	0c03  ILCE-7M3 [A7III] in MTP mode
+	0c34  ILCE-7M3 [A7III] in PC Remote mode
+	0c7f  WH-CH700N [Wireless Noise-Canceling Headphones]
+	0cd3  WH-1000XM3 [Wireless Noise-Canceling Headphones]
+	0cda  PlayStation Classic controller
+	0ce0  WF-1000XM3 [Wireless Noise-Canceling Headphones]
+	0d58  WH-1000XM4 [Wireless Noise-Canceling Headphones]
+	1000  Wireless Buzz! Receiver
 054d  Try Corp.
 054e  Proside Corp.
 054f  WYSE Technology Taiwan
 0550  Fuji Xerox Co., Ltd
+	0002  InkJet Color Printer
+	0004  InkJet Color Printer
+	0005  InkJet Color Printer
+	000b  Workcentre 24
+	014e  CM215b Printer
+	0165  DocuPrint M215b
 0551  CompuTrend Systems, Inc.
 0552  Philips Monitors
 0553  STMicroelectronics Imaging Division (VLSI Vision)
-	0002  CPiA WebCam
+	0001  TerraCAM
+	0002  CPiA Webcam
+	0100  STV0672 Camera
+	0140  Video Camera
+	0150  CDE CAM 100
 	0151  Digital Blue QX5 Microscope
-	0202  Aiptek PenCam 1
+	0200  Dual-mode Camera0
+	0201  Dual-mode Camera1
+	0202  STV0680 Camera
+	0674  Multi-mode Camera
+	0679  NMS Video Camera (Webcam)
 	1002  Che-ez! Splash
 0554  Dictaphone Corp.
 0555  ANAM S&T Co., Ltd
@@ -1573,18 +6884,51 @@
 	2006  UC-1284B Printer Port
 	2007  UC-110T 100Mbps Ethernet [pegasus]
 	2008  UC-232A Serial Port [pl2303]
+	2009  UC-210T Ethernet
+	2011  UC-2324 4xSerial Ports [mos7840]
 	2202  CS124U Miniview II KVM Switch
+	2212  Keyboard/Mouse
+	2213  CS682 2-Port USB 2.0 DVI KVM Switch
+	2221  Winbond Hermon
+	2404  4-port switch
+	2419  Virtual mouse/keyboard device
 	2600  IDE Bridge
+	2701  CE700A KVM Extender
 	4000  DSB-650 10Mbps Ethernet [klsi]
 	7000  Hub
+	7820  UC-2322 2xSerial Ports [mos7820]
+	8021  Hub
 0558  Truevision, Inc.
+	1009  GW Instek GDS-1000 Oscilloscope
+	100a  GW Instek GDS-1000A Oscilloscope
+	2009  GW Instek GDS-2000 Oscilloscope
 0559  Cadence Design Systems, Inc.
 055a  Kenwood USA
 055b  KnowledgeTek, Inc.
 055c  Proton Electronic Ind.
 055d  Samsung Electro-Mechanics Co.
+	0001  Keyboard
+	0bb1  Bluetooth Device
+	1030  Optical Wheel Mouse (OMS3CB/OMGB30)
+	1031  Optical Wheel Mouse (OMA3CB/OMGI30)
+	1040  Mouse HID Device
+	1050  E-Mail Optical Wheel Mouse (OMS3CE)
+	1080  Optical Wheel Mouse (OMS3CH)
+	2020  Floppy Disk Drive
+	6780  Keyboard V1
+	6781  Keyboard Mouse
+	8001  E.M. Hub
 	9000  AnyCam [pwc]
 	9001  MPC-C30 AnyCam Premium for Notebooks [pwc]
+	a000  SWL-2100U
+	a010  WLAN Adapter(SWL-2300)
+	a011  Boot Device
+	a012  WLAN Adapter(SWL-2300)
+	a013  WLAN Adapter(SWL-2350)
+	a230  Boot Device
+	b000  11Mbps WLAN Mini Adapter
+	b230  Netopia 802.11b WLAN Adapter
+	b231  LG Wireless LAN 11b Adapter
 055e  CTX Opto-Electronics Corp.
 055f  Mustek Systems, Inc.
 	0001  ScanExpress 1200 CU
@@ -1598,98 +6942,490 @@
 	0218  BearPaw 2400 TA
 	0219  BearPaw 2400 TA Plus
 	021a  BearPaw 2448 TA Plus
+	021b  BearPaw 1200 CU Plus
 	021c  BearPaw 1200 CU Plus
 	021d  BearPaw 2400 CU Plus
 	021e  BearPaw 1200 TA/CS
+	021f  SNAPSCAN e22
 	0400  BearPaw 2400 TA Pro
 	0401  P 3600 A3 Pro
+	0408  BearPaw 2448 CU Pro
+	0409  BearPaw 2448 TA Pro
+	040b  ScanExpress A3 USB 1200 PRO
+	0501  ScanExpress A3 2400 Pro
 	0873  ScanExpress 600 USB
 	1000  BearPaw 4800 TA Pro
-	a350  gSmart 350
+	a350  gSmart 350 Camera
 	a800  MDC 800 Camera
 	b500  MDC 3000 Camera
+	c005  PC CAM 300A
 	c200  gSmart 300
+	c211  Kowa Bs888e Microcamera
 	c220  gSmart mini
-	c360  Mustek DV 4000
-	c420  gSmart mini 2
-	c440  Mustek DV 3000
-	c520  gSmart mini 3
-	c530  Mustek Gsmart LCD 2
-	c631  MDC-4000
-	c650  Mustek MDC5500Z
+	c230  Digicam 330K
+	c232  MDC3500 Camera
+	c360  DV 4000 Camera
+	c420  gSmart mini 2 Camera
+	c430  gSmart LCD 2 Camera
+	c440  DV 3000 Camera
+	c520  gSmart mini 3 Camera
+	c530  gSmart LCD 2 Camera
+	c540  gSmart D30 Camera
+	c630  MDC 4000 Camera
+	c631  MDC 4000 Camera
+	c650  MDC 5500Z Camera
 	d001  WCam 300
+	d003  WCam 300A
+	d004  WCam 300AN
 0560  Interface Corp.
 0561  Oasis Design, Inc.
 0562  Telex Communications, Inc.
 	0001  Enhanced Microphone
+	0002  Telex Microphone
 0563  Immersion Corp.
-0564  Chinon Industries, Inc.
+0564  Kodak Digital Product Center, Japan Ltd. (formerly Chinon Industries Inc.)
 0565  Peracom Networks, Inc.
 	0001  Serial Port [etek]
 	0002  Enet Ethernet [klsi]
 	0003  @Home Networks Ethernet [klsi]
 	0005  Enet2 Ethernet [klsi]
+	0041  Peracom Remote NDIS Ethernet Adapter
 0566  Monterey International Corp.
+	0110  ViewMate Desktop Mouse CC2201
+	1001  ViewMate Desktop Mouse CC2201
+	1002  ViewMate Desktop Mouse CC2201
+	1003  ViewMate Desktop Mouse CC2201
+	1004  ViewMate Desktop Mouse CC2201
+	1005  ViewMate Desktop Mouse CC2201
+	1006  ViewMate Desktop Mouse CC2201
+	1007  ViewMate Desktop Mouse CC2201
+	2800  MIC K/B
+	2801  MIC K/B Mouse
+	2802  Kbd Hub
+	3002  Keyboard
+	3004  Genius KB-29E
+	3013  BakkerElkhuizen Wired Keyboard S-board 840 Design
+	3020  BakkerElkhuizen Wired Keyboard S-board 840 Design USB-Hub
+	3027  Sun-Flex ProTouch
+	3107  Keyboard
+	3132  Optical mouse M-DY4DR / M-DY6DR
+	4006  FID 638 Mouse (Sun Microsystems)
 0567  Xyratex International, Ltd
 0568  Quartz Ingenierie
 0569  SegaSoft
 056a  Wacom Co., Ltd
 	0000  PenPartner
-	0010  Graphire
-	0011  Graphire 2
-	0020  Intuos 4x5
-	0021  Intuos 6x8
-	0022  Intuos 9x12
-	0023  Intuos 12x12
-	0024  Intuos 12x18
+	0001  PenPartner 4x5
+	0002  PenPartner 6x8
+	0003  PTU-600 [Cintiq Partner]
+	0010  ET-0405 [Graphire]
+	0011  ET-0405A [Graphire2 (4x5)]
+	0012  ET-0507A [Graphire2 (5x7)]
+	0013  CTE-430 [Graphire3 (4x5)]
+	0014  CTE-630 [Graphire3 (6x8)]
+	0015  CTE-440 [Graphire4 (4x5)]
+	0016  CTE-640 [Graphire4 (6x8)]
+	0017  CTE-450 [Bamboo Fun (small)]
+	0018  CTE-650 [Bamboo Fun (medium)]
+	0019  CTE-631 [Bamboo One]
+	0020  GD-0405 [Intuos (4x5)]
+	0021  GD-0608 [Intuos (6x8)]
+	0022  GD-0912 [Intuos (9x12)]
+	0023  GD-1212 [Intuos (12x12)]
+	0024  GD-1218 [Intuos (12x18)]
+	0026  PTH-450 [Intuos5 touch (S)]
+	0027  PTH-650 [Intuos5 touch (M)]
+	0028  PTH-850 [Intuos5 touch (L)]
+	0029  PTK-450 [Intuos5 (S)]
+	002a  PTK-650 [Intuos5 (M)]
+	0030  PL400
 	0031  PL500
-	0042  Intuos 2 6x8
-	0043  Intuos 2
+	0032  PL600
+	0033  PL600SX
+	0034  PL550
+	0035  PL800
+	0037  PL700
+	0038  PL510
+	0039  DTU-710
+	003a  DTI-520
+	003b  Integrated Hub
+	003f  DTZ-2100 [Cintiq 21UX]
+	0041  XD-0405-U [Intuos2 (4x5)]
+	0042  XD-0608-U [Intuos2 (6x8)]
+	0043  XD-0912-U [Intuos2 (9x12)]
+	0044  XD-1212-U [Intuos2 (12x12)]
+	0045  XD-1218-U [Intuos2 (12x18)]
+	0047  Intuos2 6x8
+	0057  DTK-2241
+	0059  DTH-2242 tablet
+	005b  DTH-2200 [Cintiq 22HD Touch] tablet
+	005d  DTH-2242 touchscreen
+	005e  DTH-2200 [Cintiq 22HD Touch] touchscreen
+	0060  FT-0405 [Volito, PenPartner, PenStation (4x5)]
+	0061  FT-0203 [Volito, PenPartner, PenStation (2x3)]
+	0062  CTF-420 [Volito2]
+	0063  CTF-220 [BizTablet]
+	0064  CTF-221 [PenPartner2]
+	0065  MTE-450 [Bamboo]
+	0069  CTF-430 [Bamboo One]
+	006a  CTE-460 [Bamboo One Pen (S)]
+	006b  CTE-660 [Bamboo One Pen (M)]
+	0081  CTE-630BT [Graphire Wireless (6x8)]
+	0084  ACK-40401 [Wireless Accessory Kit]
+	0090  TPC90
+	0093  TPC93
+	0097  TPC97
+	009a  TPC9A
+	00a2  STU-300B [LCD signature pad]
+	00b0  PTZ-430 [Intuos3 (4x5)]
+	00b1  PTZ-630 [Intuos3 (6x8)]
+	00b2  PTZ-930 [Intuos3 (9x12)]
+	00b3  PTZ-1230 [Intuos3 (12x12)]
+	00b4  PTZ-1231W [Intuos3 (12x19)]
+	00b5  PTZ-631W [Intuos3 (6x11)]
+	00b7  PTZ-431W [Intuos3 (4x6)]
+	00b8  PTK-440 [Intuos4 (4x6)]
+	00b9  PTK-640 [Intuos4 (6x9)]
+	00ba  PTK-840 [Intuos4 (8x13)]
+	00bb  PTK-1240 [Intuos4 (12x19)]
+	00c0  DTF-521
+	00c4  DTF-720
+	00c5  DTZ-2000W [Cintiq 20WSX]
+	00c6  DTZ-1200W [Cintiq 12WX]
+	00c7  DTU-1931
+	00cc  DTK-2100 [Cintiq 21UX]
+	00ce  DTU-2231
+	00d0  CTT-460 [Bamboo Touch]
+	00d1  CTH-460 [Bamboo Pen & Touch]
+	00d2  CTH-461 [Bamboo Fun/Craft/Comic Pen & Touch (S)]
+	00d3  CTH-661 [Bamboo Fun/Comic Pen & Touch (M)]
+	00d4  CTL-460 [Bamboo Pen (S)]
+	00d5  CTL-660 [Bamboo Pen (M)]
+	00d6  CTH-460 [Bamboo Pen & Touch]
+	00d7  CTH-461 [Bamboo Fun/Craft/Comic Pen & Touch (S)]
+	00d8  CTH-661 [Bamboo Fun/Comic Pen & Touch (M)]
+	00d9  CTT-460 [Bamboo Touch]
+	00da  CTH-461SE [Bamboo Pen & Touch Special Edition (S)]
+	00db  CTH-661SE [Bamboo Pen & Touch Special Edition (M)]
+	00dc  CTT-470 [Bamboo Touch]
+	00dd  CTL-470 [Bamboo Connect]
+	00de  CTH-470 [Bamboo Fun Pen & Touch]
+	00df  CTH-670 [Bamboo Create/Fun]
+	00e2  TPCE2
+	00e3  TPCE3
+	00e5  TPCE5
+	00e6  TPCE6
+	00ec  TPCEC
+	00ed  TPCED
+	00ef  TPCEF
+	00f0  DTU-1631
+	00f4  DTK-2400 [Cintiq 24HD] tablet
+	00f6  DTH-2400 [Cintiq 24HD touch] touchscreen
+	00f8  DTH-2400 [Cintiq 24HD touch] tablet
+	00f9  DTK-2200 [Cintiq 22HD] hub
+	00fa  DTK-2200 [Cintiq 22HD] tablet
+	00fb  DTU-1031
+	0100  TPC100
+	0101  TPC101
+	010d  TPC10D
+	010e  TPC10E
+	010f  TPC10F
+	0116  TPC116
+	012c  TPC12C
+	0221  MDP-123 [Inkling]
+	0300  CTL-471 [Bamboo Splash, One by Wacom (S)]
+	0301  CTL-671 [One by Wacom (M)]
+	0302  CTH-480 [Intuos Pen & Touch (S)]
+	0303  CTH-680 [Intuos Pen & Touch (M)]
+	0304  DTK-1300 [Cintiq 13HD]
+	0307  DTH-A1300 [Cintiq Companion Hybrid] tablet
+	0309  DTH-A1300 [Cintiq Companion Hybrid] touchscreen
+	030e  CTL-480 [Intuos Pen (S)]
+	0314  PTH-451 [Intuos pro (S)]
+	0315  PTH-651 [Intuos pro (M)]
+	0317  PTH-851 [Intuos pro (L)]
+	0318  CTH-301 [Bamboo]
+	0319  CTH-300 [Bamboo Pad wireless]
+	0323  CTL-680 [Intuos Pen (M)]
+	032a  DTK-2700 [Cintiq 27QHD]
+	032b  DTH-2700 [Cintiq 27QHD touch] tablet
+	032c  DTH-2700 [Cintiq 27QHD touch] touchscreen
+	032f  DTU-1031X
+	0331  ACK-411050 [ExpressKey Remote]
+	0333  DTH-1300 [Cintiq 13HD Touch] tablet
+	0335  DTH-1300 [Cintiq 13HD Touch] touchscreen
+	0336  DTU-1141
+	033b  CTL-490 [Intuos Draw (S)]
+	033c  CTH-490 [Intuos Art/Photo/Comic (S)]
+	033d  CTL-690 [Intuos Draw (M)]
+	033e  CTH-690 [Intuos Art (M)]
+	0343  DTK-1651
+	0347  DTH-W1620 [MobileStudio Pro 16] internal hub
+	0348  DTH-W1620 [MobileStudio Pro 16] external hub
+	034a  DTH-W1320 [MobileStudio Pro 13] touchscreen
+	034b  DTH-W1620 [MobileStudio Pro 16] touchscreen
+	034d  DTH-W1320 [MobileStudio Pro 13] tablet
+	034e  DTH-W1620 [MobileStudio Pro 16] tablet
+	034f  DTH-1320 [Cintiq Pro 13] tablet
+	0350  DTH-1620 [Cintiq Pro 16] tablet
+	0351  DTH-2420 [Cintiq Pro 24 PT] tablet
+	0352  DTH-3220 [Cintiq Pro 32] tablet
+	0353  DTH-1320 [Cintiq Pro 13] touchscreen
+	0354  DTH-1620 [Cintiq Pro 16] touchscreen
+	0355  DTH-2420 [Cintiq Pro 24 PT] touchscreen
+	0356  DTH-3220 [Cintiq Pro 32] touchscreen
+	0357  PTH-660 [Intuos Pro (M)]
+	0358  PTH-860 [Intuos Pro (L)]
+	0359  DTU-1141B
+	035a  DTH-1152 tablet
+	0368  DTH-1152 touchscreen
+	0374  CTL-4100 [Intuos (S)]
+	0375  CTL-6100 [Intuos (M)]
+	0376  CTL-4100WL [Intuos BT (S)]
+	0378  CTL-6100WL [Intuos BT (M)]
+	037a  CTL-472 [One by Wacom (S)]
+	037b  CTL-672 [One by Wacom (M)]
+	037c  DTK-2420 [Cintiq Pro 24 P]
+	037d  DTH-2452 tablet
+	037e  DTH-2452 touchscreen
+	0382  DTK-2451 tablet
+	038a  DTH-3220 [Cintiq Pro 32] internal hub
+	038d  DTH-3220 [Cintiq Pro 32] internal hub
+	038e  DTH-3220 [Cintiq Pro 32] external hub
+	038f  DTH-3220 [Cintiq Pro 32] internal hub
+	0390  DTK-1660 [Cintiq 16]
+	0392  PTH-460 [Intuos Pro (S)]
+	0396  DTK-1660E
+	0398  DTH-W1320 [MobileStudio Pro 13] tablet
+	0399  DTH-W1620 [MobileStudio Pro 16] tablet
+	039a  DTH-W1320 [MobileStudio Pro 13] touchscreen
+	039b  DTH-W1620 [MobileStudio Pro 16] touchscreen
+	039c  DTH-W1320 [MobileStudio Pro 16] external hub
+	039d  DTH-W1320 [MobileStudio Pro 16] internal hub
+	03aa  DTH-W1620 [MobileStudio Pro 16] tablet
+	03ac  DTH-W1620 [MobileStudio Pro 16] touchscreen
+	0400  PenPartner 4x5
+	4001  TPC4001
+	4004  TPC4004
+	4850  PenPartner 6x8
+	5000  TPC5000
+	5002  TPC5002
+	5010  TPC5010
 056b  Decicon, Inc.
 056c  eTEK Labs
+	0006  KwikLink Host-Host Connector
 	8007  Kwik232 Serial Port
+	8100  KwikLink Host-Host Connector
 	8101  KwikLink USB-USB Bridge
 056d  EIZO Corp.
 	0000  Hub
 	0001  Monitor
+	0002  HID Monitor Controls
+	0003  Device Bay Controller
+	4001  Monitor
 056e  Elecom Co., Ltd
 	0002  29UO Mouse
+	0057  Micro Grast Pop M-PGDL
+	005c  Micro Grast Pop M-PG2DL
+	005d  Micro Grast Fit M-FGDL
+	005e  Micro Grast Fit M-FG2DL
+	0062  Optical mouse M-D18DR
+	0063  Laser mouse M-SODL
+	0069  Laser mouse M-GE1UL
+	0071  Laser mouse M-GE3DL
+	0072  Laser mouse M-LS6UL
+	0073  Laser mouse M-LS7UL
+	0074  Optical mouse M-FW1UL
+	0075  Laser mouse M-FW2DL
+	0077  Laser mouse M-LY2UL
+	0079  Laser mouse M-D21DL
+	007b  Laser mouse M-D20DR
+	007c  Laser Bluetooth mouse M-BT5BL
+	007e  Option mouse M-M8UR
+	007f  Option mouse M-M9UR
+	0081  Option mouse M-DY6DR
+	0082  Laser mouse M-D22DR
+	0088  Micro Grast2 Bit M-BG3DL
+	0089  Micro Grast2 Pop M-PG3DL
+	008c  M-NE3DL Mouse
+	008d  ORIME M-NE4DR
+	008f  M-BT8BL Bluetooth Mouse
+	0092  Wireless BlueLED Mouse (M-BL2DB)
+	009c  IR Mouse M-IR02DR
+	009d  IR Mouse M-IR03DR
+	009f  BlueLED Mouse M-HS1DB
+	00a1  IR Mouse M-IR05DR
+	00a4  Blue LED Mouse M-BL06DB
+	00a5  M-NV1BR Bluetooth Mouse
+	00a7  Blue LED Mouse M-BL08DB
+	00a8  M-BL09DB Mouse
+	00a9  M-BL10UB Mouse
+	00aa  M-BL11DB Mouse
+	00ac  M-A-BL01UL / M-BL15DB Mouse
+	00b4  Track on Glass Mouse M-TG02DL
+	00b5  Track on Glass Mouse M-TG03UL
+	00b6  Track on Glass Mouse M-TG04DL
+	00b8  M-A-BL01UL or M-ASKL2 Mouse
+	00b9  M-A-BL02DB or M-ASKL Mouse
+	00cb  M-BL21DB Mouse
+	00cd  M-XG1UB Mouse
+	00ce  M-XG1DB Mouse
+	00cf  M-XG1BB Bluetooth Mouse
+	00d0  M-XG2UB Mouse
+	00d1  M-XG2DB Mouse
+	00d2  M-XG2BB Bluetooth Mouse
+	00d3  M-XG3DL Mouse
+	00d4  M-LS11DL Mouse
+	00da  M-XG4UB Mouse
+	00db  M-XG4DB Mouse
+	00dc  M-XG4BB Bluetooth Mouse
+	00dd  M-LS12UL Mouse
+	00de  M-LS13UL Mouse
+	00df  M-BL22DB Mouse
+	00e1  M-WK01DB or M-A-BL04DB
+	00e2  M-A-BL03DB
+	00e3  M-XGx10UB
+	00e4  M-XGx10DB
+	00e5  M-XGx10BB
+	00e6  M-XGx20DL or M-XGx20DB UltimateLaser Mouse
+	00f1  M-XT1DRBK USB EX-G Wireless Optical TrackBall
+	00f2  M-XT1URBK EX-G Optical Trackball
+	00f3  M-BL23DB
+	00f4  M-BT13BL LBT-UAN05C2
+	00f7  M-KN1DB
+	00f8  M-BL22DB Mouse (other version)
+	00f9  M-XT2URBK EX-G Optical TrackBall
+	00fa  M-XT2DRBK EX-G Wireless Optical TrackBall
+	00fb  M-XT3URBK EX-G Optical TrackBall
+	00fc  M-XT3DRBK EX-G Wireless Optical TrackBall
+	00fd  M-XT4DRBK EX-G Wireless Optical TrackBall
+	00fe  M-DT1URBK or M-DT2URBK DEFT Optical TrackBall
+	00ff  M-DT1DRBK or M-DT2DRBK DEFT Wireless Optical Mouse
+	0101  M-BL25UBS
+	0103  M-BT16BBS
+	0104  M-BL26UBC
+	0105  M-BL26DBC
+	0107  M-LS15UL
+	0108  M-LS15DL
+	0109  M-LS16UL Mouse
+	010a  M-LS16DL / M-KN2DLS
+	010b  M-BL21DB Mouse
+	010c  M-HT1URBK HUGE Optical TrackBall
+	010d  M-HT1DRBK HUGE Wireless Optical TrackBall
+	010e  M-KS1DBS / M-FPG3DBS
+	010f  M-FBG3DB
+	0115  M-BT13BL
+	0121  M-ED01DB
+	0122  M-NK01DB
+	0124  Dual connect Mouse M-DC01MB Bluetooth
+	0128  TrackBall Mouse M-XPT1MR Wired
+	0129  TrackBall Mouse M-XPT1MR Wireless
+	0130  TrackBall Mouse M-XPT1MR Bluetooth
+	0131  TrackBall Mouse M-DPT1MR Wired
+	0132  TrackBall Mouse M-DPT1MR Wireless
+	0133  TrackBall Mouse M-DPT1MR Bluetooth
+	0136  M-BT20BB
+	0137  BlueTooth 4.0 Mouse M-BT21BB
+	0138  M-A-BL07DB
+	0140  M-G01UR
+	0141  M-Y9UB
+	0142  M-DY13DB
+	0144  M-FBL01DB
+	1055  TK-DCP03 WIRED
+	1057  TK-DCP03 BT
+	2003  JC-U3613M
+	2004  JC-U3613M
+	200c  LD-USB/TX
+	200f  JC-U4013S Gamepad
+	2012  JC-U4013S Gamepad
 	4002  Laneed 100Mbps Ethernet LD-USB/TX [pegasus]
+	4005  LD-USBL/TX
+	400b  LD-USB/TX
+	4010  LD-USB20
+	5003  UC-SGT
+	5004  UC-SGT
+	6008  Flash Disk
+	abc1  LD-USB/TX
 056f  Korea Data Systems Co., Ltd
 	cd00  CDM-751 CD organizer
 0570  Epson America
 0571  Interex, Inc.
 	0002  echoFX InterView Lite
 0572  Conexant Systems (Rockwell), Inc.
-	0001  Ezcam II WebCam
-	0002  Ezcam II WebCam
-	0040  Wondereye CP-115 WebCam
+	0001  Ezcam II Webcam
+	0002  Ezcam II Webcam
+	0040  Wondereye CP-115 Webcam
+	0041  Webcam Notebook
+	0042  Webcam Notebook
+	0320  DVBSky T330 DVB-T2/C tuner
 	1232  V.90 modem
+	1234  Typhoon Redfun Modem V90 56k
+	1252  HCF V90 Data Fax Voice Modem
+	1253  Zoom V.92 Faxmodem
+	1300  SoftK56 Data Fax Voice CARP
+	1301  Modem Enumerator
+	1328  TrendNet TFM-561 modem
+	1804  HP Dock Audio
+	2000  SoftGate 802.11 Adapter
+	2002  SoftGate 802.11 Adapter
+	262a  tm5600 Video & Audio Grabber Capture
+	680c  DVBSky T680C DVB-T2/C tuner
+	6831  DVBSky S960 DVB-S2 tuner
+	8390  WinFast PalmTop/Novo TV Video
+	8392  WinFast PalmTop/Novo TV Video
+	960c  DVBSky S960C DVB-S2 tuner
+	c686  Geniatech T220A DVB-T2 TV Stick
+	c688  Geniatech T230 DVB-T2 TV Stick
+	cafc  CX861xx ROM Boot Loader
+	cafd  CX82310 ROM Boot Loader
 	cafe  AccessRunner ADSL Modem
-	cb00  E-Tech ADSL Modem v2
-	cb01  GeekADSL Promax Q31 ADSL Modem
+	cb00  ADSL Modem
+	cb01  ADSL Modem
+	cb06  StarModem Network Interface
 0573  Zoran Co. Personal Media Division (Nogatech)
 	0003  USBGear USBG-V1
 	0400  D-Link V100
+	0600  Dazzle USBVision (1006)
+	1300  leadtek USBVision (1006)
 	2000  X10 va10a Wireless Camera
+	2001  Dazzle EmMe (2001)
 	2101  Zoran Co. PMD (Nogatech) AV-grabber Manhattan
 	2d00  Osprey 50
 	2d01  Hauppauge USB-Live Model 600
+	3000  Dazzle MicroCam (NTSC)
+	3001  Dazzle MicroCam (PAL)
+	4000  Nogatech TV! (NTSC)
+	4001  Nogatech TV! (PAL)
+	4002  Nogatech TV! (PAL-I-)
+	4003  Nogatech TV! (MF-)
+	4008  Nogatech TV! (NTSC) (T)
+	4009  Nogatech TV! (PAL) (T)
+	4010  Nogatech TV! (NTSC) (A)
 	4100  USB-TV FM (NTSC)
 	4110  PNY USB-TV (NTSC) FM
+	4400  Nogatech TV! Pro (NTSC)
+	4401  Nogatech TV! Pro (PAL)
 	4450  PixelView PlayTv-USB PRO (PAL) FM
-	4550  ZTV ZT-721 2.4GHz USB A/V Receiver
+	4451  Nogatech TV! Pro (PAL+)
+	4452  Nogatech TV! Pro (PAL-I+)
+	4500  Nogatech TV! Pro (NTSC)
+	4501  Nogatech TV! Pro (PAL)
+	4550  ZTV ZT-721 2.4GHz A/V Receiver
+	4551  Dazzle TV! Pro Audio (P+)
 	4d00  Hauppauge WinTV-USB USA
 	4d01  Hauppauge WinTV-USB
 	4d02  Hauppauge WinTV-USB UK
 	4d03  Hauppauge WinTV-USB France
+	4d04  Hauppauge WinTV (PAL D/K)
 	4d10  Hauppauge WinTV-USB with FM USA radio
 	4d11  Hauppauge WinTV-USB (PAL) with FM radio
 	4d12  Hauppauge WinTV-USB UK with FM Radio
+	4d14  Hauppauge WinTV (PAL D/K FM)
 	4d20  Hauppauge WinTV-USB II (PAL) with FM radio
 	4d21  Hauppauge WinTV-USB II (PAL)
 	4d22  Hauppauge WinTV-USB II (PAL) Model 566
 	4d23  Hauppauge WinTV-USB France 4D23
+	4d24  Hauppauge WinTV Pro (PAL D/K)
 	4d25  Hauppauge WinTV-USB Model 40209 rev B234
 	4d26  Hauppauge WinTV-USB Model 40209 rev B243
 	4d27  Hauppauge WinTV-USB Model 40204 Rev B281
@@ -1697,11 +7433,15 @@
 	4d29  Hauppauge WinTV-USB Model 40205 rev B298
 	4d2a  Hauppague WinTV-USB Model 602 Rev B285
 	4d2b  Hauppague WinTV-USB Model 602 Rev B282
+	4d2c  Hauppauge WinTV Pro (PAL/SECAM)
 	4d30  Hauppauge WinTV-USB FM Model 40211 Rev B123
 	4d31  Hauppauge WinTV-USB III (PAL) with FM radio Model 568
 	4d32  Hauppauge WinTV-USB III (PAL) FM Model 573
+	4d34  Hauppauge WinTV Pro (PAL D/K FM)
 	4d35  Hauppauge WinTV-USB III (PAL) FM Model 597
+	4d36  Hauppauge WinTV Pro (PAL B/G FM)
 	4d37  Hauppauge WinTV-USB Model 40219 rev E189
+	4d38  Hauppauge WinTV Pro (NTSC FM)
 0574  City University of Hong Kong
 0575  Philips Creative Display Solutions
 0576  BAFO/Quality Computer Accessories
@@ -1717,69 +7457,443 @@
 	0020  HEXA Media Drive 6-in-1 Card Reader Writer
 	0030  Memory Card Viewer (TV)
 057c  AVM GmbH
-	2800  ISDN-Connector TA
+	0b00  ISDN-Controller B1 Family
+	0c00  ISDN-Controller FRITZ!Card
+	1000  ISDN-Controller FRITZ!Card v2.0
+	1900  ISDN-Controller FRITZ!Card v2.1
+	2000  ISDN-Connector FRITZ!X
+	2200  BlueFRITZ!
+	2300  Teledat X130 DSL
+	2800  Teledat 2a/b / X120 / NetXXL ISDN Terminal Adapter
+	3200  Teledat X130 DSL
+	3500  FRITZ!Card DSL SL
+	3701  FRITZ!Box SL
+	3702  FRITZ!Box
 	3800  BlueFRITZ! Bluetooth Stick
-	3d00  Fritz!Box
+	3a00  FRITZ!Box Fon
+	3c00  FRITZ!Box WLAN
+	3d00  FRITZ!Box Fon WLAN 7050/7140/7170/IAD3331
+	3e01  FRITZ!Box (Annex A)
+	4001  FRITZ!Box Fon (Annex A)
+	4101  FRITZ!Box WLAN (Annex A)
+	4201  FRITZ!Box Fon WLAN (Annex A)
+	4601  Eumex 5520PC (WinXP/2000)
+	4602  Eumex 400 (WinXP/2000)
+	4701  AVM FRITZ!Box Fon ata
+	5401  Eumex 300 IP
+	5601  AVM Fritz!WLAN [Texas Instruments TNETW1450]
+	6201  AVM Fritz!WLAN v1.1 [Texas Instruments TNETW1450]
+	62ff  AVM Fritz!WLAN USB (in CD-ROM-mode)
+	8401  Fritz!WLAN N [Atheros AR9001U]
+	8402  Fritz!WLAN N 2.4 [Atheros AR9001U]
+	8403  Fritz!WLAN N v2 [Atheros AR9271]
+	84ff  AVM Fritz!WLAN USB N (in CD-ROM-mode)
+	8501  FRITZ WLAN N v2 [RT5572/rt2870.bin]
 057d  Shark Multimedia, Inc.
 057e  Nintendo Co., Ltd
+	0300  USB-EXI Adapter (GCP-2000)
+	0304  RVT-H Reader
+	0305  Broadcom BCM2045A Bluetooth Radio [Nintendo Wii]
+	0306  Wii Remote Controller RVL-003
+	0337  Wii U GameCube Controller Adapter
+	2000  Switch
+	2006  Joy-Con L
+	2007  Joy-Con R
+	2009  Switch Pro Controller
+	200e  Joy-Con Charging Grip
+	3000  SDK Debugger
 057f  QuickShot, Ltd
+	6238  USB StrikePad
 0580  Denron, Inc.
 0581  Racal Data Group
+	0107  Tera Barcode Scanner 2.4 GHz Receiver
+	020c  Tera 2D Barcode Scanner EVHK0012
 0582  Roland Corp.
-	0002  MPU64 Midi Interface
-	0003  Sound Canvas SC-8850
-	0005  Edirol UM-2 MIDI Adapter
-	0009  Edirol UM-1SX MIDI Adapter
+	0000  UA-100(G)
+	0002  UM-4/MPU-64 MIDI Interface
+	0003  SoundCanvas SC-8850
+	0004  U-8
+	0005  UM-2(C/EX)
+	0007  SoundCanvas SC-8820
+	0008  PC-300
+	0009  UM-1(E/S/X)
+	000b  SK-500
+	000c  SC-D70
+	0010  EDIROL UA-5
 	0011  Edirol UA-5 Sound Capture
-	002d  VX-2020 Synthesizer
+	0012  XV-5050
+	0013  XV-5050
+	0014  EDIROL UM-880 MIDI I/F (native)
+	0015  EDIROL UM-880 MIDI I/F (generic)
+	0016  EDIROL SD-90
+	0017  EDIROL SD-90
+	0018  UA-1A
+	001b  MMP-2
+	001c  MMP-2
+	001d  V-SYNTH
+	001e  V-SYNTH
+	0023  EDIROL UM-550
+	0024  EDIROL UM-550
+	0025  EDIROL UA-20
+	0026  EDIROL UA-20
+	0027  EDIROL SD-20
+	0028  EDIROL SD-20
+	0029  EDIROL SD-80
+	002a  EDIROL SD-80
+	002b  EDIROL UA-700
+	002c  EDIROL UA-700
+	002d  XV-2020 Synthesizer
+	002e  XV-2020 Synthesizer
+	002f  VariOS
+	0030  VariOS
+	0033  EDIROL PCR
+	0034  EDIROL PCR
+	0035  M-1000
+	0037  Digital Piano
+	0038  Digital Piano
+	003b  BOSS GS-10
+	003c  BOSS GS-10
+	0040  GI-20
+	0041  GI-20
+	0042  RS-70
+	0043  RS-70
+	0044  EDIROL UA-1000
+	0047  EDIROL UR-80 WAVE
+	0048  EDIROL UR-80 MIDI
+	0049  EDIROL UR-80 WAVE
+	004a  EDIROL UR-80 MIDI
+	004b  EDIROL M-100FX
+	004c  EDIROL PCR-A WAVE
+	004d  EDIROL PCR-A MIDI
+	004e  EDIROL PCR-A WAVE
+	004f  EDIROL PCR-A MIDI
+	0050  EDIROL UA-3FX
+	0052  EDIROL UM-1SX
+	0054  Digital Piano
+	0060  EXR Series
+	0064  EDIROL PCR-1 WAVE
+	0065  EDIROL PCR-1 MIDI
+	0066  EDIROL PCR-1 WAVE
+	0067  EDIROL PCR-1 MIDI
+	006a  SP-606
+	006b  SP-606
+	006d  FANTOM-X
+	006e  FANTOM-X
+	0073  EDIROL UA-25
+	0074  EDIROL UA-25
+	0075  BOSS DR-880
+	0076  BOSS DR-880
+	007a  RD
+	007b  RD
+	007d  EDIROL UA-101
+	0080  G-70
+	0081  G-70
+	0084  V-SYNTH XT
+	0089  BOSS GT-PRO
+	008b  EDIROL PC-50
+	008c  EDIROL PC-50
+	008d  EDIROL UA-101 USB1
+	0092  EDIROL PC-80 WAVE
+	0093  EDIROL PC-80 MIDI
+	0096  EDIROL UA-1EX
+	009a  EDIROL UM-3EX
+	009d  EDIROL UM-1
+	00a0  MD-P1
+	00a2  Digital Piano
+	00a3  EDIROL UA-4FX
+	00a6  Juno-G
+	00a9  MC-808
+	00ad  SH-201
+	00b2  VG-99
+	00b3  VG-99
+	00b7  BK-7m/VIMA JM-5/8
+	00c2  SonicCell
+	00c4  EDIROL M-16DX
+	00c5  SP-555
+	00c7  V-Synth GT
+	00d1  Music Atelier
+	00d3  M-380/400
+	00da  BOSS GT-10
+	00db  BOSS GT-10 Guitar Effects Processor
+	00dc  BOSS GT-10B
+	00de  Fantom G
+	00e6  EDIROL UA-25EX (Advanced mode)
+	00e7  EDIROL UA-25EX
+	00e9  UA-1G
+	00eb  VS-100
+	00f6  GW-8/AX-Synth
+	00f8  JUNO Series
+	00fc  VS-700C
+	00fd  VS-700
+	00fe  VS-700 M1
+	00ff  VS-700 M2
+	0100  VS-700
+	0101  VS-700 M2
+	0102  VB-99
+	0104  UM-1G
+	0106  UM-2G
+	0108  UM-3G
+	0109  eBand JS-8
+	010d  A-500S
+	010f  A-PRO
+	0110  A-PRO
+	0111  GAIA SH-01
+	0113  ME-25
+	0114  SD-50
+	0116  WAVE/MP3 RECORDER R-05
+	0117  VS-20
+	0119  OCTAPAD SPD-30
+	011c  Lucina AX-09
+	011e  BR-800
+	0120  OCTA-CAPTURE
+	0121  OCTA-CAPTURE
+	0123  JUNO-Gi
+	0124  M-300
+	0127  GR-55
+	012a  UM-ONE
+	012b  DUO-CAPTURE
+	012f  QUAD-CAPTURE
+	0130  MICRO BR BR-80
+	0132  TRI-CAPTURE
+	0134  V-Mixer
+	0138  Boss RC-300 (Audio mode)
+	0139  Boss RC-300 (Storage mode)
+	013a  JUPITER-80
+	013e  R-26
+	0145  SPD-SX
+	014b  eBand JS-10
+	014d  GT-100
+	0150  TD-15
+	0151  TD-11
+	0154  JUPITER-50
+	0156  A-Series
+	0158  TD-30
+	0159  DUO-CAPTURE EX
+	015b  INTEGRA-7
+	015d  R-88
+	01b5  Boutique Series Synthesizer (Normal mode)
+	01b6  Boutique Series Synthesizer (Storage mode)
+	01df  Rubix22
+	01e0  Rubix24
+	01e1  Rubix44
+	01ef  Go:KEYS MIDI
+	0505  EDIROL UA-101
 0583  Padix Co., Ltd (Rockfire)
+	0001  4 Axis 12 button +POV
+	0002  4 Axis 12 button +POV
 	2030  RM-203 USB Nest [mode 1]
 	2031  RM-203 USB Nest [mode 2]
 	2032  RM-203 USB Nest [mode 3]
 	2033  RM-203 USB Nest [mode 4]
 	2050  PX-205 PSX Bridge
+	205f  PSX/USB converter
+	2060  2-axis 8-button gamepad
+	206f  USB, 2-axis 8-button gamepad
 	3050  QF-305u Gamepad
+	3379  Rockfire X-Force
+	337f  Rockfire USB RacingStar Vibra
+	509f  USB,4-Axis,12-Button with POV
+	5259  Rockfire USB SkyShuttle Vibra
+	525f  USB Vibration Pad
+	5308  USB Wireless VibrationPad
+	5359  Rockfire USB SkyShuttle Pro
+	535f  USB,real VibrationPad
+	5659  Rockfire USB SkyShuttle Vibra
+	565f  USB VibrationPad
+	6009  Revenger
+	600f  USB,GameBoard II
+	6258  USB, 4-axis, 6-button joystick w/view finder
+	6889  Windstorm Pro
 	688f  QF-688uv Windstorm Pro Joystick
 	7070  QF-707u Bazooka Joystick
+	a000  MaxFire G-08XU Gamepad
+	a015  4-Axis,16-Button with POV
+	a019  USB, Vibration ,4-axis, 8-button joystick w/view finder
+	a020  USB,4-Axis,10-Button with POV
+	a021  USB,4-Axis,12-Button with POV
+	a022  USB,4-Axis,14-Button with POV
+	a023  USB,4-Axis,16-Button with POV
+	a024  4axis,12button vibrition audio gamepad
+	a025  4axis,12button vibrition audio gamepad
+	a130  USB Wireless 2.4GHz Gamepad
+	a131  USB Wireless 2.4GHz Joystick
+	a132  USB Wireless 2.4GHz Wheelpad
+	a133  USB Wireless 2.4GHz Wheel&Gamepad
+	a202  ForceFeedbackWheel
+	a209  MetalStrike FF
+	b000  USB,4-Axis,12-Button with POV
+	b001  USB,4-Axis,12-Button with POV
+	b002  Vibration,12-Button USB Wheel
+	b005  USB,12-Button Wheel
+	b008  USB Wireless 2.4GHz Wheel
+	b009  USB,12-Button  Wheel
+	b00a  PSX/USB converter
+	b00b  PSX/USB converter
+	b00c  PSX/USB converter
+	b00d  PSX/USB converter
+	b00e  4-Axis,12-Button with POV
+	b00f  USB,5-Axis,10-Button with POV
+	b010  MetalStrike Pro
+	b012  Wireless MetalStrike
+	b013  USB,Wiress  2.4GHZ Joystick
+	b016  USB,5-Axis,10-Button with POV
+	b018  TW6 Wheel
+	ff60  USB Wireless VibrationPad
 0584  RATOC System, Inc.
+	0008  Fujifilm MemoryCard ReaderWriter
+	0220  U2SCX SCSI Converter
+	0304  U2SCX-LVD (SCSI Converter)
+	b000  REX-USB60
+	b020  REX-USB60F
 0585  FlashPoint Technology, Inc.
+	0001  Digital Camera
+	0002  Digital Camera
+	0003  Digital Camera
+	0004  Digital Camera
+	0005  Digital Camera
+	0006  Digital Camera
+	0007  Digital Camera
+	0008  Digital Camera
+	0009  Digital Camera
+	000a  Digital Camera
+	000b  Digital Camera
+	000c  Digital Camera
+	000d  Digital Camera
+	000e  Digital Camera
+	000f  Digital Camera
 0586  ZyXEL Communications Corp.
-	1000  Omni NET Modem / ISDN TA
+	0025  802.11b/g/n USB Wireless Network Adapter
+	0100  omni.net
+	0102  omni.net II ISDN TA [HFC-S]
+	0110  omni.net Plus
+	1000  omni.net LCD Plus - ISDN TA
+	1500  Omni 56K Plus
+	2011  Scorpion-980N keyboard
+	3304  LAN Modem
+	3309  ADSL Modem Prestige 600 series
+	330a  ADSL Modem Interface
 	330e  USB Broadband ADSL Modem Rev 1.10
-	3401  ZyAIR G-220
+	3400  ZyAIR B-220 IEEE 802.11b Adapter
+	3401  ZyAIR G-220 802.11bg
+	3402  ZyAIR G-220F 802.11bg
+	3403  AG-200 802.11abg Wireless Adapter [Atheros AR5523]
+	3407  G-200 v2 802.11bg
+	3408  G-260 802.11bg
+	3409  AG-225H 802.11bg
+	340a  M-202 802.11bg
+	340c  G-270S 802.11bg Wireless Adapter [Atheros AR5523]
+	340f  G-220 v2 802.11bg
+	3410  ZyAIR G-202 802.11bg
+	3412  802.11bg
+	3413  ZyAIR AG-225H v2 802.11bg
+	3415  G-210H 802.11g Wireless Adapter
+	3416  NWD-210N 802.11b/g/n-draft wireless adapter
+	3417  NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG]
+	3418  NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870]
+	3419  G-220 v3 802.11bg Wireless Adapter [ZyDAS ZD1211B]
+	341a  NWD-270N Wireless N-lite USB Adapter
+	341e  NWD2105 802.11bgn Wireless Adapter [Ralink RT3070]
+	341f  NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU]
+	3425  NWD6505 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U]
+	343e  N220 802.11bgn Wireless Adapter
 0587  America Kotobuki Electronics Industries, Inc.
 0588  Sapien Design
 0589  Victron
 058a  Nohau Corp.
 058b  Infineon Technologies
+	0015  Flash Loader utility
+	001c  Flash Drive
+	0041  Flash Loader utility
 058c  In Focus Systems
+	0007  Flash
+	0008  LP130
+	000a  LP530
+	0010  Projector
+	0011  Projector
+	0012  Projector
+	0013  Projector
+	0014  Projector
+	0015  Projector
+	0016  Projector
+	0017  Projector
+	0018  Projector
+	0019  Projector
+	001a  Projector
+	001b  Projector
+	001c  Projector
+	001d  Projector
+	001e  Projector
+	001f  Projector
+	ffe5  IN34 Projector
+	ffeb  Projector IN76
 058d  Micrel Semiconductor
 058e  Tripath Technology, Inc.
 058f  Alcor Micro Corp.
+	1234  Flash Drive
+	198b  Webcam (Gigatech P-09)
+	2412  SCard R/W CSR-145
 	2802  Monterey Keyboard
 	5492  Hub
 	6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
-	6362  Hi-Speed Internal Multi-Card Reader/Writer
+	6254  USB Hub
+	6331  SD/MMC/MS Card Reader
+	6332  Multi-Function Card Reader
+	6335  SD/MMC Card Reader
+	6360  Multimedia Card Reader
+	6361  Multimedia Card Reader
+	6362  Flash Card Reader/Writer
+	6364  AU6477 Card Reader Controller
+	6366  Multi Flash Reader
+	6377  AU6375 4-LUN card reader
+	6386  Memory Card
+	6387  Flash Drive
+	6390  USB 2.0-IDE bridge
+	6391  IDE Bridge
+	6998  AU6998 Flash Disk Controller
 	9213  MacAlly Kbd Hub
 	9215  AU9814 Hub
 	9254  Hub
+	9310  Mass Storage (UID4/5A & UID7A)
+	9320  Micro Storage Driver for Win98
+	9321  Micro Storage Driver for Win98
 	9330  SD Reader
+	9331  Micro Storage Driver for Win98
+	9340  Delkin eFilm Reader-32
+	9350  Delkin eFilm Reader-32
 	9360  8-in-1 Media Card Reader
-	9380  Flash drive
+	9361  Multimedia Card Reader
+	9368  Multimedia Card Reader
+	9380  Flash Drive
+	9381  Flash Drive
 	9382  Acer/Sweex Flash drive
+	9384  qdi U2Disk T209M
 	9410  Keyboard
 	9472  Keyboard Hub
+	9510  ChunghwaTL USB02 Smartcard Reader
+	9520  Watchdata W 1981
+	9540  AU9540 Smartcard Reader
 	9720  USB-Serial Adapter
+	a014  Asus Integrated Webcam
+	b002  Acer Integrated Webcam
 0590  Omron Corp.
 	0004  Cable Modem
+	000b  MR56SVS
+	0028  HJ-720IT / HEM-7080IT-E / HEM-790IT
+	0051  FT232BM [E58CIFQ1 with FTDI USB2Serial Converter]
 0591  Questra Consulting
 0592  Powerware Corp.
+	0002  UPS (X-Slot)
 0593  Incite
 0594  Princeton Graphic Systems
 0595  Zoran Microelectronics, Ltd
-	1001 Digitrex DSC-1300/DSC-2100 (mass storage mode)
+	1001  Digitrex DSC-1300/DSC-2100 (mass storage mode)
+	2002  DIGITAL STILL CAMERA 6M 4X
+	4343  Digital Camera EX-20 DSC
 0596  MicroTouch Systems, Inc.
 	0001  Touchscreen
+	0002  Touch Screen Controller
+	0500  PCT Multitouch HID Controller
+	0543  DELL XPS touchscreen
 0597  Trisignal Communications
 0598  Niigata Canotec Co., Inc.
 0599  Brilliance Semiconductor, Inc.
@@ -1787,88 +7901,390 @@
 059b  Iomega Corp.
 	0001  Zip 100 (Type 1)
 	000b  Zip 100 (Type 2)
+	0021  Win98 Disk Controller
 	0030  Zip 250 (Ver 1)
 	0031  Zip 100 (Type 3)
 	0032  Zip 250 (Ver 2)
+	0034  Zip 100 Driver
+	0037  Zip 750 MB
 	0040  SCSI Bridge
+	0042  Rev 70 GB
 	0050  Zip CD 650 Writer
 	0053  CDRW55292EXT CD-RW External Drive
+	0056  External CD-RW Drive Enclosure
+	0057  Mass Storage Device
+	005d  Mass Storage Device
+	005f  CDRW64892EXT3-C CD-RW 52x24x52x External Drive
+	0060  PCMCIA PocketZip Dock
+	0061  Varo PocketZip 40 MP3 Player
 	006d  HipZip MP3 Player
+	0070  eGo Portable Hard Drive
+	007c  Ultra Max USB/1394
+	007d  HTC42606 0G9AT00 [Iomega HDD]
+	007e  Mini 256MB/512MB Flash Drive [IOM2D5]
+	00db  FotoShow Zip 250 Driver
+	0150  Mass Storage Device
 	015d  Super DVD Writer
+	0173  Hi-Speed USB-to-IDE Bridge Controller
+	0174  Hi-Speed USB-to-IDE Bridge Controller
+	0176  Hi-Speed USB-to-IDE Bridge Controller
+	0177  Hi-Speed USB-to-IDE Bridge Controller
+	0178  Hi-Speed USB-to-IDE Bridge Controller
+	0179  Hi-Speed USB-to-IDE Bridge Controller
+	017a  HDD
+	017b  HDD/1394A
+	017c  HDD/1394B
+	0251  Optical
+	0252  Optical
+	0275  ST332082 0A
+	0278  LDHD-UPS [Professional Desktop Hard Drive eSATA / USB2.0]
+	027a  LPHD250-U [Portable Hard Drive Silver Series 250 Go]
+	0470  Prestige Portable Hard Drive
+	047a  Select Portable Hard Drive
+	0571  Prestige Portable Hard Drive
+	0579  eGo Portable Hard Drive
 	1052  DVD+RW External Drive
 059c  A-Trend Technology Co., Ltd
 059d  Advanced Input Devices
 059e  Intelligent Instrumentation
 059f  LaCie, Ltd
+	0201  StudioDrive USB2
+	0202  StudioDrive USB2
+	0203  StudioDrive USB2
 	0211  PocketDrive
 	0212  PocketDrive
+	0213  PocketDrive USB2
 	0323  LaCie d2 Drive USB2
-	0641  Mobile Hard drvie
+	0421  Big Disk G465
+	0525  BigDisk Extreme 500
+	0641  Mobile Hard Drive
+	0828  d2 Quadra
+	0829  BigDisk Extreme+
+	1004  Little Disk 20 GB
+	100c  Rugged Triple Interface Mobile Hard Drive
+	1010  Desktop Hard Drive
+	1016  Desktop Hard Drive
+	1018  Desktop Hard Drive
+	1019  Desktop Hard Drive
+	1021  Little Disk
+	1027  iamaKey V2
+	102a  Rikiki Hard Drive
+	103d  D2
+	1049  rikiki Harddrive
+	1052  P'9220 Mobile Drive
+	1053  P'9230 2TB [Porsche Design Desktop Drive 2TB]
+	1061  Rugged USB3-FW
+	1064  Rugged 16 and 32 GB
+	106b  Rugged Mini HDD
+	106d  Porsche Design Mobile Drive
+	106e  Porsche Design Desktop Drive
+	1094  Rugged THB
+	1095  Rugged
 	a601  HardDrive
+	a602  CD R/W
 05a0  Vetronix Corp.
 05a1  USC Corp.
 05a2  Fuji Film Microdevices Co., Ltd
 05a3  ARC International
+	8388  Marvell 88W8388 802.11a/b/g WLAN
+	9230  Camera
+	9320  Camera
+	9331  Camera
+	9332  Camera - 1080p
+	9422  Camera
+	9520  Camera
 05a4  Ortek Technology, Inc.
-	9731  MCK-600W Keyboard
+	1000  WKB-1000S Wireless Ergo Keyboard with Touchpad
+	2000  WKB-2000 Wireless Keyboard with Touchpad
+	9720  Keyboard Mouse
+	9722  Keyboard
+	9731  MCK-600W/MCK-800USB Keyboard
+	9783  Wireless Keypad
+	9837  Targus Number Keypad
+	9862  Targus Number Keypad (Composite Device)
+	9881  IR receiver [VRC-1100 Vista MCE Remote Control]
 05a5  Sampo Technology Corp.
 05a6  Cisco Systems, Inc.
+	0001  CVA124 Cable Voice Adapter (WDM)
+	0002  CVA122 Cable Voice Adapter (WDM)
+	0003  CVA124E Cable Voice Adapter (WDM)
+	0004  CVA122E Cable Voice Adapter (WDM)
+	0008  STA1520 Tuning Adapter
+	0a00  Integrated Management Controller Hub
+	0a01  Virtual Keyboard/Mouse
+	0a02  Virtual Mass Storage
+	0a03  Virtual Ethernet/RNDIS
 05a7  Bose Corp.
+	4000  Bluetooth Headset
+	4001  Bluetooth Headset in DFU mode
+	4002  Bluetooth Headset Series 2
+	4003  Bluetooth Headset Series 2 in DFU mode
+	400d  SoundLink Color II speaker in DFU mode
+	40fe  SoundLink Color II speaker
+	bc50  SoundLink Wireless Mobile speaker
+	bc51  SoundLink Wireless Mobile speaker in DFU mode
 05a8  Spacetec IMC Corp.
 05a9  OmniVision Technologies, Inc.
-	0511  OV511 WebCam
-	0518  OV518 WebCam
-	a511  OV511+ WebCam
+	0511  OV511 Webcam
+	0518  OV518 Webcam
+	0519  OV519 Microphone
+	1550  VEHO Filmscanner
+	2640  OV2640 Webcam
+	2642  Integrated Webcam for Dell XPS 2010
+	2643  Monitor Webcam
+	264b  Monitor Webcam
+	2800  SuperCAM
+	4519  Webcam Classic
+	7670  OV7670 Webcam
+	8065  GAIA Sensor FPGA Demo Board
+	8519  OV519 Webcam
+	a511  OV511+ Webcam
+	a518  D-Link DSB-C310 Webcam
 05aa  Utilux South China, Ltd
 05ab  In-System Design
 	0002  Parallel Port
+	0030  Storage Adapter V2 (TPP)
 	0031  ATA Bridge
 	0060  USB 2.0 ATA Bridge
+	0061  Storage Adapter V3 (TPP-I)
+	0101  Storage Adapter (TPP)
+	0130  Compact Flash and Microdrive Reader (TPP)
 	0200  USS725 ATA Bridge
+	0201  Storage Adapter (TPP)
 	0202  ATA Bridge
+	0300  Portable Hard Drive (TPP)
+	0301  Portable Hard Drive V2
+	0350  Portable Hard Drive (TPP)
+	0351  Portable Hard Drive V2
 	081a  ATA Bridge
 	0cda  ATA Bridge for CD-R/RW
-05ac  Apple Computer, Inc.
-	0201  Apple USB Keyboard [Alps or Logitech, M2452]
-	0202  Apple Keyboard [ALPS]
-	0205  Apple Extended Keyboard [Mitsumi]
-	0206  Apple Extended Keyboard [Mitsumi]
-	020b  Apple Pro Keyboard [Mitsumi, A1048/US layout]
-	020d  Apple Pro Keyboard [Mitsumi, A1048/JIS layout]
-	020e  Apple Internal Keyboard/Trackpad
-	020f  Apple Internal Keyboard/Trackpad
-	0301  Apple USB Mouse [Mitsumi, M4848]
-	0302  Apple Optical Mouse [Fujitsu]
-	0304  Apple Optical USB Mouse [Mitsumi]
-	0306  Apple Optical USB Mouse [Fujitsu]
-	1001  Apple Keyboard Hub [ALPS]
-	1002  Apple Extended Keyboard Hub [Mitsumi]
-	1003  Hub in Apple Pro Keyboard [Mitsumi, A1048]
+	1001  BAYI Printer Class Support
+	5700  Storage Adapter V2 (TPP)
+	5701  USB Storage Adapter V2
+	5901  Smart Board (TPP)
+	5a01  ATI Storage Adapter (TPP)
+	5d01  DataBook Adapter (TPP)
+05ac  Apple, Inc.
+	0201  USB Keyboard [Alps or Logitech, M2452]
+	0202  Keyboard [ALPS]
+	0205  Extended Keyboard [Mitsumi]
+	0206  Extended Keyboard [Mitsumi]
+	020b  Pro Keyboard [Mitsumi, A1048/US layout]
+	020c  Extended Keyboard [Mitsumi]
+	020d  Pro Keyboard [Mitsumi, A1048/JIS layout]
+	020e  Internal Keyboard/Trackpad (ANSI)
+	020f  Internal Keyboard/Trackpad (ISO)
+	0214  Internal Keyboard/Trackpad (ANSI)
+	0215  Internal Keyboard/Trackpad (ISO)
+	0216  Internal Keyboard/Trackpad (JIS)
+	0217  Internal Keyboard/Trackpad (ANSI)
+	0218  Internal Keyboard/Trackpad (ISO)
+	0219  Internal Keyboard/Trackpad (JIS)
+	021a  Internal Keyboard/Trackpad (ANSI)
+	021b  Internal Keyboard/Trackpad (ISO)
+	021c  Internal Keyboard/Trackpad (JIS)
+	021d  Aluminum Mini Keyboard (ANSI)
+	021e  Aluminum Mini Keyboard (ISO)
+	021f  Aluminum Mini Keyboard (JIS)
+	0220  Aluminum Keyboard (ANSI)
+	0221  Aluminum Keyboard (ISO)
+	0222  Aluminum Keyboard (JIS)
+	0223  Internal Keyboard/Trackpad (ANSI)
+	0224  Internal Keyboard/Trackpad (ISO)
+	0225  Internal Keyboard/Trackpad (JIS)
+	0229  Internal Keyboard/Trackpad (ANSI)
+	022a  Internal Keyboard/Trackpad (MacBook Pro) (ISO)
+	022b  Internal Keyboard/Trackpad (MacBook Pro) (JIS)
+	0230  Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI)
+	0231  Internal Keyboard/Trackpad (MacBook Pro 4,1) (ISO)
+	0232  Internal Keyboard/Trackpad (MacBook Pro 4,1) (JIS)
+	0236  Internal Keyboard/Trackpad (ANSI)
+	0237  Internal Keyboard/Trackpad (ISO)
+	0238  Internal Keyboard/Trackpad (JIS)
+	023f  Internal Keyboard/Trackpad (ANSI)
+	0240  Internal Keyboard/Trackpad (ISO)
+	0241  Internal Keyboard/Trackpad (JIS)
+	0242  Internal Keyboard/Trackpad (ANSI)
+	0243  Internal Keyboard/Trackpad (ISO)
+	0244  Internal Keyboard/Trackpad (JIS)
+	0245  Internal Keyboard/Trackpad (ANSI)
+	0246  Internal Keyboard/Trackpad (ISO)
+	0247  Internal Keyboard/Trackpad (JIS)
+	024a  Internal Keyboard/Trackpad (MacBook Air) (ISO)
+	024d  Internal Keyboard/Trackpad (MacBook Air) (ISO)
+	024f  Aluminium Keyboard (ANSI)
+	0250  Aluminium Keyboard (ISO)
+	0252  Internal Keyboard/Trackpad (ANSI)
+	0253  Internal Keyboard/Trackpad (ISO)
+	0254  Internal Keyboard/Trackpad (JIS)
+	0259  Internal Keyboard/Trackpad
+	025a  Internal Keyboard/Trackpad
+	0263  Apple Internal Keyboard / Trackpad (MacBook Retina)
+	0267  Magic Keyboard A1644
+	0269  Magic Mouse 2 (Lightning connector)
+	0273  Internal Keyboard/Trackpad (ISO)
+	0301  USB Mouse [Mitsumi, M4848]
+	0302  Optical Mouse [Fujitsu]
+	0304  Mighty Mouse [Mitsumi, M1152]
+	0306  Optical USB Mouse [Fujitsu]
+	030a  Internal Trackpad
+	030b  Internal Trackpad
+	030d  Magic Mouse
+	030e  MC380Z/A [Magic Trackpad]
+	1000  Bluetooth HCI MacBookPro (HID mode)
+	1001  Keyboard Hub [ALPS]
+	1002  Extended Keyboard Hub [Mitsumi]
+	1003  Hub in Pro Keyboard [Mitsumi, A1048]
+	1006  Hub in Aluminum Keyboard
+	1008  Mini DisplayPort to Dual-Link DVI Adapter
 	1101  Speakers
+	1105  Audio in LED Cinema Display
+	1107  Thunderbolt Display Audio
+	1112  FaceTime HD Camera (Display)
 	1201  3G iPod
+	1202  iPod 2G
+	1203  iPod 4.Gen Grayscale 40G
 	1204  iPod [Photo]
-	120A  iPod Nano
+	1205  iPod Mini 1.Gen/2.Gen
+	1206  iPod '06'
+	1207  iPod '07'
+	1208  iPod '08'
+	1209  iPod Video
+	120a  iPod Nano
+	1223  iPod Classic/Nano 3.Gen (DFU mode)
+	1224  iPod Nano 3.Gen (DFU mode)
+	1225  iPod Nano 4.Gen (DFU mode)
+	1227  Mobile Device (DFU Mode)
+	1231  iPod Nano 5.Gen (DFU mode)
+	1240  iPod Nano 2.Gen (DFU mode)
+	1242  iPod Nano 3.Gen (WTF mode)
+	1243  iPod Nano 4.Gen (WTF mode)
+	1245  iPod Classic 3.Gen (WTF mode)
+	1246  iPod Nano 5.Gen (WTF mode)
+	1255  iPod Nano 4.Gen (DFU mode)
+	1260  iPod Nano 2.Gen
+	1261  iPod Classic
+	1262  iPod Nano 3.Gen
+	1263  iPod Nano 4.Gen
+	1265  iPod Nano 5.Gen
+	1266  iPod Nano 6.Gen
+	1267  iPod Nano 7.Gen
+	1281  Apple Mobile Device [Recovery Mode]
+	1290  iPhone
+	1291  iPod Touch 1.Gen
+	1292  iPhone 3G
+	1293  iPod Touch 2.Gen
+	1294  iPhone 3GS
+	1296  iPod Touch 3.Gen (8GB)
+	1297  iPhone 4
+	1299  iPod Touch 3.Gen
+	129a  iPad
+	129c  iPhone 4(CDMA)
+	129e  iPod Touch 4.Gen
+	129f  iPad 2
+	12a0  iPhone 4S
+	12a2  iPad 2 (3G; 64GB)
+	12a3  iPad 2 (CDMA)
+	12a4  iPad 3 (wifi)
+	12a5  iPad 3 (CDMA)
+	12a6  iPad 3 (3G, 16 GB)
+	12a8  iPhone 5/5C/5S/6/SE
+	12a9  iPad 2
+	12aa  iPod Touch 5.Gen [A1421]
+	12ab  iPad 4/Mini1
 	1300  iPod Shuffle
+	1301  iPod Shuffle 2.Gen
+	1302  iPod Shuffle 3.Gen
+	1303  iPod Shuffle 4.Gen
+	1392  Apple Watch charger
+	1393  AirPods case
+	1395  Smart Battery Case [iPhone 6]
+	1398  Smart Battery Case
+	1401  Modem
+	1402  Ethernet Adapter [A1277]
+	1500  SuperDrive [A1379]
+	8005  OHCI Root Hub Simulation
+	8006  EHCI Root Hub Simulation
+	8007  XHCI Root Hub USB 2.0 Simulation
 	8202  HCF V.90 Data/Fax Modem
 	8203  Bluetooth HCI
-	8204  Bluetooth HCI [Bluetooth 2.0 + EDR, build-in]
-	8240  IR Receiver [build-in]
+	8204  Built-in Bluetooth 2.0+EDR HCI
+	8205  Bluetooth HCI
+	8206  Bluetooth HCI
+	8207  Built-in Bluetooth
+	820a  Bluetooth HID Keyboard
+	820b  Bluetooth HID Mouse
+	820f  Bluetooth HCI
+	8213  Bluetooth Host Controller
+	8215  Built-in Bluetooth 2.0+EDR HCI
+	8216  Bluetooth USB Host Controller
+	8217  Bluetooth USB Host Controller
+	8218  Bluetooth Host Controller
+	821a  Bluetooth Host Controller
+	821f  Built-in Bluetooth 2.0+EDR HCI
+	8233  iBridge
+	8240  Built-in IR Receiver
+	8241  Built-in IR Receiver
+	8242  Built-in IR Receiver
+	8281  Bluetooth Host Controller
+	8286  Bluetooth Host Controller
+	8289  Bluetooth Host Controller
+	828c  Bluetooth Host Controller
+	8290  Bluetooth Host Controller
+	8300  Built-in iSight (no firmware loaded)
+	8403  Internal Memory Card Reader
+	8404  Internal Memory Card Reader
+	8406  Internal Memory Card Reader
 	8501  Built-in iSight [Micron]
+	8502  Built-in iSight
+	8505  Built-in iSight
+	8507  Built-in iSight
+	8508  iSight in LED Cinema Display
+	8509  FaceTime HD Camera
+	850a  FaceTime Camera
+	8510  FaceTime HD Camera (Built-in)
+	8600  iBridge
+	911c  Hub in A1082 [Cinema HD Display 23"]
+	9127  Hub in Thunderbolt Display
+	912f  Hub in 30" Cinema Display
+	9215  Studio Display 15"
+	9217  Studio Display 17"
+	9218  Cinema Display 23"
+	9219  Cinema Display 20"
+	921c  A1082 [Cinema HD Display 23"]
+	921e  Cinema Display 24"
+	9221  30" Cinema Display
+	9226  LED Cinema Display
+	9227  Thunderbolt Display
+	9232  Cinema HD Display 30"
+	ffff  Bluetooth in DFU mode - Driver
 05ad  Y.C. Cable U.S.A., Inc.
 05ae  Synopsys, Inc.
 05af  Jing-Mold Enterprise Co., Ltd
+	0806  HP SK806A Keyboard
+	0809  Wireless Keyboard and Mouse
+	0821  IDE to
+	3062  Cordless Keyboard
+	9167  KB 9151B - 678
+	9267  KB 9251B - 678 Mouse
 05b0  Fountain Technologies, Inc.
 05b1  First International Computer, Inc.
+	1389  Bluetooth Wireless Adapter
 05b4  LG Semicon Co., Ltd
 	4857  M-Any DAH-210
-	6001  Digisette DUO-MP3 AR-100
+	6001  HYUNDAI GDS30C6001 SSFDC / MMC I/F Controller
 05b5  Dialogic Corp.
 05b6  Proxima Corp.
 05b7  Medianix Semiconductor, Inc.
-05b8  Agiler, Inc.
+05b8  SYSGRATION
 	3002  Scroll Mouse
+	3126  APT-905 Wireless presenter
+	3223  ISY Wireless Presenter
 05b9  Philips Research Laboratories
 05ba  DigitalPersona, Inc.
+	0007  Fingerprint Reader
+	0008  Fingerprint Reader
+	000a  Fingerprint Reader
 05bb  Grey Cell Systems
 05bc  3G Green Green Globe Co., Ltd
 	0004  Trackball
@@ -1879,34 +8295,137 @@
 05c1  Kawasaki Microelectronics, Inc.
 05c2  Media Phonics (Suisse) S.A.
 05c5  Digi International, Inc.
+	0002  AccelePort USB 2
+	0004  AccelePort USB 4
+	0008  AccelePort USB 8
 05c6  Qualcomm, Inc.
+	0114  Select RW-200 CDMA Wireless Modem
+	0a02  Jolla Device Developer Mode
+	0a07  Jolla Device MTP
+	0afe  Jolla Device Charging Only
+	1000  Mass Storage Device
 	3100  CDMA Wireless Modem/Phone
 	3196  CDMA Wireless Modem
 	3197  CDMA Wireless Modem/Phone
+	6000  Siemens SG75
+	6503  AnyData APE-540H
+	6613  Onda H600/N501HS ZTE MF330
+	6764  A0001 Phone [OnePlus One]
+	9000  SIMCom SIM5218 modem
+	9001  Gobi Wireless Modem
+	9002  Gobi Wireless Modem
+	9003  Quectel UC20
+	9008  Gobi Wireless Modem (QDL mode)
+	9018  Qualcomm HSUSB Device
+	9025  HSUSB Device
+	9090  Quectel UC15
+	9091  Intex Aqua Fish & Jolla C Diagnostic Mode
+	9092  Nokia 8110 4G
+	90ba  Audio 1.0 device
+	90bb  Snapdragon interface (MIDI + ADB)
+	90dc  Fairphone 2 (Charging & ADB)
+	9201  Gobi Wireless Modem (QDL mode)
+	9202  Gobi Wireless Modem
+	9203  Gobi Wireless Modem
+	9205  Gobi 2000
+	9211  Acer Gobi Wireless Modem (QDL mode)
+	9212  Acer Gobi Wireless Modem
+	9214  Acer Gobi 2000 Wireless Modem (QDL mode)
+	9215  Quectel EC20 LTE modem / Acer Gobi 2000 Wireless Modem
+	9221  Gobi Wireless Modem (QDL mode)
+	9222  Gobi Wireless Modem
+	9224  Sony Gobi 2000 Wireless Modem (QDL mode)
+	9225  Sony Gobi 2000 Wireless Modem
+	9231  Gobi Wireless Modem (QDL mode)
+	9234  Top Global Gobi 2000 Wireless Modem (QDL mode)
+	9235  Top Global Gobi 2000 Wireless Modem
+	9244  Samsung Gobi 2000 Wireless Modem (QDL mode)
+	9245  Samsung Gobi 2000 Wireless Modem
+	9264  Asus Gobi 2000 Wireless Modem (QDL mode)
+	9265  Asus Gobi 2000 Wireless Modem
+	9274  iRex Technologies Gobi 2000 Wireless Modem (QDL mode)
+	9275  iRex Technologies Gobi 2000 Wireless Modem
+	f003  Nokia 8110 4G
 05c7  Qtronix Corp.
+	0113  PC Line Mouse
 	1001  Lynx Mouse
+	2001  Keyboard
 	2011  SCorpius Keyboard
+	6001  Ten-Keypad
 05c8  Cheng Uei Precision Industry Co., Ltd (Foxlink)
+	0103  FO13FF-65 PC-CAM
+	010b  Webcam (UVC)
+	021a  HP Webcam
+	0233  HP Webcam
+	0318  Webcam
+	0361  SunplusIT INC. HP Truevision HD Webcam
+	036e  Webcam
+	0374  HP EliteBook integrated HD Webcam
+	038e  HP Wide Vision HD integrated webcam
+	03a1  XiaoMi Webcam
+	03b1  Webcam
+	03bc  HP Wide Vision HD Integrated Webcam
+	03cb  HP Wide Vision HD Integrated Webcam
+	0403  Webcam
+	041b  HP 2.0MP High Definition Webcam
 05c9  Semtech Corp.
 05ca  Ricoh Co., Ltd
 	0101  RDC-5300 Camera
 	0325  Caplio GX (ptp)
 	032d  Caplio GX 8 (ptp)
 	032f  Caplio R3 (ptp)
+	03a1  IS200e
+	0403  Printing Support
+	0405  Type 101
+	0406  Type 102
+	0437  Aficio SP 3510SF
+	044e  SP C250SF (multifunction device: printer, scanner, fax)
+	1803  V5 camera [R5U870]
+	1810  Pavilion Webcam [R5U870]
+	1812  Pavilion Webcam
+	1814  HD Webcam
+	1815  Dell Laptop Integrated Webcam
+	1820  Integrated Webcam
+	1830  Visual Communication Camera VGP-VCC2 [R5U870]
+	1832  Visual Communication Camera VGP-VCC3 [R5U870]
+	1833  Visual Communication Camera VGP-VCC2 [R5U870]
+	1834  Visual Communication Camera VGP-VCC2 [R5U870]
+	1835  Visual Communication Camera VGP-VCC5 [R5U870]
+	1836  Visual Communication Camera VGP-VCC4 [R5U870]
+	1837  Visual Communication Camera VGP-VCC4 [R5U870]
+	1839  Visual Communication Camera VGP-VCC6 [R5U870]
+	183a  Visual Communication Camera VGP-VCC7 [R5U870]
+	183b  Visual Communication Camera VGP-VCC8 [R5U870]
+	183d  Sony Vaio Integrated Webcam
+	183e  Visual Communication Camera VGP-VCC9 [R5U870]
+	183f  Sony Visual Communication Camera Integrated Webcam
+	1841  Fujitsu F01/ Lifebook U810 [R5U870]
+	1870  Webcam 1000
+	1880  R5U880
+	18b0  Sony Vaio Integrated Webcam
+	18b1  Sony Vaio Integrated Webcam
+	18b3  Sony Vaio Integrated Webcam
+	18b5  Sony Vaio Integrated Webcam
 	2201  RDC-7 Camera
 	2202  Caplio RR30
 	2203  Caplio 300G
 	2204  Caplio G3
 	2205  Caplio RR30 / Medion MD 6126 Camera
+	2206  Konica DG-3Z
+	2207  Caplio Pro G3
 	2208  Caplio G4
+	2209  Caplio 400G wide
+	220a  KONICA MINOLTA DG-4Wide
 	220b  Caplio RX
 	220c  Caplio GX
 	220d  Caplio R1/RZ1
 	220e  Sea & Sea 5000G
 	220f  Rollei dr5 / Rollei dr5 (PTP mode)
+	2211  Caplio R1S
 	2212  Caplio R1v Camera
 	2213  Caplio R2
 	2214  Caplio GX 8
+	2215  DSC 725
 	2216  Caplio R3
 	2222  RDC-i500
 05cb  PowerVision Technologies, Inc.
@@ -1918,12 +8437,14 @@
 	2267  MicroLink 56k (V.250)
 	2280  MicroLink 56k Fun
 	3000  Micolink USB2Ethernet [pegasus]
+	3100  AirLancer USB-11
 	3363  MicroLink ADSL Fun
 05cd  Silicom, Ltd
 05ce  sci-worx GmbH
 05cf  Sung Forn Co., Ltd
 05d0  GE Medical Systems Lunar
 05d1  Brainboxes, Ltd
+	0003  Bluetooth Adapter BL-554
 05d2  Wave Systems Corp.
 05d3  Tohoku Ricoh Co., Ltd
 05d5  Super Gate Technology Co., Ltd
@@ -1932,69 +8453,318 @@
 	0099  10Mbps Ethernet [klsi]
 05d8  Ultima Electronics Corp.
 	4001  Artec Ultima 2000
-	4002  Artec Ultima 2000 (GT6801 based)/Lifetec LT9385 Scanner
+	4002  Artec Ultima 2000 (GT6801 based)/Lifetec LT9385/ScanMagic 1200 UB Plus Scanner
 	4003  Artec E+ 48U
 	4004  Artec E+ Pro
+	4005  MEM48U
+	4006  TRUST EASY WEBSCAN 19200
+	4007  TRUST 240H EASY WEBSCAN GOLD
 	4008  Trust Easy Webscan 19200
 	4009  Umax Astraslim
+	4013  IT Scan 1200
 	8105  Artec T1 USB TVBOX (cold)
 	8106  Artec T1 USB TVBOX (warm)
 	8107  Artec T1 USB TVBOX with AN2235 (cold)
 	8108  Artec T1 USB TVBOX with AN2235 (warm)
 	8109  Artec T1 USB2.0 TVBOX (cold
 05d9  Axiohm Transaction Solutions
+	a225  A225 Printer
+	a758  A758 Printer
+	a794  A794 Printer
 05da  Microtek International, Inc.
+	0091  ScanMaker X6u
 	0093  ScanMaker V6USL
 	0094  Phantom 336CX/C3
 	0099  ScanMaker X6/X6U
 	009a  Phantom C6
 	00a0  Phantom 336CX/C3 (#2)
+	00a3  ScanMaker V6USL
+	00ac  ScanMaker V6UL
 	00b6  ScanMaker V6UPL
+	00ef  ScanMaker V6UPL
 	1006  Jenoptik JD350 entrance
 	1011  NHJ Che-ez! Kiss Digital Camera
 	1018  Digital Dream Enigma 1.3
 	1020  Digital Dream l'espion xtra
+	1025  Take-it Still Camera Device
+	1026  Take-it
+	1043  Take-It 1300 DSC Bulk Driver
 	1045  Take-it D1
+	1047  Take-it Camera Composite Device
+	1048  Take-it Q3
+	1049  3M Still Camera Device
+	1051  Camcorder Series
+	1052  Mass Storage Device
+	1053  Take-it DV Composite Device
+	1054  Mass Storage Device
+	1055  Digital Camera Series(536)
+	1056  Mass Storage Device
+	1057  Take-it DSC Camera Device(536)
+	1058  Mass Storage Device
+	1059  Camcorder DSC Series
+	1060  Microtek Take-it MV500
+	2007  ArtixScan DI 1210
+	200c  1394_USB2 Scanner
+	200e  ArtixScan DI 810
+	2017  UF ICE Scanner
+	201c  4800 Scanner
+	201d  ArtixScan DI 1610
+	201f  4800 Scanner-ICE
+	202e  ArtixScan DI 2020
+	208b  ScanMaker 6800
+	208f  ArtixScan DI 2010
+	209e  ScanMaker 4700LP
+	20a7  ScanMaker 5600
+	20b0  ScanMaker X12USL
+	20b1  ScanMaker 8700
+	20b4  ScanMaker 4700
+	20bd  ScanMaker 5700
+	20c9  ScanMaker 6700
+	20d2  Microtek ArtixScan 1800f
+	20d6  PS4000
+	20de  ScanMaker 9800XL
+	20e0  ScanMaker 9700XL
+	20ed  ScanMaker 4700
+	20ee  Micortek ScanMaker X12USL
+	2838  RT2832U
+	3008  Scanner
+	300a  4800 ICE Scanner
+	300b  4800 Scanner
+	300f  MiniScan C5
+	3020  4800dpi Scanner
+	3021  1200dpi Scanner
+	3022  Scanner 4800dpi
+	3023  USB1200II Scanner
+	3025  ScanMaker S460
+	30c1  USB600 Scanner
 	30ce  ScanMaker 3800
 	30cf  ScanMaker 4800
+	30d4  USB1200 Scanner
+	30d8  Scanner
+	30d9  USB2400 Scanner
+	30e4  ScanMaker 4100
+	30e5  USB3200 Scanner
 	30e6  ScanMaker i320
+	40b3  ScanMaker 3600
+	40b8  ScanMaker 3700
+	40c7  ScanMaker 4600
 	40ca  ScanMaker 3600
+	40cb  ScanMaker 3700
+	40dd  ScanMaker 3750i
+	40ff  ScanMaker 3600
+	5003  Goya
+	5013  3200 Scanner
+	6072  XT-3500 A4 HD Scanner
 	80a3  ScanMaker V6USL (#2)
 	80ac  ScanMaker V6UL/SpicyU
 05db  Sun Corp. (Suntac?)
+	0003  SUNTAC U-Cable type D2
+	0005  SUNTAC U-Cable type P1
+	0009  SUNTAC Slipper U
+	000a  SUNTAC Ir-Trinity
+	000b  SUNTAC U-Cable type A3
+	0011  SUNTAC U-Cable type A4
 05dc  Lexar Media, Inc.
+	0001  jumpSHOT CompactFlash Reader
+	0002  JumpShot
+	0003  JumpShot
 	0080  Jumpdrive Secure 64MB
+	0081  RBC Compact Flash Drive
+	00a7  JumpDrive Impact
+	0100  JumpDrive PRO
 	0200  JumpDrive 2.0 Pro
 	0300  Jumpdrive Geysr
+	0301  JumpDrive Classic
+	0302  JD Micro
+	0303  JD Micro Pro
+	0304  JD Secure II
+	0310  JumpDrive
+	0311  JumpDrive Classic
+	0312  JD Micro
+	0313  JD Micro Pro
+	0320  JumpDrive
+	0321  JD Micro
+	0322  JD Micro Pro
+	0323  UFC
+	0330  JumpDrive Expression
+	0340  JumpDrive TAD
+	0350  Express Card
+	0400  UFDC
+	0401  UFDC
+	0403  Locked B Device
+	0405  Locked C Device
+	0407  Locked D Device
+	0409  Locked E Device
+	040b  Locked F Device
+	040d  Locked G Device
+	040f  Locked H Device
+	0410  JumpDrive
+	0411  JumpDrive
+	0413  Locked J Device
+	0415  Locked K Device
+	0417  Locked L Device
+	0419  Locked M Device
+	041b  Locked N Device
+	041d  Locked O Device
+	041f  Locked P Device
+	0420  JumpDrive
+	0421  JumpDrive
+	0423  Locked R Device
+	0425  Locked S Device
+	0427  Locked T Device
+	0429  Locked U Device
+	042b  Locked V Device
+	042d  Locked W Device
+	042f  Locked X Device
+	0431  Locked Y Device
+	0433  Locked Z Device
+	4d02  MP3 Player
+	4d12  MP3 Player
+	4d30  MP3 Player
+	a201  JumpDrive S70 4GB
+	a209  JumpDrive S70
+	a300  JumpDrive2
+	a400  JumpDrive trade; Pro 40-501
 	a410  JumpDrive 128MB/256MB
+	a411  JumpDrive Traveler
+	a420  JumpDrive Pro
+	a421  JumpDrive Pro II
+	a422  JumpDrive Micro Pro
+	a430  JumpDrive Secure
+	a431  JumpDrive Secure II
+	a432  JumpDrive Classic
+	a440  JumpDrive Lightning
+	a450  JumpDrive TouchGuard
+	a460  JD Mercury
+	a501  JumpDrive Classic
+	a510  JumpDrive Sport
+	a530  JumpDrive Expression
+	a531  JumpDrive Secure II
+	a560  JumpDrive FireFly
+	a701  JumpDrive FireFly
+	a731  JumpDrive FireFly
+	a762  JumpDrive FireFly
+	a768  JumpDrive Retrax
+	a790  JumpDrive 2GB
+	a811  16GB Gizmo!
+	a813  16gB flash thumb drive
+	a815  JumpDrive V10
+	a81d  LJDTT16G [JumpDrive 16GB]
+	a833  JumpDrive S23 64GB
+	a838  JumpDrive Tough
+	b002  USB CF Reader
 	b018  Multi-Card Reader
+	b047  SDHC Reader [RW047-7000]
+	b051  microSD RDR UHS-I Card Reader [LRWM03U-7000]
+	ba02  Workflow CFR1
+	ba0a  Workflow DD512
+	c753  JumpDrive TwistTurn
+	c75c  JumpDrive V10
 05dd  Delta Electronics, Inc.
+	a011  HID UPS Battery
+	ff31  AWU-120
+	ff32  FriendlyNET AeroLAN AL2011
+	ff35  PCW 100 - Wireless 802.11b Adapter
+	ff91  2Wire PC Port Phoneline 10Mbps Adapter
 05df  Silicon Vision, Inc.
 05e0  Symbol Technologies
+	0700  Bar Code Scanner (CS1504)
+	0800  Spectrum24 Wireless LAN Adapter
+	1200  Bar Code Scanner
+	1701  Bar Code Scanner (CDC)
+	1900  SNAPI Imaging Device
+	2000  MC3090 Rugged Mobile Computer
+	200d  MC70 Rugged Mobile Computer
 05e1  Syntek Semiconductor Co., Ltd
+	0100  802.11g + Bluetooth Wireless Adapter
+	0408  STK1160 Video Capture Device
+	0500  DC-112X Webcam
+	0501  DC-1125 Webcam
+	0890  STK011 Camera
+	0892  STK013 Camera
+	0895  STK016 Camera
+	0896  STK017 Camera
+	2010  ARCTIC Sound P261 Headphones
 05e2  ElecVision, Inc.
 05e3  Genesys Logic, Inc.
 	000a  Keyboard with PS/2 Port
 	000b  Mouse
 	0100  Nintendo Game Boy Advance SP
 	0120  Pacific Image Electronics PrimeFilm 1800u slide/negative scanner
+	0131  CF/SM Reader/Writer
+	0142  Multiple Slides Scanner-3600
+	0143  Multiple Frames Film Scanner-36series
+	0145  Reflecta CrystalScan 7200 Photo-Scanner
+	0180  Plustek Scanner
+	0182  Wize Media 1000
+	0189  ScanJet 4600 series
+	018a  Xerox 6400
 	0300  GLUSB98PT Parallel Port
+	0301  USB2LPT Cable Release2
 	0406  Hub
-	0502  GL620USB GeneLink USB-USB Bridge
+	0501  GL620USB Host-Host interface
+	0502  GL620USB-A GeneLink USB-USB Bridge
+	0503  Webcam
+	0504  HID Keyboard Filter
+	0510  Camera
 	0604  USB 1.1 Hub
-	0605  USB 2.0 Hub [ednet]
-	0606  D-Link DUB-H4 USB 2.0 Hub
+	0605  Hub
+	0606  USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub
+	0607  Logitech G110 Hub
+	0608  Hub
+	0610  Hub
+	0612  Hub
+	0616  hub
 	0660  USB 2.0 Hub
 	0700  SIIG US2256 CompactFlash Card Reader
 	0701  USB 2.0 IDE Adapter
-	0702  USB 2.0 IDE Adapter
+	0702  USB 2.0 IDE Adapter [GL811E]
 	0703  Card Reader
-	070e  X-PRO CR20xA USB 2.0 Internal Card Reader
+	0704  Card Reader
+	0705  Card Reader
+	0706  Card Reader
+	0707  Card Reader
+	0708  Card Reader
+	0709  Card Reader
+	070a  Pen Flash
+	070b  DMHS1B Rev 3 DFU Adapter
+	070e  USB 2.0 Card Reader
+	070f  Pen Flash
 	0710  USB 2.0 33-in-1 Card Reader
+	0711  Card Reader
+	0712  Delkin Mass Storage Device
 	0715  USB 2.0 microSD Reader
+	0716  Multislot Card Reader/Writer
+	0717  All-in-1 Card Reader
+	0718  IDE/SATA Adapter
+	0719  SATA adapter
+	0722  SD/MMC card reader
+	0723  GL827L SD/MMC/MS Flash Card Reader
+	0726  SD Card Reader
+	0727  microSD Reader/Writer
+	0731  GL3310 SATA 3Gb/s Bridge Controller
+	0732  All-in-One Cardreader
+	0736  Colour arc SD Card Reader [PISEN]
+	0738  Card reader
+	0741  microSD Card Reader
+	0743  SDXC and microSDXC CardReader
+	0745  Logilink CR0012
+	0748  All-in-One Cardreader
+	0749  SD Card Reader and Writer
+	0751  microSD Card Reader
 	0760  USB 2.0 Card Reader/Writer
-	07A0  Pen Flash
-	1205  Afilias Optical Mouse H3003
+	0761  Genesys Mass Storage Device
+	0780  USBFS DFU Adapter
+	07a0  Pen Flash
+	0880  Wasp (SL-6612)
+	0927  Card Reader
+	1205  Afilias Optical Mouse H3003 / Trust Optical USB MultiColour Mouse MI-2330
+	a700  Pen Flash
+	f102  VX7012 TV Box
+	f103  VX7012 TV Box
+	f104  VX7012 TV Box
+	fd21  3M TL20 Temperature Logger
+	fe00  Razer Mouse
 05e4  Red Wing Corp.
 05e5  Fuji Electric Co., Ltd
 05e6  Keithley Instruments
@@ -2002,6 +8772,11 @@
 05e9  Kawasaki LSI
 	0008  KL5KUSB101B Ethernet [klsi]
 	0009  Sony 10Mbps Ethernet [pegasus]
+	000c  USB-to-RS-232
+	000d  USB-to-RS-232
+	0014  RS-232 J104
+	0040  Ethernet Adapter
+	2008  Ethernet Adapter
 05eb  FFC, Ltd
 05ec  COM21, Inc.
 05ee  Cytechinfo Inc.
@@ -2013,9 +8788,12 @@
 	0101  DA-Port DAC
 05f1  Compass Communications
 05f2  Dexin Corp., Ltd
+	0010  AQ Mouse
 05f3  PI Engineering, Inc.
 	0007  Kinesis Advantage PRO MPC/USB Keyboard
 	0081  Kinesis Integrated Hub
+	00ff  VEC Footpedal
+	0203  Y-mouse Keyboard & Mouse Adapter
 	020b  PS2 Adapter
 	0232  X-Keys Switch Interface, Programming Mode
 	0261  X-Keys Switch Interface, SPLAT Mode
@@ -2024,38 +8802,88 @@
 05f6  AOC International
 05f7  RFC Distribution(s) PTE, Ltd
 05f9  PSC Scanning, Inc.
+	1104  Magellan 2200VS
+	1206  Gryphon series (OEM mode)
+	120c  Gryphon GD4430-BK
+	2202  Point of Sale Handheld Scanner
+	2206  Gryphon series (keyboard emulation mode)
+	220c  Datalogic Gryphon GD4430
+	2601  Datalogic Magellan 1000i Barcode Scanner
+	2602  Datalogic Magellan 1100i Barcode Scanner
+	4204  Gryphon series (RS-232 emulation mode)
+	5204  Datalogic Gryphon GFS4170 (config mode)
 05fa  Siemens Telecommunications Systems, Ltd
-05fc  Harman Multimedia
+	3301  Keyboard with PS/2 Mouse Port
+	3302  Keyboard
+	3303  Keyboard with PS/2 Mouse Port
+05fc  Harman
+	0001  Soundcraft Si Multi Digital Card
+	0010  Soundcraft Si MADI combo card
+	0021  Soundcraft Signature 12 MTK
+	7849  Harman/Kardon SoundSticks
 05fd  InterAct, Inc.
+	0239  SV-239 HammerHead Digital
 	0251  Raider Pro
 	0253  ProPad 8 Digital
+	0286  SV-286 Cyclone Digital
+	1007  Mad Catz Controller
+	107a  PowerPad Pro X-Box pad
 	262a  3dfx HammerHead FX
+	262f  HammerHead Fx
 	daae  Game Shark
+	dbae  Datel XBoxMC
 05fe  Chic Technology Corp.
 	0001  Mouse
+	0003  Cypress USB Mouse
 	0005  Viewmaster 4D Browser Mouse
 	0007  Twinhead Mouse
 	0009  Inland Pro 4500/5000 Mouse
 	0011  Browser Mouse
+	0014  Gamepad
+	1010  Optical Wireless
+	2001  Microsoft Wireless Receiver 700
+	3030  Controller
+	3031  Controller
 05ff  LeCroy Corp.
 0600  Barco Display Systems
 0601  Jazz Hipster Corp.
+	0003  Internet Security Co., Ltd. SecureKey
 0602  Vista Imaging, Inc.
-	1001  ViCam WebCam
+	1001  ViCam Webcam
 0603  Novatek Microelectronics Corp.
-	00f1  Keyboard
+	0002  Sino Wealth keyboard/mouse 2.4 GHz receiver
+	00f1  Keyboard (Labtec Ultra Flat Keyboard)
+	00f2  Keyboard (Labtec Ultra Flat Keyboard)
 	6871  Mouse
+	8611  NTK96550 based camera
 0604  Jean Co., Ltd
 0605  Anchor C&C Co., Ltd
 0606  Royal Information Electronics Co., Ltd
 0607  Bridge Information Co., Ltd
 0608  Genrad Ads
 0609  SMK Manufacturing, Inc.
+	031d  eHome Infrared Receiver
+	0322  eHome Infrared Receiver
+	0334  eHome Infrared Receiver
+	ff12  SMK Bluetooth Device
 060a  Worthington Data Solutions, Inc.
 060b  Solid Year
 	0001  MacAlly Keyboard
+	0230  KSK-8003 UX Keyboard
+	0540  DeltaCo TB-106U Keyboard
+	1006  Japanese Keyboard - 260U
 	2101  Keyboard
+	2231  KSK-6001 UELX Keyboard
+	2270  Gigabyte K8100 Aivia Gaming Keyboard
+	500a  Cougar 500k Gaming Keyboard
+	5253  Thermaltake MEKA G-Unit Gaming Keyboard
 	5811  ACK-571U Wireless Keyboard
+	5903  Japanese Keyboard - 595U
+	6001  SolidTek USB 2p HUB
+	6002  SolidTek USB Keyboard
+	6003  Japanese Keyboard - 600HM
+	6231  Thermaltake eSPORTS Meka Keyboard
+	8007  P-W1G1F12 VER:1 [Macally MegaCam]
 	a001  Maxwell Compact Pc PM3
 060c  EEH Datalink GmbH
 060d  Auctor Corp.
@@ -2068,9 +8896,18 @@
 0615  Quabbin Wire & Cable Co., Inc.
 0616  Future Techno Designs PVT, Ltd
 0617  Swiss Federal Insitute of Technology
+	000a  Thymio-II
+	000c  Thymio-II Wireless
 0618  MacAlly
 	0101  Mouse
 0619  Seiko Instruments, Inc.
+	0101  SLP-100 Driver
+	0102  SLP-200 Driver
+	0103  SLP-100N Driver
+	0104  SLP-200N Driver
+	0105  SLP-240 Driver
+	0501  SLP-440 Driver
+	0502  SLP-450 Driver
 061a  Veridicom International, Inc.
 	0110  5thSense Fingerprint Sensor
 	0200  FPS200 Fingerprint Sensor
@@ -2079,19 +8916,49 @@
 061b  Promptus Communications, Inc.
 061c  Act Labs, Ltd
 061d  Quatech, Inc.
+	c020  SSU-100
 061e  Nissei Electric Co.
+	0001  nissei 128DE-USB -
+	0010  nissei 128DE-PNA -
 0620  Alaris, Inc.
+	0004  QuickVideo weeCam
+	0007  QuickVideo weeCam
+	000a  QuickVideo weeCam
+	000b  QuickVideo weeCam
 0621  ODU-Steckverbindungssysteme GmbH & Co. KG
 0622  Iotech, Inc.
 0623  Littelfuse, Inc.
 0624  Avocent Corp.
+	0013  SC Secure KVM
+	0248  Virtual Hub
+	0249  Virtual Keyboard/Mouse
+	0251  Virtual Mass Storage
+	0252  Virtual SD card reader
+	0294  Dell 03R874 KVM dongle
+	0402  Cisco Virtual Keyboard and Mouse
+	0403  Cisco Virtual Mass Storage
+	1774  Cybex SC985
 0625  TiMedia Technology Co., Ltd
 0626  Nippon Systems Development Co., Ltd
 0627  Adomax Technology Co., Ltd
 0628  Tasking Software, Inc.
 0629  Zida Technologies, Ltd
-062a  Creative Labs
+062a  MosArt Semiconductor Corp.
+	0000  Optical mouse
 	0001  Notebook Optical Mouse
+	0020  Logic3 Gamepad
+	0033  Competition Pro Steering Wheel
+	0102  Wireless Keyboard/Mouse Combo [MK1152WC]
+	0201  Defender Office Keyboard (K7310) S Zodiak KM-9010
+	0252  Emerge Uni-retractable Laser Mouse
+	2410  Wireless PS3 gamepad
+	3286  Nano Receiver [Sandstrom Laser Mouse SMWLL11]
+	4101  Wireless Keyboard/Mouse
+	4102  Wireless Mouse
+	4106  Wireless Mouse 2.4G
+	4c01  2,4Ghz Wireless Transceiver [for Delux M618 Plus Wireless Vertical Mouse]
+	6301  Trust Wireless Optical Mouse MI-4150K
+	9003  VoIP Conference Hub (A16GH)
 	9004  USR9602 USB Internet Mini Phone
 062b  Greatlink Electronics Taiwan, Ltd
 062c  Institute for Information Industry
@@ -2101,13 +8968,23 @@
 0631  JUJO Electronics Corp.
 0633  Cyrix Corp.
 0634  Micron Technology, Inc.
+	0655  Embedded Mass Storage Drive [RealSSD]
 0635  Methode Electronics, Inc.
 0636  Sierra Imaging, Inc.
+	0003  Vivicam 35Xx
 0638  Avision, Inc.
 	0268  iVina 1200U Scanner
-	026a  Minolta Dimage Scan Dual II
+	026a  Minolta Dimage Scan Dual II AF-2820U (2886)
 	0a10  iVina FB1600/UMAX Astra 4500
-	4004  Minolta Dimage Scan Elite II
+	0a13  AV600U
+	0a15  Konica Minolta SC-110
+	0a16  Konica Minolta SC-215
+	0a2a  AV220 C2
+	0a30  UMAX Astra 6700 Scanner
+	0a41  Avision AM3000/MF3000 Series
+	0f01  fi-4010CU
+# typo?
+	4004  Minolta Dimage Scan Elite II AF-2920 (2888)
 0639  Chrontel, Inc.
 063a  Techwin Corp.
 063b  Taugagreining HF
@@ -2116,11 +8993,20 @@
 063e  RealMedia Technology, Inc.
 063f  New Technology Cable, Ltd
 0640  Hitex Development Tools
+	0026  LPC-Stick
 0641  Woods Industries, Inc.
 0642  VIA Medical Corp.
 0644  TEAC Corp.
 	0000  Floppy
-	800D  TASCAM Portastudio DP-01FX
+	0200  All-In-One Multi-Card Reader CA200/B/S
+	1000  CD-ROM Drive
+	800d  TASCAM Portastudio DP-01FX
+	800e  TASCAM US-122L
+	801d  TASCAM DR-100
+	8021  TASCAM US-122mkII
+	d001  CD-R/RW Unit
+	d002  CD-R/RW Unit
+	d010  CD-RW/DVD Unit
 0645  Who? Vision Systems, Inc.
 0646  UMAX
 0647  Acton Research Corp.
@@ -2134,23 +9020,65 @@
 	03ec  Inspectrum 256x1024 B VIS Spectrograph
 0648  Inside Out Networks
 0649  Weli Science Co., Ltd
-064b  White Mountain DSP, Inc.
+064b  Analog Devices, Inc. (White Mountain DSP)
+	0165  Blackfin 535 [ADZS HPUSB ICE]
 064c  Ji-Haw Industrial Co., Ltd
 064d  TriTech Microelectronics, Ltd
 064e  Suyin Corp.
+	2100  Sony Visual Communication Camera
+	3410  RGBIR Camera
+	9700  Asus Integrated Webcam
+	a100  Acer OrbiCam
+	a101  Acer CrystalEye Webcam
+	a102  Acer/Lenovo Webcam [CN0316]
+	a103  Acer/HP Integrated Webcam [CN0314]
+	a110  HP Webcam
+	a114  Lemote Webcam
+	a116  UVC 1.3MPixel WebCam
+	a127  HP Integrated Webcam
+	a136  Asus Integrated Webcam [CN031B]
+	a219  1.3M WebCam (notebook emachines E730, Acer sub-brand)
+	c107  HP webcam [dv6-1190en]
+	c335  HP TrueVision HD
+	d101  Acer CrystalEye Webcam
+	d213  UVC HD Webcam
+	d217  HP TrueVision HD
+	e201  Lenovo Integrated Webcam
+	e203  Lenovo Integrated Webcam
+	e258  HP TrueVision HD Integrated Webcam
+	e263  HP TrueVision HD Integrated Webcam
+	f102  Lenovo Integrated Webcam [R5U877]
+	f103  Lenovo Integrated Webcam [R5U877]
+	f207  Lenovo EasyCamera Integrated Webcam
+	f209  HP Webcam
+	f300  UVC 0.3M Webcam
 064f  WIBU-Systems AG
+	03e9  CmStick (MSD, article no. 1001-xx-xxx)
+	03f2  CmStick/M (MSD, article no. 1010-xx-xxx)
+	03f3  CmStick/M (MSD, article no. 1011-xx-xxx)
+	0bd7  Wibu-Box/U (article no. 3031-xx-xxx)
+	0bd8  Wibu-Box/RU (article no. 3032-xx-xxx)
+	2af9  CmStick (HID, article no. 1001-xx-xxx)
+	2b03  CmStick/M (HID, article no. 1011-xx-xxx)
+	5213  CmStick/M (COMPOSITE, article no. 1011-xx-xxx)
 0650  Dynapro Systems
 0651  Likom Technology Sdn. Bhd.
 0652  Stargate Solutions, Inc.
 0653  CNF, Inc.
 0654  Granite Microsystems, Inc.
+	0005  Device Bay Controller
+	0006  Hub
+	0007  Device Bay Controller
+	0016  Hub
 0655  Space Shuttle Hi-Tech Co., Ltd
 0656  Glory Mark Electronic, Ltd
 0657  Tekcon Electronics Corp.
 0658  Sigma Designs, Inc.
+	0200  Aeotec Z-Stick Gen5 (ZW090) - UZB
 0659  Aethra
 065a  Optoelectronics Co., Ltd
-	0001  Barcode scanner
+	0001  Opticon OPR-2001 / NLV-1001 (keyboard mode)
+	0009  NLV-1001 (serial mode) / OPN-2001 [Opticon]
 065b  Tracewell Systems
 065e  Silicon Graphics
 065f  Good Way Technology Co., Ltd & GWC technology Inc.
@@ -2159,6 +9087,17 @@
 0662  Kansai Electric Co., Ltd
 0663  Topmax Electronic Co., Ltd
 	0103  CobraPad
+0664  ET&T Technology Co., Ltd.
+	0301  Groovy Technology Corp. GTouch Touch Screen
+	0302  Groovy Technology Corp. GTouch Touch Screen
+	0303  Groovy Technology Corp. GTouch Touch Screen
+	0304  Groovy Technology Corp. GTouch Touch Screen
+	0305  Groovy Technology Corp. GTouch Touch Screen
+	0306  Groovy Technology Corp. GTouch Touch Screen
+	0307  Groovy Technology Corp. GTouch Touch Screen
+	0309  Groovy Technology Corp. GTouch Touch Screen
+0665  Cypress Semiconductor
+	5161  USB to Serial
 0667  Aiwa Co., Ltd
 	0fa1  TD-U8000 Tape Drive
 0668  WordWand
@@ -2167,69 +9106,247 @@
 066b  Linksys, Inc.
 	0105  SCM eUSB SmartMedia Card Reader
 	010a  Melco MCR-U2 SmartMedia / CompactFlash Reader
+	200c  USB10TX
 	2202  USB10TX Ethernet [pegasus]
 	2203  USB100TX Ethernet [pegasus]
 	2204  USB100TX HomePNA Ethernet [pegasus]
 	2206  USB Ethernet [pegasus]
+	2207  HomeLink Phoneline 10M Network Adapter
 	2211  WUSB11 802.11b Adapter
 	2212  WUSB11v2.5 802.11b Adapter
 	2213  WUSB12v1.1 802.11b Adapter
+	2219  Instant Wireless Network Adapter
+	400b  USB10TX
 066d  Entrega, Inc.
 066e  Acer Semiconductor America, Inc.
 066f  SigmaTel, Inc.
+	003b  MP3 Player
+	003e  MP3 Player
+	003f  MP3 Player
+	0040  MP3 Player
+	0041  MP3 Player
+	0042  MP3 Player
+	0043  MP3 Player
 	004b  A-Max PA11 MP3 Player
 	3400  STMP3400 D-Major MP3 Player
 	3410  STMP3410 D-Major MP3 Player
+	3500  Player Recovery Device
+	3780  STMP3780/i.MX23 SystemOnChip in RecoveryMode
 	4200  STIr4200 IrDA Bridge
 	4210  STIr4210 IrDA Bridge
+	8000  MSCN MP3 Player
+	8001  SigmaTel MSCN Audio Player
 	8004  MSCNMMC MP3 Player
+	8008  i-Bead 100 MP3 Player
+	8020  MP3 Player
+	8034  MP3 Player
+	8036  MP3 Player
+	8038  MP3 Player
+	8056  MP3 Player
+	8060  MP3 Player
+	8066  MP3 Player
+	807e  MP3 Player
+	8092  MP3 Player
+	8096  MP3 Player
+	809a  MP3 Player
+	80aa  MP3 Player
+	80ac  MP3 Player
+	80b8  MP3 Player
+	80ba  MP3 Player
+	80bc  MP3 Player
+	80bf  MP3 Player
+	80c5  MP3 Player
+	80c8  MP3 Player
+	80ca  MP3 Player
+	80cc  MP3 Player
+	8104  MP3 Player
+	8106  MP3 Player
+	8108  MP3 Player
+	810a  MP3 Player
+	810c  MP3 Player
+	8122  MP3 Player
+	8124  MP3 Player
+	8126  MP3 Player
+	8128  MP3 Player
+	8134  MP3 Player
+	8136  MP3 Player
+	8138  MP3 Player
+	813a  MP3 Player
+	813e  MP3 Player
+	8140  MP3 Player
+	8142  MP3 Player
+	8144  MP3 Player
+	8146  MP3 Player
+	8148  MP3 Player
+	814c  MP3 Player
+	8201  MP3 Player
 	8202  Jens of Sweden / I-BEAD 150M/150H MP3 player
+	8203  MP3 Player
+	8204  MP3 Player
+	8205  MP3 Player
 	8206  Digital MP3 Music Player
+	8207  MP3 Player
+	8208  MP3 Player
+	8209  MP3 Player
+	820a  MP3 Player
+	820b  MP3 Player
+	820c  MP3 Player
+	820d  MP3 Player
+	820e  MP3 Player
+	820f  MP3 Player
+	8210  MP3 Player
+	8211  MP3 Player
+	8212  MP3 Player
+	8213  MP3 Player
+	8214  MP3 Player
+	8215  MP3 Player
+	8216  MP3 Player
+	8217  MP3 Player
+	8218  MP3 Player
+	8219  MP3 Player
+	821a  MP3 Player
+	821b  MP3 Player
+	821c  MP3 Player
+	821d  MP3 Player
+	821e  MP3 Player
+	821f  MP3 Player
+	8220  MP3 Player
+	8221  MP3 Player
+	8222  MP3 Player
+	8223  MP3 Player
+	8224  MP3 Player
+	8225  MP3 Player
+	8226  MP3 Player
+	8227  MP3 Player
+	8228  MP3 Player
+	8229  MP3 Player
+	8230  MP3 Player
+	829c  MP3 Player
+	82e0  MP3 Player
+	8320  TrekStor i.Beat fun
+	835d  MP3 Player
+	83b5  Transcend T.sonic 530 MP3 Player
+	9000  MP3 Player
+	9001  MP3 Player
+	9002  MP3 Player
+0670  Sequel Imaging
+	0001  Calibrator
+	0005  Enable Cable
 0672  Labtec, Inc.
 	1041  LCS1040 Speaker System
 	5000  SpaceBall 4000 FLX
 0673  HCL
 	5000  Keyboard
 0674  Key Mouse Electronic Enterprise Co., Ltd
-0675  Draytech
+0675  DrayTek Corp.
 	0110  Vigor 128 ISDN TA
+	0530  Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280)
+	0550  Vigor550
+	1688  miniVigor 128 ISDN TA [HFC-S]
+	6694  miniVigor 128 ISDN TA
 0676  Teles AG
 0677  Aiwa Co., Ltd
+	07d5  TM-ED1285(USB)
 	0fa1  TD-U8000 Tape Drive
 0678  ACard Technology Corp.
 067b  Prolific Technology, Inc.
 	0000  PL2301 USB-USB Bridge
 	0001  PL2302 USB-USB Bridge
-	2303  PL2303 Serial Port
+	0307  Motorola Serial Adapter
+	04bb  PL2303 Serial (IODATA USB-RSAQ2)
+	0600  IDE Bridge
+	0610  Onext EG210U MODEM
+	0611  AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem
+	1231  Orico SATA External Hard Disk Drive Lay-Flat Docking Station with USB 3.0 & eSATA interfaces.
+	2303  PL2303 Serial Port / Mobile Action MA-8910P
 	2305  PL2305 Parallel Port
+	2306  Raylink Bridge Controller
 	2307  PL2307 USB-ATAPI4 Bridge
+	2313  FITEL PHS U Cable Adaptor
 	2315  Flash Disk Embedded Hub
 	2316  Flash Disk Security Device
 	2317  Mass Storage Device
 	2501  PL2501 USB-USB Bridge (USB 2.0)
+	2506  Kaser 8gB micro hard drive
 	2507  PL2507 Hi-speed USB to IDE bridge controller
 	2515  Flash Disk Embedded Hub
 	2517  Flash Disk Mass Storage Device
-	3507  PL3507 ATAPI6 Bridge 
+	2528  Storage device (8gB thumb drive)
+	2571  LG Electronics GE24LU21
+	25a1  PL25A1 Host-Host Bridge
+	2773  PL2773 SATAII bridge controller
+	3400  Hi-Speed Flash Disk with TruePrint AES3400
+	3500  Hi-Speed Flash Disk with TruePrint AES3500
+	3507  PL3507 ATAPI6 Bridge
+	aaa0  Prolific Pharos
+	aaa2  PL2303 Serial Adapter (IODATA USB-RSAQ3)
+	aaa3  PL2303x Serial Adapter
 067c  Efficient Networks, Inc.
 	1001  Siemens SpeedStream 100MBps Ethernet
 	1022  Siemens SpeedStream 1022 802.11b Adapter
+	1023  SpeedStream Wireless
+	4020  SpeedStream 4020 ATM/ADSL Installer
+	4031  Efficient ADSL Modem
+	4032  SpeedStream 4031 ATM/ADSL Installer
+	4033  SpeedStream 4031 ATM/ADSL Installer
 	4060  Alcatel Speedstream 4060 ADSL Modem
+	4062  Efficient Networks 4060 Loader
+	5667  Efficient Networks Virtual Bus for ADSL Modem
+	c031  SpeedStream 4031 ATM/ADSL Installer
+	c032  SpeedStream 4031 ATM/ADSL Installer
+	c033  SpeedStream 4031 ATM/ADSL Installer
+	c060  SpeedStream 4060 Miniport ATM/ADSL Adapter
+	d667  Efficient Networks Virtual Bus for ADSL Modem
+	e240  Speedstream Ethernet Adapter E240
+	e540  Speedstream Ethernet Adapter E240
 067d  Hohner Corp.
-067e  Intermec
+067e  Intermec Technologies Corp.
+	0801  HID Keyboard, Barcode scanner
+	0803  VCP, Barcode scanner
+	0805  VCP + UVC, Barcode scanner
+	1001  Mobile Computer
 067f  Virata, Ltd
+	4552  DSL-200 ADSL Modem
+	6542  DSL Modem
+	6549  DSL Modem
+	7541  DSL Modem
 0680  Realtek Semiconductor Corp., CPP Div. (Avance Logic)
 	0002  Arowana Optical Wheel Mouse MSOP-01
 0681  Siemens Information and Communication Products
+	0001  Dect Base
 	0002  Gigaset 3075 Passive ISDN
 	0005  ID-Mouse with Fingerprint Reader
 	0012  I-Gate 802.11b Adapter
+	001b  WLL013
+	001d  Hipath 1000
+	0022  Gigaset SX353 ISDN
+	0026  DECT Data - Gigaset M34
 	002b  A-100-I ADSL Modem
+	002e  ADSL Router_S-141
+	0034  GSM module MC35/ES75 USB Modem
+	3c06  54g USB Network Adapter
 0682  Victor Company of Japan, Ltd
 0684  Actiontec Electronics, Inc.
+0685  ZD Incorporated
+	7000  HSDPA Modem
 0686  Minolta Co., Ltd
+	2001  PagePro 4110W
+	2004  PagePro 1200W
+	2005  Magicolor 2300 DL
+	3001  PagePro 4100
+	3005  PagePro 1250E
+	3006  PagePro 1250W
+	3009  Magicolor 2300W
+	300b  PagePro 1350W
+	300c  PagePro 1300W
+	301b  Develop D 1650iD
+	3023  Develop D 2050iD
+	302e  Develop D 1650iD PCL
+	3034  Develop D 2050iD PCL
+	4001  Dimage 2300
 	4003  Dimage 2330 Zoom Camera
-	4004  Scan Elite II
+	4004  Dimage Scan Elite II AF-2920 (2888)
+	4005  Minolta DiMAGE E201 Mass Storage Device
 	4006  Dimage 7 Camera
 	4007  Dimage S304 Camera
 	4008  Dimage 5 Camera
@@ -2237,7 +9354,8 @@
 	400a  Dimage S404 Camera
 	400b  Dimage 7i Camera
 	400c  Dimage F100 Camera
-	400d  Scan Dual III
+	400d  Dimage Scan Dual III AF-2840 (2889)
+	400e  Dimage Scan Elite 5400 (2890)
 	400f  Dimage 7Hi Camera
 	4010  Dimage Xi Camera
 	4011  Dimage F300 Camera
@@ -2245,71 +9363,177 @@
 	4014  Dimage S414 Camera
 	4015  Dimage XT Camera [storage]
 	4016  Dimage XT Camera [remote mode]
+	4017  Dimage E223
 	4018  Dimage Z1  Camera
-	401a  Dimage A1 Camera
+	4019  Dimage A1 Camera [remote mode]
+	401a  Dimage A1 Camera [storage]
 	401c  Dimage X20 Camera
 	401e  Dimage E323 Camera
 068a  Pertech, Inc.
 068b  Potrans International, Inc.
 068e  CH Products, Inc.
+	00d3  OEM 3 axis 5 button joystick
 	00e2  HFX OEM Joystick
+	00f0  Multi-Function Panel
+	00f1  Pro Throttle
 	00f2  Flight Sim Pedals
+	00f3  Fighterstick
+	00f4  Combatstick
+	00fa  Ch Throttle Quadrant
 	00ff  Flight Sim Yoke
 	0500  GameStick 3D
 	0501  CH Pro Pedals
 	0504  F-16 Combat Stick
+068f  Nihon KOHDEN
+	c00d  MEK-6500
 0690  Golden Bridge Electech, Inc.
 0693  Hagiwara Sys-Com Co., Ltd
 	0002  FlashGate SmartMedia Card Reader
 	0003  FlashGate CompactFlash Card Reader
 	0005  FlashGate
+	0006  SM PCCard R/W and SPD
+	0007  FlashGate ME (Authenticated)
+	000a  SDCard/MMC Reader/Writer
 0694  Lego Group
 	0001  Mindstorms Tower
+	0002  Mindstorms NXT
+	0005  Mindstorms EV3
+	0006  Mindstorms EV3 Firmware Update
 0698  Chuntex (CTX)
 	1786  1300ex Monitor
+	2003  CTX M730V built in Camera
 	9999  VLxxxx Monitor+Hub
 0699  Tektronix, Inc.
+	0347  AFG 3022B
+	0365  TDS 2004B
+	036a  TDS 2024B
 069a  Askey Computer Corp.
-	0001  VC010 WebCam [pwc]
+	0001  VC010 Webcam [pwc]
 	0303  Cable Modem
+	0311  ADSL Router Remote NDIS Device
+	0318  Remote NDIS Device
+	0319  220V Remote NDIS Device
+	0320  IEEE 802.11b Wireless LAN Card
 	0321  Dynalink WLL013 / Compex WLU11A 802.11b Adapter
+	0402  Scientific Atlanta WebSTAR 100 & 200 series Cable Modem
+	0811  BT Virtual Bus for Helium
 	0821  BT Voyager 1010 802.11b Adapter
+	4402  Scientific Atlanta WebSTAR 2000 series Cable Modem
+	4403  Scientific Atlanta WebSTAR 300 series Cable Modem
+	4501  Scientific-Atlanta WebSTAR 2000 series Cable Modem
 069b  Thomson, Inc.
 	0704  DCM245 Cable Modem
+	0705  THG540K Cable Modem
+	0709  Lyra PDP2424
+	070c  MP3 Player
+	070d  MP3 Player
+	070e  MP3 Player
 	070f  RCA Lyra RD1071 MP3 Player
+	0731  Lyra M200E256
+	0761  RCA H100A
+	0778  PEARL USB Device
 	2220  RCA Kazoo RD1000 MP3 Player
 	300a  RCA Lyra MP3 Player
+	3012  MP3 Player
+	3013  MP3 Player
 	5557  RCA CDS6300
 069d  Hughes Network Systems (HNS)
+	0001  Satellite Receiver Device
 	0002  Satellite Device
-069e  Marx
-	0005  CryptoBox v1.2
+069e  Welcat Inc.
+	0005  Marx CryptoBox v1.2
 069f  Allied Data Technologies BV
 	0010  Tornado Speakerphone FaxModem 56.0
 	0011  Tornado Speakerphone FaxModem 56.0
+	1000  ADT VvBus for CopperJet
+	1004  CopperJet 821 RouterPlus
 06a2  Topro Technology, Inc.
+	0033  USB Mouse
 06a3  Saitek PLC
 	0006  Cyborg Gold Joystick
-	0200  Xbox Adrenalin Hub
+	0109  P880 Pad
+	0160  ST290 Pro
+	0200  Racing Wheel
+	0201  Adrenalin Gamepad
 	0241  Xbox Adrenalin Gamepad
+	0255  X52 Flight Controller
+	040b  P990 Dual Analog Pad
+	040c  P2900 Wireless Pad
 	0422  ST90 Joystick
+	0460  ST290 Pro Flight Stick
+	0463  ST290
+	0464  Cyborg Evo
+	0471  Cyborg Graphite Stick
+	0501  R100 Sports Wheel
+	0502  ST200 Stick
+	0506  R220 Digital Wheel
+	051e  Cyborg Digital II Stick
 	052d  P750 Gamepad
+	053c  X45 Flight Controller
 	053f  X36F Flightstick
+	056c  P2000 Tilt Pad
+	056f  P2000 Tilt Pad
+	05d2  PC Dash 2
+	075c  X52 Flight Controller
+	0762  Saitek X52 Pro Flight Control System
+	0763  Pro Flight Rudder Pedals
+	0764  Flight Pro Combat Rudder
+	0805  R440 Force Wheel
+	0b4e  Pro Flight Backlit Information Panel
+	0bac  Pro Flight Yoke
+	0c2d  Pro Flight Quadrant
+	0d05  Pro Flight Radio Panel
+	0d06  Flight Pro Multi Panel
+	0d67  Pro Flight Switch Panel
+	1003  GM2 Action Pad
+	1009  Action Pad
 	100a  SP550 Pad and Joystick Combo
 	100b  SP550 Pad
+	1509  P3000 Wireless Pad
+	1589  P3000 Wireless Pad
+	2541  X45 Flight Controller
 	3509  P3000 RF GamePad
+	353e  Cyborg Evo Wireless
+	3589  P3000 Wireless Pad
+	35be  Cyborg Evo
+	5509  P3000 Wireless Pad
+	712c  Pro Flight Yoke integrated hub
+	8000  Gamers' Keyboard
+	801e  Cyborg 3D Digital Stick II
+	8020  Eclipse Keyboard
+	8021  Eclipse II Keyboard
+	802d  P750 Pad
+	803f  X36 Flight Controller
+	806f  P2000 Tilt Pad
+	80c0  Pro Gamer Command Unit
+	80c1  Cyborg Command Pad Unit
+	a2ae  Pro Flight Instrument Panel
+	a502  Gaming Mouse
+	f518  P3200 Rumble Force Game Pad
+	f51a  P3600
+	ff04  R440 Force Wheel
 	ff0c  Cyborg Force Rumble Pad
+	ff0d  P2600 Rumble Force Pad
+	ff12  Cyborg 3D Force Stick
+	ff17  ST 330 Rumble Force Stick
+	ff52  Cyborg 3D Rumble Force Joystick
 	ffb5  Cyborg Evo Force Joystick
 06a4  Xiamen Doowell Electron Co., Ltd
 06a5  Divio
 	0000  Typhoon Webcam 100k [nw8000]
-	d001  ProLink DS3303u WebCam
+	d001  ProLink DS3303u Webcam
 	d800  Chicony TwinkleCam
+	d820  Wize Media 1000
 06a7  MicroStore, Inc.
 06a8  Topaz Systems, Inc.
 	0042  SignatureGem 1X5 Pad
 	0043  SignatureGem 1X5-HID Pad
 06a9  Westell
+	0005  WireSpeed Dual Connect Modem
+	0006  WireSpeed Dual Connect Modem
+	000a  WireSpeed Dual Connect Modem
+	000b  WireSpeed Dual Connect Modem
+	000e  A90-211WG-01 802.11g Adapter [Intersil ISL3887]
 06aa  Sysgration, Ltd
 06ac  Fujitsu Laboratories of America, Inc.
 06ad  Greatland Electronics Taiwan, Ltd
@@ -2317,17 +9541,34 @@
 06af  Harting, Inc. of North America
 06b8  Pixela Corp.
 06b9  Alcatel Telecom
+	0120  SpeedTouch 120g 802.11g Wireless Adapter [Intersil ISL3886]
 	0121  SpeedTouch 121g Wireless Dongle
+	2001  SPEED TOUCH Card
 	4061  SpeedTouch ISDN or ADSL Modem
+	4062  SpeedTouch ISDN or ADSL router
 	a5a5  DynaMiTe Modem
 06ba  Smooth Cord & Connector Co., Ltd
 06bb  EDA, Inc.
 06bc  Oki Data Corp.
+	000b  Okipage 14ex Printer
+	0027  Okipage 14e
+	00f7  OKI B4600 Mono Printer
+	015e  OKIPOS 411/412 POS Printer
+	01c9  OKI B430 Mono Printer
+	020b  OKI ES4140 Mono Printer
+	02bb  OKI PT390 POS Printer
+	0383  MC563 Multifunction Printer
+	0a91  B2500MFP (printer+scanner)
+	3801  B6100 Laser Printer
 06bd  AGFA-Gevaert NV
 	0001  SnapScan 1212U
 	0002  SnapScan 1236U
 	0100  SnapScan Touch
+	0101  SNAPSCAN ELITE
+	0200  ScanMaker 8700
+	02bf  DUOSCAN f40
 	0400  CL30
+	0401  Mass Storage
 	0403  ePhoto CL18 Camera
 	0404  ePhoto CL20 Camera
 	2061  SnapScan 1212U (?)
@@ -2340,9 +9581,13 @@
 	20fd  SnapScan e52
 	20ff  SnapScan e42
 06be  AME Optimedia Technology Co., Ltd
+	0800  Optimedia Camera
+	1005  Dazzle DPVM! (1005)
+	d001  P35U Camera Capture
 06bf  Leoco Corp.
 06c2  Phidgets Inc. (formerly GLAB)
 	0030  PhidgetRFID
+	0031  RFID reader
 	0038  4-Motor PhidgetServo v3.0
 	0039  1-Motor PhidgetServo v3.0
 	003a  8-Motor PhidgetAvancedServo
@@ -2368,10 +9613,33 @@
 06c6  Infowave Software, Inc.
 06c8  SIIG, Inc.
 06c9  Taxan (Europe), Ltd
+	0005  Monitor Control
+	0007  Monitor Control
+	0009  Monitor Control
 06ca  Newer Technology, Inc.
+	2003  uSCSI
 06cb  Synaptics, Inc.
+	0001  TouchPad
+	0002  Integrated TouchPad
+	0003  cPad
+	0005  Touchpad/FPS
+	0006  TouchScreen
+	0007  USB Styk
+	0008  WheelPad
 	0009  Composite TouchPad and TrackPoint
+	000e  HID Device
+	0010  Wireless TouchPad
+	0013  DisplayPad
+	009a  Metallica MIS Touch Fingerprint Reader
+	00a2  Metallica MOH Touch Fingerprint Reader
+	00bd  Prometheus MIS Touch Fingerprint Reader
+	2970  touchpad
 06cc  Terayon Communication Systems
+	0101  Cable Modem
+	0102  Cable Modem
+	0103  Cable Modem
+	0104  Cable Modem
+	0304  Cable Modem
 06cd  Keyspan
 	0101  USA-28 PDA [no firmware]
 	0102  USA-28X PDA [no firmware]
@@ -2385,18 +9653,30 @@
 	010a  USA-49W serial adapter
 	010b  USA-19Qi serial adapter [no firmware]
 	010c  USA-19Qi serial adapter
+	010d  USA-19Q serial Adapter (no firmware)
+	010e  USA-19Q serial Adapter
 	010f  USA-28 PDA
 	0110  USA-28Xb PDA
+	0111  USA-18 serial Adapter
 	0112  USA-18X PDA
 	0113  USA-28Xb PDA [no firmware]
 	0114  USA-28Xa PDA [no firmware]
 	0115  USA-28Xa PDA
+	0116  USA-18XA serial Adapter (no firmware)
+	0117  USA-18XA serial Adapter
 	0118  USA-19QW PDA [no firmware]
 	0119  USA-19QW PDA
 	011a  USA-49Wlc serial adapter [no firmware]
-	012a  USA-49Wlc serial adapter
+	011b  MPR Serial Preloader (MPRQI)
+	011c  MPR Serial (MPRQI)
+	011d  MPR Serial Preloader (MPRQ)
+	011e  MPR Serial (MPRQ)
 	0121  USA-19hs serial adapter
-	0201  Digital Media Remote
+	012a  USA-49Wlc serial adapter
+	0201  UIA-10 Digital Media Remote [Cypress AN2131SC]
+	0202  UIA-11 Digital Media Remote
+06ce  Contec
+	8311  COM-1(USB)H
 06cf  SpheronVR AG
 	1010  PanoCam 10
 	1012  PanoCam 12/12X
@@ -2404,46 +9684,208 @@
 	0622  LapLink Gold USB-USB Bridge [net1080]
 06d1  Daewoo Electronics Co., Ltd
 06d3  Mitsubishi Electric Corp.
+	0284  FX-USB-AW/-BD RS482 Converters
+	0380  CP8000D Port
+	0381  CP770D Port
+	0385  CP900D Port
+	0387  CP980D Port
+	038b  CP3020D Port
+	038c  CP900DW(ID) Port
+	0393  CP9500D/DW Port
+	0394  CP9000D/DW Port
+	0398  P93D
+	03a1  CP9550D/DW Port
+	03a5  CP9550DW-S
+	03a9  CP-9600DW
+	03aa  CP3020DA
+	03ad  CP-9800D/DW
+	03ae  CP-9800DW-S
+	0f10  Hori/Namco FlightStick 2
+	3b10  P95D
+	3b21  CP-9810D/DW
+	3b30  CP-D70DW / CP-D707DW
+	3b31  CP-K60DW-S
+	3b36  CP-D80DW
+	3b50  CP-W5000DW
+	3b60  CP-D90DW
+	3b80  CP-M1
 06d4  Cisco Systems
 06d5  Toshiba
 	4000  Japanese Keyboard
 06d6  Aashima Technology B.V.
+	0025  Gamepad
+	0026  Predator TH 400 Gamepad
 	002d  Trust PowerC@m 350FT
 	002e  Trust PowerC@m 350FS
-	003a  Trust PowerC@m 770Z
+	0030  Trust 710 LCD POWERC@M ZOOM - MSD
+	0031  Trust 610/710 LCD POWERC@M ZOOM
+	003a  Trust PowerC@m 770Z (mass storage mode)
+	003b  Trust PowerC@m 770Z (webcam mode)
 	003c  Trust 910z PowerC@m
+	003f  Trust 735S POWERC@M ZOOM, WDM DSC Bulk Driver
+	0050  Trust 738AV LCD PV Digital Camera
+	0062  TRUST 782AV LCD P. V. Video Capture
+	0066  TRUST Digital PCTV and Movie Editor
+	0067  Trust 350FS POWERC@M FLASH
+	006b  TRUST AUDIO VIDEO EDITOR
 06d7  Network Computing Devices (NCD)
 06d8  Technical Marketing Research, Inc.
 06da  Phoenixtec Power Co., Ltd
+	0002  UPS
+	0003  1300VA UPS
 06db  Paradyne
 06dc  Foxlink Image Technology Co., Ltd
+	0012  Scan 1200c Scanner
 	0014  Prolink Winscan Pro 2448U
 06de  Heisei Electronics Co., Ltd
 06e0  Multi-Tech Systems, Inc.
+	0319  MT9234ZBA-USB MultiModem ZBA
 	f101  MT5634ZBA-USB MultiModemUSB (old firmware)
 	f103  MT5634MU MultiMobileUSB
 	f104  MT5634ZBA-USB MultiModemUSB (new firmware)
 	f107  MT5634ZBA-USB-V92 MultiModemUSB
+	f120  MT9234ZBA-USB-CDC-ACM-XR MultiModem ZBA CDC-ACM-XR
 06e1  ADS Technologies, Inc.
 	0008  UBS-10BT Ethernet [klsi]
-	a190  Instand VCD Usb Capture
+	0009  UBS-10BT Ethernet
+	0833  Mass Storage Device
+	a155  FM Radio Receiver/Instant FM Music (RDX-155-EF)
+	a160  Instant Video-To-Go RDX-160 (no firmware)
+	a161  Instant Video-To-Go RDX-160
+	a190  Instand VCD Capture
+	a191  Instant VideoXpress
+	a337  Mini DigitalTV
+	a701  DVD Xpress
+	a708  saa7114H video input card (Instant VideoMPX)
+	b337  Mini DigitalTV
+	b701  DVD Xpress B
 06e4  Alcatel Microelectronics
 06e6  Tiger Jet Network, Inc.
+	0200  Internet Phone
+	0201  Internet Phone
+	0202  Composite Device
+	0203  Internet Phone
+	0210  Composite Device
+	0211  Internet Phone
+	0212  Internet Phone
+	031c  Internet Phone
+	031d  Internet Phone
+	031e  Internet Phone
+	3200  Composite Device
+	3201  Internet Phone
+	3202  Composite Device
+	3203  Composite Device
+	7200  Composite Device
+	7210  Composite Device
+	7250  Composite Device
+	825c  Internet Phone
+	831c  Internet Phone
+	831d  Composite Device
+	831e  Composite Device
+	b200  Composite Device
+	b201  Composite Device
+	b202  Internet Phone
+	b210  Internet Phone
+	b211  Composite Device
+	b212  Composite Device
+	b250  Composite Device
+	b251  Internet Phone
+	b252  Internet Phone
+	c200  Internet Phone
+	c201  Internet Phone
+	c202  Composite Device
+	c203  Internet Phone
+	c210  Personal PhoneGateway
+	c211  Personal PhoneGateway
+	c212  Personal PhoneGateway
+	c213  PPG Device
+	c25c  Composite Device
+	c290  PPG Device
+	c291  PPG Device
+	c292  PPG Device
+	c293  Personal PhoneGateway
+	c31c  Composite Device
+	c39c  Personal PhoneGateway
+	c39d  PPG Device
+	c39e  PPG Device
+	c39f  PPG Device
+	c700  Internet Phone
+	c701  Internet Phone
+	c702  Composite Device
+	c703  Internet Phone
+	c710  VoIP Combo Device
+	c711  VoIP Combo
+	c712  VoIP Combo Device
+	c713  VoIP Combo Device
+	cf00  Composite Device
+	cf01  Internet Phone
+	cf02  Internet Phone
+	cf03  Composite Device
+	d210  Personal PhoneGateway
+	d211  PPG Device
+	d212  PPG Device
+	d213  Personal PhoneGateway
+	d700  Composite Device
+	d701  Composite Device
+	d702  Internet Phone
+	d703  Composite Device
+	d710  VoIP Combo
+	d711  VoIP Combo Device
+	d712  VoIP Combo
+	d713  VoIP Combo
+	df00  Composite Device
+	df01  Composite Device
+	df02  Internet Phone
+	df03  Internet Phone
+	f200  Internet Phone
+	f201  Internet Phone
+	f202  Composite Device
+	f203  Composite Device
+	f210  Internet Phone
+	f250  Composite Device
+	f252  Internet Phone
+	f310  Internet Phone
+	f350  Composite Device
 06ea  Sirius Technologies
 	0001  NetCom Roadster II 56k
 	0002  Roadster II 56k
 06eb  PC Expert Tech. Co., Ltd
 06ef  I.A.C. Geometrische Ingenieurs B.V.
 06f0  T.N.C Industrial Co., Ltd
+	de01  DualCam Video Camera
+	de02  DualCam Still Camera
 06f1  Opcode Systems, Inc.
+	a011  SonicPort
+	a021  SonicPort Optical
 06f2  Emine Technology Co.
+	0011  KVM Switch Keyboard
 06f6  Wintrend Technology Co., Ltd
+06f7  Wailly Technology Ltd
+	0003  USB->Din 4 Adaptor
 06f8  Guillemot Corp.
+	3002  Hercules Blog Webcam
+	3004  Hercules Classic Silver
+	3005  Hercules Dualpix Exchange
+	3007  Hercules Dualpix Chat and Show
+	3020  Hercules Webcam EC300
 	a300  Dual Analog Leader GamePad
+	b000  Hercules DJ Console
+	b121  Hercules P32 DJ
 	c000  Hercules Muse Pocket
+	d002  Hercules DJ Console
+	e000  HWGUSB2-54 WLAN
+	e010  HWGUSB2-54-LB
+	e020  HWGUSB2-54V2-AP
+	e031  Hercules HWNUm-300 Wireless N mini [Realtek RTL8191SU]
+	e032  HWGUm-54 [Hercules Wireless G Ultra Mini Key]
+	e033  Hercules HWNUp-150 802.11n Wireless N Pico [Realtek RTL8188CUS]
+06f9  ASYST electronic d.o.o.
 06fa  HSD S.r.L
 06fc  Motorola Semiconductor Products Sector
 06fd  Boston Acoustics
+	0101  Audio Device
+	0102  Audio Device
+	0201  2-piece Audio Device
 06fe  Gallant Computer, Inc.
 0701  Supercomal Wire & Cable SDN. BHD.
 0703  Bvtech Industry, Inc.
@@ -2452,11 +9894,16 @@
 0707  Standard Microsystems Corp.
 	0100  2202 Ethernet [klsi]
 	0200  2202 Ethernet [pegasus]
-	ee06  EZ-Connect 802.11g Adapter
-	ee13  EZ-Connect 802.11g Adapter
+	0201  EZ Connect USB Ethernet
+	ee04  SMCWUSB32 802.11b Wireless LAN Card
+	ee06  SMC2862W-G v1 EZ Connect 802.11g Adapter [Intersil ISL3886]
+	ee13  SMC2862W-G v2 EZ Connect 802.11g Adapter [Intersil ISL3887]
 0708  Putercom Co., Ltd
+	047e  USB-1284 BRIDGE
 0709  Silicon Systems, Ltd (SSL)
 070a  Oki Electric Industry Co., Ltd
+	4002  Bluetooth Device
+	4003  Bluetooth Device
 070d  Comoss Electronic Co., Ltd
 070e  Excel Cell Electronic Co., Ltd
 0710  Connect Tech, Inc.
@@ -2464,64 +9911,221 @@
 	8001  WhiteHeat
 0711  Magic Control Technology Corp.
 	0100  Hub
+	0180  IRXpress Infrared Device
+	0181  IRXpress Infrared Device
 	0200  BAY-3U1S1P Serial Port
 	0210  MCT1S Serial Port
 	0230  MCT-232 Serial Port
 	0231  PS/2 Mouse Port
+	0232  Serial On Port
 	0240  PS/2 to USB Converter
+	0260  PS/2 Keyboard and Mouse
 	0300  BAY-3U1S1P Parallel Port
 	0302  Parallel Port
 	0900  SVGA Adapter
+	5001  Trigger UV-002BD[Startech USBVGAE]
+	5100  Magic Control Technology Corp. (USB2VGA dongle)
 0713  Interval Research Corp.
 0714  NewMotion, Inc.
-	0003  ADB to USB convertor
+	0003  ADB converter
 0717  ZNK Corp.
 0718  Imation Corp.
+	0002  SuperDisk 120MB
+	0003  SuperDisk 120MB (Authenticated)
+	0060  Flash Drive
+	0061  Flash Drive
+	0062  Flash Drive
+	0063  Swivel Flash Drive
+	0064  Flash Drive
+	0065  Flash Drive
+	0066  Flash Drive
+	0067  Flash Drive
+	0068  Flash Drive
+	0084  Flash Drive Mini
+	043c  Flash drive 16GB [Nano Pro]
+	0582  Revo Flash Drive
+	0622  TDK Trans-It 4GB
+	0624  TDK Trans-It 16GB
+	1120  RDX External dock (redbud)
+	4006  8x Slim DVD Multi-Format Recorder External
+	d000  Disc Stakka CD/DVD Manager
 0719  Tremon Enterprises Co., Ltd
 071b  Domain Technologies, Inc.
 	0002  DTI-56362-USB Digital Interface Unit
 	0101  Audio4-USB DSP Data Acquisition Unit
+	0184  Archos 2 8GB EM184RB
 	0201  Audio4-5410 DSP Data Acquisition Unit
 	0301  SB-USB JTAG Emulator
+	3203  Rockchip Media Player
+	32bb  Music Mediatouch
 071c  Xionics Document Technologies, Inc.
 071d  Eicon Networks Corp.
-	1000  Diva ISDN TA
+	1000  Diva 2.01 S/T [PSB2115F]
+	1003  Diva ISDN 2.0
+	1005  Diva ISDN 4.0 [HFC-S]
+	2000  Teledat Surf
 071e  Ariston Technologies
+0720  Keyence Corp.
+	8001  LJ-V7001
 0723  Centillium Communications Corp.
+	0002  Palladia 300/400 Adsl Modem
 0726  Vanguard International Semiconductor-America
 0729  Amitm
 	1000  USC-1000 Serial Port
 072e  Sunix Co., Ltd
 072f  Advanced Card Systems, Ltd
 	0001  AC1030-based SmartCard Reader
+	0008  ACR 80 Smart Card Reader
+	0100  AET65
+	0101  AET65
+	0102  AET62
+	0103  AET62
+	0901  ACR1281U-C4 (BSI)
+	1000  PLDT Drive
+	1001  PLDT Drive
+	2011  ACR88U
+	2100  ACR128U
+	2200  ACR122U
+	220a  ACR1281U-C5 (BSI)
+	220c  ACR1283 Bootloader
+	220f  ACR1281U-C2 (qPBOC)
+	2211  ACR1261 1S Dual Reader
+	2214  ACR1222 1SAM PICC Reader
+	2215  ACR1281 2S CL Reader
+	221a  ACR1251U-A1
+	221b  ACR1251U-C
+	2224  ACR1281 1S Dual Reader
+	222b  ACR1222U-C8
+	222c  ACR1283L-D2
+	222d  [OEM Reader]
+	222e  ACR123U
+	2242  ACR1251 1S Dual Reader
+	8002  AET63 BioTRUSTKey
+	8003  ACR120
+	8103  ACR120
+	8201  APG8201
+	8900  ACR89U-A1
+	8901  ACR89U-A2
+	8902  ACR89U-A3
 	9000  ACR38 AC1038-based Smart Card Reader
+	9006  CryptoMate
 	90cc  ACR38 SmartCard Reader
+	90ce  [OEM Reader]
+	90cf  ACR38 SAM Smart Card Reader
+	90d0  PertoSmart EMV - Card Reader
+	90d2  ACR83U
+	90d8  ACR3801
+	90db  CryptoMate64
+	b000  ACR3901U
+	b100  ACR39U
+	b101  ACR39K
+	b102  ACR39T
+	b103  ACR39F
+	b104  ACR39U-SAM
+	b106  ACOS5T2
+	b200  ACOS5T1
+	b301  ACR32-A1
 0731  Susteen, Inc.
 	0528  SonyEricsson DCU-11 Cable
 0732  Goldfull Electronics & Telecommunications Corp.
 0733  ViewQuest Technologies, Inc.
-	0110  VQ110
-	1311  Digital Dream Epsilon 1.3
-	2211  Jenoptik
-	0401  CS330 WebCam
-	0402  M-318B WebCam
-	0430  Intel Pro Share WebCam
+	0101  Digital Video Camera
+	0110  VQ110 Video Camera
+	0401  CS330 Webcam
+	0402  M-318B Webcam
+	0430  Intel Pro Share Webcam
+	0630  VQ630 Dual Mode Digital Camera(Bulk)
 	0631  Hercules Dualpix
-	1310  Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470
+	0780  Smart Cam Deluxe(composite)
+	1310  Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 (mass storage mode)
+	1311  Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 (PC Cam mode)
+	1314  Mercury 2.1MEG Deluxe Classic Cam
+	2211  Jenoptik jdc 21 LCD Camera
+	2221  Mercury Digital Pro 3.1p
+	3261  Concord 3045 spca536a Camera
+	3281  Cyberpix S550V
 0734  Lasat Communications A/S
 	0001  560V Modem
+	0002  Lasat 560V Modem
+	043a  DVS Audio
+	043b  3DeMon USB Capture
 0735  Asuscom Network
+	2100  ISDN Adapter
+	2101  ISDN Adapter
+	6694  ISDNlink 128K
 	c541  ISDN TA 280
 0736  Lorom Industrial Co., Ltd
 0738  Mad Catz, Inc.
-073b  Suncom Technologies
+	2215  X-55 Rhino Stick
+	2237  V.1 Stick
+	4506  Wireless Controller
+	4507  XBox Device
+	4516  Control Pad
+	4520  Control Pad Pro
+	4522  LumiCON
+	4526  Control Pad Pro
+	4530  Universal MC2 Racing Wheel and Pedals
+	4536  MicroCON
+	4540  Beat Pad
+	4556  Lynx Wireless Controller
+	4566  XBox Device
+	4576  XBox Device
+	4586  MicroCON Wireless Controller
+	4588  Blaster
+	45ff  Beat Pad
+	4716  Wired Xbox 360 Controller
+	4718  Street Fighter IV FightStick SE for Xbox 360
+	4726  Xbox 360 Controller
+	4728  Street Fighter IV FightPad for Xbox 360
+	4730  MC2 Racing Wheel for Xbox 360
+	4736  MicroCON for Xbox 360
+	4738  Street Fighter IV Wired Controller for Xbox 360
+	4740  Beat Pad for Xbox 360
+	4743  Beat Pad Pro
+	4758  Arcade Game Stick
+	4a01  FightStick TE 2 for Xbox One
+	6040  Beat Pad Pro
+	8818  Street Fighter IV Arcade FightStick (PS3)
+	9871  Portable Drum Kit
+	a109  S.T.R.I.K.E.7 Keyboard
+	a215  X-55 Rhino Throttle
+	b726  Modern Warfare 2 Controller for Xbox 360
+	b738  Marvel VS Capcom 2 TE FightStick for Xbox 360
+	beef  Joytech Neo SE Advanced Gamepad
+	cb02  Saitek Cyborg Rumble Pad
+	cb03  Saitek P3200 Rumble Pad
+	cb29  Saitek Aviator Stick AV8R02
+	f738  Super Street Fighter IV FightStick TE S for Xbox 360
 073a  Chaplet Systems, Inc.
+	2230  infrared dongle for remote
+073b  Suncom Technologies
+073c  Industrial Electronic Engineers, Inc.
+	0305  Pole Display (PC305-3415  2 x 20 Line Display)
+	0322  Pole Display (PC322-3415  2 x 20 Line Display)
+	0324  Pole Display (LB324-USB   4 x 20 Line Display)
+	0330  Pole Display (P330-3415   2 x 20 Line Display)
+	0424  Pole Display (SP324-4415  4 x 20 Line Display)
+	0450  Pole Display (L450-USB   Graphic Line Display)
+	0505  Pole Display (SPC505-3415 2 x 20 Line Display)
+	0522  Pole Display (SPC522-3415 2 x 20 Line Display)
+	0624  Pole Display (SP324-3415  4 x 20 Line Display)
 073d  Eutron S.p.a.
+	0000  SmartKey
 	0005  Crypto Token
+	0007  CryptoIdentity CCID
+	0025  SmartKey 3
+	0c00  Pocket Reader
+	0d00  StarSign Bio Token 3.0 EU
 073e  NEC, Inc.
 	0301  Game Pad
+0742  Stollmann
+	2008  ISDN TA [HFC-S]
+	2009  ISDN TA [HFC-S]
+	200a  ISDN TA [HFC-S]
 0745  Syntech Information Co., Ltd
 0746  Onkyo Corp.
+	4700  Integra MZA-4.7
+	5500  SE-U55 Audio Device
 0747  Labway Corp.
 0748  Strong Man Enterprise Co., Ltd
 0749  EVer Electronics Corp.
@@ -2529,73 +10133,280 @@
 074b  Polestar Tech. Corp.
 074c  C-C-C Group PLC
 074d  Micronas GmbH
+	3553  Composite USB-Device
+	3554  Composite USB-Device
+	3556  Composite USB-Device
 074e  Digital Stream Corp.
 	0001  PS/2 Adapter
 	0002  PS/2 Adapter
 0755  Aureal Semiconductor
 0757  Network Technologies, Inc.
+	0a00  SUN Adapter
+0758  Carl Zeiss Microscopy GmbH
 075b  Sophisticated Circuits, Inc.
 	0001  Kick-off! Watchdog
-0763  Midiman
-	1001  Midisport 2x2
-	1010  Midisport 1x1
+0763  M-Audio
+	0115  O2 / KeyRig 25
+	0117  Trigger Finger
+	0119  MidAir
+	0150  M-Audio Uno
+	0160  M-Audio 1x1
+	0192  M-Audio Keystation 88es
+	0193  ProKeys 88
+	0194  ProKeys 88sx
+	0195  Oxygen 8 v2
+	0196  Oxygen 49
+	0197  Oxygen 61
+	0198  Axiom 25
+	0199  Axiom 49
+	019a  Axiom 61
+	019b  KeyRig 49
+	019c  KeyStudio
+	1001  MidiSport 2x2
+	1002  MidiSport 2x2
+	1003  MidiSport 2x2
+	1010  MidiSport 1x1
+	1011  MidiSport 1x1
+	1014  M-Audio Keystation Loader
+	1015  M-Audio Keystation
 	1020  Midisport 4x4
-	1030  Midisport 8x8
+	1021  MidiSport 4x4
+	1030  M-Audio MIDISPORT 8x8
+	1031  MidiSport 8x8/s Loader
+	1033  MidiSport 8x8/s
+	1040  M-Audio MidiSport 2x4 Loader
+	1041  M-Audio MidiSport 2x4
+	1110  MidiSport 1x1
+	2001  M Audio Quattro
+	2002  M Audio Duo
+	2003  M Audio AudioPhile
+	2004  M-Audio MobilePre
+	2006  M-Audio Transit
+	2007  M-Audio Sonica Theater
+	2008  M-Audio Ozone
+	200d  M-Audio OmniStudio
+	200f  M-Audio MobilePre
+	2010  M-Audio Fast Track
+	2012  M-Audio Fast Track Pro
+	2013  M-Audio JamLab
+	2015  M-Audio RunTime DFU
+	2016  M-Audio RunTime DFU
+	2019  M-Audio Ozone Academic
+	201a  M-Audio Micro
+	201b  M-Audio RunTime DFU
+	201d  M-Audio Producer
+	2024  M-Audio Fast Track MKII
+	2080  M-Audio Fast Track Ultra
+	2081  M-Audio RunTime DFU / Fast Track Ultra 8R
+	2803  M-Audio Audiophile DFU
+	2804  M-Audio MobilePre DFU
+	2806  M-Audio Transit DFU
+	2815  M-Audio DFU
+	2816  M-Audio DFU
+	281b  M-Audio DFU
+	2880  M-Audio DFU
+	2881  M-Audio DFU
 0764  Cyber Power System, Inc.
 	0005  Cyber Power UPS
+	0501  CP1500 AVR UPS
+	0601  PR1500LCDRT2U UPS
 0765  X-Rite, Inc.
+	5001  Huey PRO Colorimeter
+	5010  X-Rite Pantone Color Sensor
+	5020  i1 Display Pro
+	6003  ColorMunki Smile
+	d094  X-Rite DTP94 [Quato Silver Haze Pro]
 0766  Jess-Link Products Co., Ltd
+	0017  Packard Bell Carbon
+	001b  Packard Bell Go
+	0204  TopSpeed Cyberlink Remote Control
 0767  Tokheim Corp.
 0768  Camtel Technology Corp.
-	0006 Camtel Technology USB TV Genie Pro FM Model TVB330
+	0006  Camtel Technology USB TV Genie Pro FM Model TVB330
+	0023  eHome Infrared Receiver
 0769  Surecom Technology Corp.
+	11f2  EP-9001-g 802.11g 54M WLAN Adapter
+	11f3  RT2570
+	11f7  802.11g 54M WLAN Adapter
+	31f3  RT2573
 076a  Smart Technology Enablers, Inc.
 076b  OmniKey AG
 	0596  CardMan 2020
+	1021  CardMan 1021
+	1221  CardMan 1221
 	1784  CardMan 6020
-	3021  CardMan 3121
+	3021  CardMan 3021 / 3121
+	3022  CardMan 3121 (HID Technologies)
+	3610  CardMan 3620
+	3621  CardMan 3621
+	3821  CardMan 3821
+	4321  CardMan 4321
+	5121  CardMan 5121
+	5125  CardMan 5125
+	5321  CardMan 5321
+	5340  CardMan 5021 CL
+	6622  CardMan 6121
+	a011  CCID Smart Card Reader Keyboard
+	a021  CCID Smart Card Reader
+	a022  CardMan Smart@Link
+	c000  CardMan 3x21 CS
+	c001  CardMan 5121 CS
 076c  Partner Tech
+	0204  CD7220 Communications Port
+	0302  RP-600
 076d  Denso Corp.
 076e  Kuan Tech Enterprise Co., Ltd
 076f  Jhen Vei Electronic Co., Ltd
+0770  Welch Allyn, Inc - Medical Division
+0771  Observator Instruments BV
+	4455  OMC45III
+	ae0f  OMC45III
+0772  Your data Our Care
 0774  AmTRAN Technology Co., Ltd
 0775  Longshine Electronics Corp.
 0776  Inalways Corp.
 0777  Comda Enterprise Corp.
 0778  Volex, Inc.
-0779  Fairchild Semiconductor
+0779  ON Semiconductor (formerly Fairchild)
+	0133  FUSB307B
+	0134  FUSB308B
 077a  Sankyo Seiki Mfg. Co., Ltd
 077b  Linksys
+	08be  BEFCMU10 v4 Cable Modem
 	2219  WUSB11 V2.6 802.11b Adapter
 	2226  USB200M 100baseTX Adapter
+	2227  Network Everywhere NWU11B
 077c  Forward Electronics Co., Ltd
 	0005  NEC Keyboard
 077d  Griffin Technology
+	0223  IMic Audio In/Out
+	0405  iMate, ADB Adapter
 	0410  PowerMate
 	041a  PowerWave
-	0223  IMic Audio In/Out
+	04aa  SoundKnob
+	07af  iMic
+	1016  AirClick
+	627a  Radio SHARK
+077e  Softing AG
+	008a  NetLink Compact MPI/Profibus adapter
+	0160  EDICblue
+	0220  VAS5054A
 077f  Well Excellent & Most Corp.
+0780  Sagem Monetel GmbH
+	1202  ORGA 900 Smart Card Terminal Virtual Com Port
+	1302  ORGA 6000 Smart Card Terminal Virtual Com Port
+	1303  ORGA 6000 Smart Card Terminal USB RNDIS
+	df55  ORGA 900/6000 Smart Card Terminal DFU
 0781  SanDisk Corp.
 	0001  SDDR-05a ImageMate CompactFlash Reader
 	0002  SDDR-31 ImageMate II CompactFlash Reader
 	0005  SDDR-05b (CF II) ImageMate CompactFlash Reader
+	0100  ImageMate SDDR-12
 	0200  SDDR-09 (SSFDC) ImageMate SmartMedia Reader [eusb]
 	0400  SecureMate SD/MMC Reader
 	0621  SDDR-86 Imagemate 6-in-1 Reader
+	0720  Sansa C200 series in recovery mode
+	0729  Sansa E200 series in recovery mode
 	0810  SDDR-75 ImageMate CF-SM Reader
 	0830  ImageMate CF/MMC/SD Reader
+	1234  Cruzer Mini Flash Drive
 	5150  SDCZ2 Cruzer Mini Flash Drive (thin)
-	5151  Cruzer Micro 256/512MB Flash Drive
+	5151  Cruzer Micro Flash Drive
+	5153  Cruzer Flash Drive
+	5204  Cruzer Crossfire
+	5402  U3 Cruzer Micro
+	5406  Cruzer Micro U3
+	5408  Cruzer Titanium U3
+	540e  Cruzer Contour Flash Drive
+	5530  Cruzer
+	5567  Cruzer Blade
+	556b  Cruzer Edge
+	556c  Ultra
+	556d  Memory Vault
+	5571  Cruzer Fit
+	5575  Cruzer Glide
+	5576  Cruzer Facet
+	5577  Cruzer Pop (8GB)
+	557d  Cruzer Force
+	5580  SDCZ80 Flash Drive
+	5581  Ultra
+	5583  Ultra Fit
+	5588  Extreme Pro
+	5589  SD8SB8U512G[Extreme 500]
+	558c  Extreme Portable SSD
+	5590  Ultra Dual
+	5591  Ultra Flair
+	5e10  Encrypted
+	6100  Ultra II SD Plus 2GB
+	6500  uSSD 5000
+	7100  Cruzer Mini
+	7101  Pen Flash
+	7102  Cruzer Mini
+	7103  Cruzer Mini
 	7104  Cruzer Micro Mini 256MB Flash Drive
+	7105  Cruzer Mini
+	7106  Cruzer Mini
 	7112  Cruzer Micro 128MB Flash Drive
 	7113  Cruzer Micro 256MB Flash Drive
+	7114  Cruzer Mini
+	7115  Cruzer Mini
+	7301  Sansa e100 series (mtp)
+	7302  Sansa e100 series (msc)
+	7400  Sansa M200 series (mtp)
+	7401  Sansa M200 series (msc)
+	7420  Sansa E200 series (mtp)
+	7421  Sansa E200 Series (msc)
+	7422  Sansa E200 series v2 (mtp)
+	7423  Sansa E200 series v2 (msc)
+	7430  Sansa M200 series
+	7431  Sansa M200 series V4 (msc)
+	7432  Sansa Clip (mtp)
+	7433  Sansa Clip (msc)
+	7434  Sansa Clip V2 (mtp)
+	7435  Sansa Clip V2 (msc)
+	7450  Sansa C250
+	7451  Sansa C240
+	7460  Sansa Express
+	7480  Sansa Connect
+	7481  Sansa Connect (in recovery mode)
+	74b0  Sansa View (msc)
+	74b1  Sansa View (mtp)
+	74c0  Sansa Fuze (mtp)
+	74c1  Sansa Fuze (msc)
+	74c2  Sansa Fuze V2 (mtp)
+	74c3  Sansa Fuze V2 (msc)
+	74d0  Sansa Clip+ (mtp)
+	74d1  Sansa Clip+ (msc)
+	74e5  Sansa Clip Zip
+	8181  Pen Flash
+	8183  Hi-Speed Mass Storage Device
 	8185  SDCZ2 Cruzer Mini Flash Drive (older, thick)
+	8888  Card Reader
 	8889  SDDR-88 Imagemate 8-in-1 Reader
+	8919  Card Reader
 	8989  ImageMate 12-in-1 Reader
+	9191  ImageMate CF
+	9219  Card Reader
+	9292  ImageMate CF Reader/Writer
+	9393  ImageMate SD-MMC
+	9595  ImageMate xD-SM
+	9797  ImageMate MS-PRO
+	9919  Card Reader
 	9999  SDDR-99 5-in-1 Reader
+	a7c1  Storage device (SD card reader)
+	a7e8  SDDR-113 MicroMate SDHC Reader
+	b2b3  SDDR-103 MobileMate SD+ Reader
+	b2b5  SDDR-104 MobileMate SD+ Reader
+	b4b5  SDDR-89 V4 ImageMate 12-in-1 Reader
+	b6b7  SDDR-99 V4 ImageMate 5-in-1 Reader
+	b6ba  CF SDDR-289
+	cfc9  SDDR-489 ImageMate Pro Reader
 0782  Trackerball
 0783  C3PO
 	0003  LTC31 SmartCard Reader
+	0006  LTC31v2
+	0009  KBR36
+	0010  LTC32
 0784  Vivitar, Inc.
 	0100  Vivicam 2655
 	1310  Vivicam 3305
@@ -2611,11 +10422,30 @@
 	0001  MN128mini-V ISDN TA
 	0003  MN128mini-J ISDN TA
 0789  Logitec Corp.
+	0026  LHD Device
+	0033  DVD Multi-plus unit LDR-H443SU2
+	0063  LDR Device
+	0064  LDR-R Device
+	00b3  DVD Multi-plus unit LDR-H443U2
+	00cc  LHD Device
+	0105  LAN-TX/U1H2 10/100 Ethernet Adapter [pegasus II]
+	010c  Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter
+	0160  LAN-GTJ/U2A
+	0162  LAN-WN22/U2 Wireless LAN Adapter
+	0163  LAN-WN12/U2 Wireless LAN Adapter
+	0164  LAN-W150/U2M Wireless LAN Adapter
+	0166  LAN-W300N/U2 Wireless LAN Adapter
+	0168  LAN-W150N/U2 Wireless LAN Adapter
+	0170  LAN-W300AN/U2 Wireless LAN Adapter
 078b  Happ Controls, Inc.
 	0010  Driving UGCI
 	0020  Flying UGCI
 	0030  Fighting UGCI
 078c  GTCO/CalComp
+	0090  Tablet Adapter
+	0100  Tablet Adapter
+	0200  Tablet Adapter
+	0300  Tablet Adapter
 	0400  Digitizer (Whiteboard)
 078e  Brincom, Inc.
 0790  Pro-Image Manufacturing Co., Ltd
@@ -2626,13 +10456,35 @@
 0795  RealChip, Inc.
 0796  Certicom Corp.
 0797  Grandtech Semiconductor Corp.
+	6801  Flatbed Scanner
+	6802  InkJet Color Printer
 	8001  SmartCam
 	801a  Typhoon StyloCam
 	801c  Meade Binoculars/Camera
 	8901  ScanHex SX-35a
 	8909  ScanHex SX-35b
 	8911  ScanHex SX-35c
+0798  Optelec
+	0001  Braille Voyager
+	0640  BC640
+	0680  BC680
+0799  Altera
+	7651  Programming Unit
 079b  Sagem
+	0024  MSO300/MSO301 Fingerprint Sensor
+	0026  MSO350/MSO351 Fingerprint Sensor & SmartCard Reader
+	0027  USB-Serial Controller
+	002f  Mobile
+	0030  Mobile Communication Device
+	0042  Mobile
+	0047  CBM/MSO1300 Fingerprint Sensor
+	004a  XG-760A 802.11bg
+	004b  Wi-Fi 11g adapter
+	0052  MSO1350 Fingerprint Sensor & SmartCard Reader
+	0056  Agfa AP1100 Photo Printer
+	005d  Mobile Mass Storage
+	0062  XG-76NA 802.11bg
+	0078  Laser Pro Monochrome MFP
 079d  Alfadata Computer Corp.
 	0201  GamePort Adapter
 07a1  Digicom S.p.A.
@@ -2641,126 +10493,445 @@
 07a3  Onnto Corp.
 07a4  Be, Inc.
 07a6  ADMtek, Inc.
+	07c2  AN986A Ethernet
 	0986  AN986 Pegasus Ethernet
+	8266  Infineon WildCard-USB Wireless LAN Adapter
 	8511  ADM8511 Pegasus II Ethernet
+	8513  ADM8513 Pegasus II Ethernet
+	8515  ADM8515 Pegasus II Ethernet
 07aa  Corega K.K.
 	0001  Ether USB-T Ethernet [klsi]
 	0004  FEther USB-TX Ethernet [pegasus]
+	000c  WirelessLAN USB-11
+	000d  FEther USB-TXS
+	0011  Wireless LAN USB-11 mini
 	0012  Stick-11 802.11b Adapter
+	0017  FEther USB2-TX
+	0018  Wireless LAN USB-11 mini 2
+	001a  ULUSB-11 Key
+	001c  CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880]
+	0020  CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]
+	002e  CG-WLUSB2GPX [Ralink RT2571W]
+	002f  CG-WLUSB2GNL
+	0031  CG-WLUSB2GS 802.11bg [Atheros AR5523]
+	003c  CG-WLUSB2GNL
+	003f  CG-WLUSB300AGN
+	0041  CG-WLUSB300GNS
+	0042  CG-WLUSB300GNM
+	0043  CG-WLUSB300N rev A2 [Realtek RTL8192U]
+	0047  CG-WLUSBNM
+	0051  CG-WLUSB300NM
 	7613  Stick-11 V2 802.11b Adapter
+	9601  FEther USB-TXC
 07ab  Freecom Technologies
 	fc01  IDE bridge
+	fc02  Cable II USB-2
 	fc03  USB2-IDE IDE bridge
+	fc77  Quattro 3.0
+	fcd6  Freecom HD Classic
+	fcf6  DataBar
+	fcf8  Freecom Classic SL Network Drive
+	fcfe  Hard Drive 80GB
 07af  Microtech
 	0004  SCSI-DB25 SCSI Bridge [shuttle]
 	0005  SCSI-HD50 SCSI Bridge [shuttle]
 	0006  CameraMate SmartMedia and CompactFlash Card Reader [eusb/shuttle]
+	fc01  Freecom USB-IDE
 07b0  Trust Technologies
 	0001  ISDN TA
+	0002  ISDN TA128 Plus
+	0003  ISDN TA128 Deluxe
+	0005  ISDN TA128 SE
+	0006  ISDN TA 128 [HFC-S]
+	0007  ISDN TA [HFC-S]
+	0008  ISDN TA
 07b1  IMP, Inc.
 07b2  Motorola BCS, Inc.
+	0100  SURFboard Voice over IP Cable Modem
+	0900  SURFboard Gateway
+	0950  SURFboard SBG950 Gateway
+	1000  SURFboard SBG1000 Gateway
 	4100  SurfBoard SB4100 Cable Modem
 	4200  SurfBoard SB4200 Cable Modem
+	4210  SurfBoard 4210 Cable Modem
+	4220  SURFboard SB4220 Cable Modem
+	4500  CG4500 Communications Gateway
+	450b  CG4501 Communications Gateway
+	450e  CG4500E Communications Gateway
 	5100  SurfBoard SB5100 Cable Modem
 	5101  SurfBoard SB5101 Cable Modem
 	5120  SurfBoard SB5120 Cable Modem (RNDIS)
+	5121  Surfboard 5121 Cable Modem
+	6002  MTR7000 Cable Tuning Adapter
+	7030  WU830G 802.11bg Wireless Adapter [Envara WiND512]
 07b3  Plustek, Inc.
 	0001  OpticPro 1212U Scanner
+	0003  Scanner
 	0010  OpticPro U12 Scanner
 	0011  OpticPro U24 Scanner
 	0013  OpticPro UT12 Scanner
+	0014  Scanner
 	0015  OpticPro U24 Scanner
 	0017  OpticPro UT12/16/24 Scanner
+	0204  Scanner
 	0400  OpticPro 1248U Scanner
 	0401  OpticPro 1248U Scanner #2
 	0403  OpticPro U16B Scanner
+	0404  Scanner
+	0405  A8 Namecard-s Controller
+	0406  A8 Namecard-D Controller
+	0410  Scanner
+	0412  Scanner
+	0413  OpticSlim 1200 Scanner
+	0601  OpticPro ST24 Scanner
+	0800  OpticPro ST48 Scanner
+	0807  OpticFilm 7200 scanner
+	0900  OpticBook 3600 Scanner
+	090c  OpticBook 3600 Plus Scanner
+	0a06  TVcam VD100
+	0b00  SmartPhoto F50
+	0c00  OpticPro ST64 Scanner
+	0c03  OpticPro ST64+ Scanner
+	0c04  Optic Film 7200i scanner
+	0c0c  PL806 Scanner
+	0c26  OpticBook 4600 Scanner
+	0c2b  Mobile Office D428 Scanner
+	0e08  OpticBook A300 Scanner
+	1300  OpticBook 3800 Scanner
+	1301  OpticBook 4800 Scanner
+	130f  Bookreader v200
 07b4  Olympus Optical Co., Ltd
 	0100  Camedia C-2100/C-3000 Ultra Zoom Camera
 	0102  Camedia E-10/C-220/C-50 Camera
 	0105  Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560/C-3020Z Zoom Camera
-	0109  C-370Z/D-535Z/X-450
+	0109  C-370Z/C-500Z/D-535Z/X-450
+	010a  MAUSB-10 xD and SmartMedia Card Reader
 	0112  MAUSB-100 xD Card Reader
-	0113  mju 500
+	0113  Mju 500 / Stylus Digital Camera (PTP)
 	0114  C-350Z Camera
-	0118  Mju Digital 500
+	0118  Mju Mini Digital/Mju Digital 500 Camera / Stylus 850 SW
+	0125  Tough TG-1 Camera
+	0126  VR340/D750 Digital Camera
+	0184  P-S100 port
+	0202  Foot Switch RS-26
 	0203  Digital Voice Recorder DW-90
 	0206  Digital Voice Recorder DS-330
 	0207  Digital Voice Recorder & Camera W-10
 	0209  Digital Voice Recorder DM-20
+	020b  Digital Voice Recorder DS-4000
 	020d  Digital Voice Recorder VN-240PC
+	0211  Digital Voice Recorder DS-2300
+	0218  Foot Switch RS-28
+	0244  Digital Voice Recorder VN-8500PC
+	024f  Digital Voice Recorder DS-7000
+	0280  m:robe 100
+	0295  Digital Voice Recorder VN-541PC
 07b5  Mega World International, Ltd
+	0017  Joystick
 	0213  Thrustmaster Firestorm Digital 3 Gamepad
+	0312  Gamepad
 	9902  GamePad
 07b6  Marubun Corp.
 07b7  TIME Interconnect, Ltd
-07b8  D-Link Corp.
+07b8  AboCom Systems Inc
+	110c  XX1
+	1201  IEEE 802.11b Adapter
+	200c  XX2
+	2573  Wireless LAN Card
+	2770  802.11n/b/g Mini Wireless LAN USB2.0 Adapter
+	2870  802.11n/b/g Wireless LAN USB2.0 Adapter
+	3070  802.11n/b/g Mini Wireless LAN USB2.0 Adapter
+	3071  802.11n/b/g Mini Wireless LAN USB2.0 Adapter
+	3072  802.11n/b/g Mini Wireless LAN USB2.0 Adapter
 	4000  DU-E10 Ethernet [klsi]
 	4002  DU-E100 Ethernet [pegasus]
+	4003  1/10/100 Ethernet Adapter
+	4004  XX4
+	4007  XX5
+	400b  XX6
+	400c  XX7
+	401a  RTL8151
 	4102  USB 1.1 10/100M Fast Ethernet Adapter
+	4104  XX9
+	420a  UF200 Ethernet
+	5301  GW-US54ZGL 802.11bg
+	6001  WUG2690 802.11bg Wireless Module [ZyDAS ZD1211+AL2230]
+	8188  AboCom Systems Inc [WN2001 Prolink Wireless-N Nano Adapter]
+	a001  WUG2200 802.11g Wireless Adapter [Envara WiND512]
 	abc1  DU-E10 Ethernet [pegasus]
+	b000  BWU613
+	b02a  AboCom Bluetooth Device
+	b02b  Bluetooth dongle
+	b02c  BCM92045DG-Flash with trace filter
+	b02d  BCM92045DG-Flash with trace filter
+	b02e  BCM92045DG-Flash with trace filter
+	b030  BCM92045DG-Flash with trace filter
+	b031  BCM92045DG-Flash with trace filter
+	b032  BCM92045DG-Flash with trace filter
+	b033  BCM92045DG-Flash with trace filter
+	b21a  WUG2400 802.11g Wireless Adapter [Texas Instruments TNETW1450]
+	b21b  HWU54DM
+	b21c  RT2573
+	b21d  RT2573
+	b21e  RT2573
+	b21f  WUG2700
+	d011  MP3 Player
+	e001  Mass Storage Device
+	e002  Mass Storage Device
+	e003  Mass Storage Device
+	e004  Mass Storage Device
+	e005  Mass Storage Device
+	e006  Mass Storage Device
+	e007  Mass Storage Device
+	e008  Mass Storage Device
+	e009  Mass Storage Device
+	e00a  Mass Storage Device
+	e4f0  Card Reader Driver
 	f101  DSB-560 Modem [atlas]
 07bc  Canon Computer Systems, Inc.
 07bd  Webgear, Inc.
 07be  Veridicom
+	1935  Elektron Music Machines
 07c0  Code Mercenaries Hard- und Software GmbH
+	1113  JoyWarrior24F8
+	1116  JoyWarrior24F14
 	1121  The Claw
 	1500  IO-Warrior 40
 	1501  IO-Warrior 24
 	1502  IO-Warrior 48
 	1503  IO-Warrior 28
+	1511  IO-Warrior 24 Power Vampire
+	1512  IO-Warrior 24 Power Vampire
+07c1  Keisokugiken
+	0068  HKS-0200 USBDAQ
 07c4  Datafab Systems, Inc.
+	0102  USB to LS120
+	0103  USB to IDE
+	1234  USB to ATAPI
 	a000  CompactFlash Card Reader
 	a001  CompactFlash & SmartMedia Card Reader [eusb]
 	a002  Disk Drive
+	a003  Datafab-based Reader
+	a004  USB to MMC Class Drive
 	a005  CompactFlash & SmartMedia Card Reader
 	a006  SmartMedia Card Reader
+	a007  Memory Stick Class Drive
+	a103  MDSM-B reader
+	a107  USB to Memory Stick (LC1) Drive
 	a109  LC1 CompactFlash & SmartMedia Card Reader
+	a10b  USB to CF+MS(LC1)
 	a200  DF-UT-06 Hama MMC/SD Reader
 	a400  CompactFlash & Microdrive Reader
+	a600  Card Reader
+	a604  12-in-1 Card Reader
+	ad01  Mass Storage Device
+	ae01  Mass Storage Device
+	af01  Mass Storage Device
+	b000  USB to CF(LC1)
+	b001  USB to CF+PCMCIA
 	b004  MMC/SD Reader
+	b006  USB to PCMCIA
+	b00a  USB to CF+SD Drive(LC1)
+	b00b  USB to Memory Stick(LC1)
+	c010  Kingston FCR-HS2/ATA Card Reader
 07c5  APG Cash Drawer
+	0500  Cash Drawer
 07c6  ShareWave, Inc.
+	0002  Bodega Wireless Access Point
+	0003  Bodega Wireless Network Adapter
 07c7  Powertech Industrial Co., Ltd
 07c8  B.U.G., Inc.
+	0202  MN128-SOHO PAL
 07c9  Allied Telesyn International
+	b100  AT-USB100
 07ca  AVerMedia Technologies, Inc.
+	0002  AVerTV PVR USB/EZMaker Pro Device
+	0026  AVerTV
+	0337  A867 DVB-T dongle
+	0837  H837 Hybrid ATSC/QAM
+	1228  MPEG-2 Capture Device (M038)
+	1830  AVerTV Volar Video Capture (H830)
+	1871  TD310 DVB-T/T2/C dongle
+	3835  AVerTV Volar Green HD (A835B)
+	850a  AverTV Volar Black HD (A850)
+	850b  AverTV Red HD+ (A850T)
+	a309  AVerTV DVB-T (A309)
+	a801  AVerTV DVB-T (A800)
+	a815  AVerTV DVB-T Volar X (A815)
+	a827  AVerTV Hybrid Volar HX (A827)
+	a867  AVerTV DVB-T (A867)
+	b300  A300 DVB-T TV receiver
+	b800  MR800 FM Radio
+	e880  MPEG-2 Capture Device (E880)
+	e882  MPEG-2 Capture Device (E882)
 07cb  Kingmax Technology, Inc.
 07cc  Carry Computer Eng., Co., Ltd
 	0000  CF Card Reader
+	0001  Reader (UICSE)
+	0002  Reader (UIS)
 	0003  SM Card Reader
 	0004  SM/CF/PCMCIA Card Reader
+	0005  Reader (UISA2SE)
 	0006  SM/CF/PCMCIA Card Reader
+	0007  Reader (UISA6SE)
 	000c  SM/CF Card Reader
 	000d  SM/CF Card Reader
+	000e  Reader (UISDA)
+	000f  Reader (UICLIK)
+	0010  Reader (UISMA)
+	0012  Reader (UISC6SE-FLASH)
+	0014  Litronic Fortezza Reader
+	0030  Mass Storage (UISDMC12S)
+	0040  Mass Storage (UISDMC13S)
+	0100  Reader (UID)
+	0101  Reader (UIM)
+	0102  Reader (UISDMA)
+	0103  Reader (UISDMC)
+	0104  Reader (UISDM)
 	0200  6-in-1 Card Reader
+	0201  Mass Storage (UISDMC1S & UISDMC3S)
+	0202  Mass Storage (UISDMC5S)
+	0203  Mass Storage (UISMC5S)
+	0204  Mass Storage (UIM4/5S & UIM7S)
+	0205  Mass Storage (UIS4/5S & UIS7S)
+	0206  Mass Storage (UISDMC10S & UISDMC11S)
+	0207  Mass Storage (UPIDMA)
+	0208  Mass Storage (UCFC II)
+	0210  Mass Storage (UPIXXA)
+	0213  Mass Storage (UPIDA)
+	0214  Mass Storage (UPIMA)
+	0215  Mass Storage (UPISA)
+	0217  Mass Storage (UPISDMA)
+	0223  Mass Storage (UCIDA)
+	0224  Mass Storage (UCIMA)
+	0225  Mass Storage (UIS7S)
+	0227  Mass Storage (UCIDMA)
+	0234  Mass Storage (UIM7S)
+	0235  Mass Storage (UIS4S-S)
+	0237  Velper (UISDMC4S)
+	0300  6-in-1 Card Reader
 	0301  6-in-1 Card Reader
+	0303  Mass Storage (UID10W)
+	0304  Mass Storage (UIM10W)
+	0305  Mass Storage (UIS10W)
+	0308  Mass Storage (UIC10W)
+	0309  Mass Storage (UISC3W)
+	0310  Mass Storage (UISDMA2W)
+	0311  Mass Storage (UISDMC14W)
+	0320  Mass Storage (UISDMC4W)
+	0321  Mass Storage (UISDMC37W)
+	0330  WINTERREADER Reader
+	0350  9-in-1 Card Reader
+	0500  Mass Storage
+	0501  Mass Storage
 07cd  Elektor
 	0001  USBuart Serial Port
+07ce  Nidec Copal
+	c007  DPB-4000
+	c009  DPB-6000
+	c010  CPB-7000
 07cf  Casio Computer Co., Ltd
-	1001  QV-8000SX/5700/3000EX Digicam
+	1001  QV-8000SX/5700/3000EX Digicam; Exilim EX-M20
 	1003  Exilim EX-S500
 	1004  Exilim EX-Z120
+	1011  USB-CASIO PC CAMERA
+	1116  EXILIM EX-Z19
+	1125  Exilim EX-H10 Digital Camera (mass storage mode)
+	1133  Exilim EX-Z350 Digital Camera (mass storage mode)
+	1225  Exilim EX-H10 Digital Camera (PictBridge mode)
+	1233  Exilim EX-Z350 Digital Camera (PictBridge mode)
 	2002  E-125 Cassiopeia Pocket PC
 	3801  WMP-1 MP3-Watch
 	4001  Label Printer KL-P1000
+	4007  CW50 Device
+	4104  Cw75 Device
+	4107  CW-L300 Device
 	4500  LV-20 Digital Camera
+	6101  fx-9750gII
+	6102  fx-CP400
+	6801  PL-40R
+	6802  MIDI Keyboard
+	6803  CTK-3500 (MIDI keyboard)
 07d0  Dazzle
 	0001  Digital Video Creator I
 	0002  Global Village VideoFX Grabber
 	0003  Fusion Model DVC-50 Rev 1 (NTSC)
 	0004  DVC-800 (PAL) Grabber
+	0005  Fusion Video and Audio Ports
+	0006  DVC 150 Loader Device
+	0007  DVC 150
+	0327  Fusion Digital Media Reader
+	1001  DM-FLEX DFU Adapter
+	1002  DMHS2 DFU Adapter
+	1102  CF Reader/Writer
+	1103  SD Reader/Writer
+	1104  SM Reader/Writer
+	1105  MS Reader/Writer
+	1106  xD/SM Reader/Writer
+	1202  MultiSlot Reader/Writer
+	2000  FX2 DFU Adapter
+	2001  eUSB CompactFlash Reader
+	4100  Kingsun SF-620 Infrared Adapter
+	4101  Connectivity Cable (CA-42 clone)
+	4959  Kingsun KS-959 Infrared Adapter
 07d1  D-Link System
+	13ec  VvBus for Helium 2xx
+	13ed  VvBus for Helium 2xx
+	13f1  DSL-302G Modem
+	13f2  DSL-502G Router
+	3300  DWA-130 802.11n Wireless N Adapter(rev.E) [Realtek RTL8191SU]
+	3302  DWA-130 802.11n Wireless N Adapter(rev.C2) [Realtek RTL8191SU]
+	3303  DWA-131 802.11n Wireless N Nano Adapter(rev.A1) [Realtek RTL8192SU]
+	3304  FR-300USB 802.11bgn Wireless Adapter
+	3a07  WUA-2340 RangeBooster G Adapter(rev.A) [Atheros AR5523]
+	3a08  WUA-2340 RangeBooster G Adapter(rev.A) (no firmware) [Atheros AR5523]
+	3a09  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A2) [Atheros AR9170+AR9104]
+	3a0d  DWA-120 802.11g Wireless 108G Adapter [Atheros AR5523]
+	3a0f  DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9170+AR9102]
+	3a10  DWA-126 802.11n Wireless Adapter [Atheros AR9271]
+	3b01  AirPlus G DWL-G122 Wireless Adapter(rev.D) [Marvell 88W8338+88W8010]
+	3b10  DWA-142 RangeBooster N Adapter [Marvell 88W8362+88W8060]
+	3b11  DWA-130 802.11n Wireless N Adapter(rev.A1) [Marvell 88W8362+88W8060]
+	3c03  AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT2571W]
+	3c04  WUA-1340
+	3c05  EH103 Wireless G Adapter
+	3c06  DWA-111 802.11bg Wireless Adapter [Ralink RT2571W]
+	3c07  DWA-110 Wireless G Adapter(rev.A1) [Ralink RT2571W]
+	3c09  DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870]
+	3c0a  DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT3072]
+	3c0b  DWA-110 Wireless G Adapter(rev.B) [Ralink RT2870]
+	3c0d  DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT3070]
+	3c0e  WUA-2340 RangeBooster G Adapter(rev.B) [Ralink RT2070]
+	3c0f  AirPlus G DWL-G122 Wireless Adapter(rev.E1) [Ralink RT2070]
+	3c10  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A1) [Atheros AR9170+AR9104]
+	3c11  DWA-160 Xtreme N Dual Band USB Adapter(rev.B) [Ralink RT2870]
+	3c13  DWA-130 802.11n Wireless N Adapter(rev.B) [Ralink RT2870]
+	3c15  DWA-140 RangeBooster N Adapter(rev.B3) [Ralink RT2870]
+	3c16  DWA-125 Wireless N 150 Adapter(rev.A2) [Ralink RT3070]
+	3e02  DWM-156 3.75G HSUPA Adapter
+	5100  Remote NDIS Device
+	a800  DWM-152 3.75G HSUPA Adapter
+	f101  DBT-122 Bluetooth
+	fc01  DBT-120 Bluetooth Adapter
 07d2  Aptio Products, Inc.
 07d3  Cyberdata Corp.
+07d5  Radiant Systems
 07d7  GCC Technologies, Inc.
 07da  Arasan Chip Systems
+07de  Diamond Multimedia
+	2820  VC500 Video Capture Dongle
 07df  David Electronics Co., Ltd
+07e0  NCP engineering GmbH
+	4742  VPN GovNet Box
 07e1  Ambient Technologies, Inc.
 	5201  V.90 Modem
 07e2  Elmeg GmbH & Co., Ltd
 07e3  Planex Communications, Inc.
 07e4  Movado Enterprise Co., Ltd
+	0967  SCard R/W CSR-145
+	0968  SCard R/W CSR-145
 07e5  QPS, Inc.
+	05c2  IDE-to-USB2.0 PCA
 	5c01  Que! CDRW
 07e6  Allied Cable Corp.
 07e7  Mirvo Toys, Inc.
@@ -2770,20 +10941,54 @@
 07ec  Taiyo Electric Wire & Cable Co., Ltd
 07ee  Torex Retail (formerly Logware)
 	0002  Cash Drawer I/F
+07ef  STSN
+	0001  Internet Access Device
+07f2  Microcomputer Applications, Inc.
+	0001  KEYLOK II
 07f6  Circuit Assembly Corp.
 07f7  Century Corp.
+	0005  ScanLogic/Century Corporation uATA
+	011e  Century USB Disk Enclosure
 07f9  Dotop Technology, Inc.
-07fa  Draytek
+07fa  DrayTek Corp.
 	0778  miniVigor 128 ISDN TA
+	0846  ISDN TA [HFC-S]
+	0847  ISDN TA [HFC-S]
+	1012  BeWAN ADSL USB ST (grey)
+	1196  BWIFI-USB54AR 802.11bg
+	a904  BeWAN ADSL
+	a905  BeWAN ADSL ST
+07fc  Thomann
+	1113  SWISSONIC EasyKeys61 Midikeyboard
 07fd  Mark of the Unicorn
 	0000  FastLane MIDI Interface
-0801  Mag-Tek
+	0001  MIDI Interface
+	0002  MOTU Audio for 64 bit
+	0004  MicroBook
+	0008  M Series
+07ff  Unknown
+	00ff  Portable Hard Drive
+	ffff  Mad Catz Gamepad
+0801  MagTek
+	0001  Mini Swipe Reader (Keyboard Emulation)
 	0002  Mini Swipe Reader
+	0003  Magstripe Insert Reader
 0802  Mako Technologies, LLC
 0803  Zoom Telephonics, Inc.
+	1300  V92 Faxmodem
+	3095  V.92 56K Mini External Modem Model 3095
+	4310  4410a Wireless-G Adapter [Intersil ISL3887]
+	4410  4410b Wireless-G Adapter [ZyDAS ZD1211B]
+	5241  Cable Modem
+	5551  DSL Modem
 	9700  2986L FaxModem
+	9800  Cable Modem
+	a312  Wireless-G
 0809  Genicom Technology, Inc.
 080a  Evermuch Technology Co., Ltd
+080b  Cross Match Technologies
+	0002  Fingerprint Scanner (After ReNumeration)
+	0010  300LC Series Fingerprint Scanner (Before ReNumeration)
 080c  Datalogic S.p.A.
 	0300  Gryphon D120 Barcode Scanner
 	0400  Gryphon D120 Barcode Scanner
@@ -2791,15 +10996,31 @@
 	0600  Gryphon M100 Barcode Scanner
 080d  Teco Image Systems Co., Ltd
 	0102  Hercules Scan@home 48
+	0104  3.2Slim
+	0110  UMAX AstraSlim 1200 Scanner
 0810  Personal Communication Systems, Inc.
+	0001  Dual PSX Adaptor
+	0002  Dual PCS Adaptor
+	0003  PlayStation Gamepad
+	e001  Twin controller
+	e501  SNES Gamepad
 0813  Mattel, Inc.
 	0001  Intel Play QX3 Microscope
+	0002  Dual Mode Camera Plus
+0819  eLicenser
+	0101  License Management and Copy Protection
 081a  MG Logic
 	1000  Duo Pen Tablet
 081b  Indigita Corp.
+	0600  Storage Adapter
+	0601  Storage Adapter
 081c  Mipsys
 081e  AlphaSmart, Inc.
+	df00  Handheld
+081f  Manta
+	e401  MM812
 0822  Reudo Corp.
+	2001  IRXpress Infrared Device
 0825  GC Protronics
 0826  Data Transit
 0827  BroadLogic, Inc.
@@ -2807,77 +11028,223 @@
 0829  DirecTV Broadband, Inc. (Telocity)
 082d  Handspring
 	0100  Visor
+	0200  Treo
 	0300  Treo 600
+	0400  Handheld
+	0500  Handheld
+	0600  Handheld
 0830  Palm, Inc.
-	0002  Palm M505
-	0003  Palm M515
-	0020  Palm I705
-	0040  Palm M125
-	0050  Palm M130
-	0060  Palm Tungsten T / Zire 71
-	0080  USB Serial Adapter [for Palm III series to sync via USB]
+	0001  m500
+	0002  m505
+	0003  m515
+	0004  Handheld
+	0005  Handheld
+	0006  Handheld
+	0010  Handheld
+	0011  Handheld
+	0012  Handheld
+	0013  Handheld
+	0014  Handheld
+	0020  i705
+	0021  Handheld
+	0022  Handheld
+	0023  Handheld
+	0024  Handheld
+	0030  Handheld
+	0031  Tungsten W
+	0032  Handheld
+	0033  Handheld
+	0034  Handheld
+	0040  m125
+	0041  Handheld
+	0042  Handheld
+	0043  Handheld
+	0044  Handheld
+	0050  m130
+	0051  Handheld
+	0052  Handheld
+	0053  Handheld
+	0054  Handheld
+	0060  Tungsten C/E/T/T2/T3 / Zire 71
+	0061  Lifedrive / Treo 650/680 / Tunsten E2/T5/TX / Centro / Zire 21/31/72 / Z22
+	0062  Handheld
+	0063  Handheld
+	0064  Handheld
+	0070  Zire
+	0071  Handheld
+	0072  Handheld
+	0080  Serial Adapter [for Palm III]
+	0081  Handheld
+	0082  Handheld
+	00a0  Treo 800w
+	0101  Pre
 0832  Kouwell Electronics Corp.
+	5850  Cable
 0833  Sourcenext Corp.
+	012e  KeikaiDenwa 8 with charger
+	039f  KeikaiDenwa 8
 0835  Action Star Enterprise Co., Ltd
+0836  TrekStor
+	2836  i.Beat mood
 0839  Samsung Techwin Co., Ltd
 	0005  Digimax Camera
 	0008  Digimax 230 Camera
 	0009  Digimax 340
+	000a  Digimax 410
 	000e  Digimax 360
 	0010  Digimax 300
 	1003  Digimax 210SE
+	1005  Digimax 220
+	1009  Digimax V4
 	1012  6500 Document Camera
+	103f  Digimax S500
+	1058  S730 Camera
+	1064  Digimax D830 Camera
 	1542  Digimax 50 Duo
 	3000  Digimax 35 MP3
 083a  Accton Technology Corp.
 	1046  10/100 Ethernet [pegasus]
+	1060  HomeLine Adapter
+	1f4d  SMC8013WG Broadband Remote NDIS Device
+	3046  10/100 Series Adapter
+	3060  1/10/100 Adapter
+	3501  2664W
+	3502  WN3501D Wireless Adapter
+	3503  T-Sinus 111 Wireless Adapter
+	4501  T-Sinus 154data
+	4502  Siemens S30853-S1016-R107 802.11g Wireless Adapter [Intersil ISL3886]
+	4505  SMCWUSB-G 802.11bg
+	4507  SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523]
+	4521  Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887]
+	4531  T-Com Sinus 154 data II [Intersil ISL3887]
 	5046  SpeedStream 10/100 Ethernet [pegasus]
+	5501  Wireless Adapter 11g
+	6500  Cable Modem
+	6618  802.11n Wireless Adapter
+	7511  Arcadyan 802.11N Wireless Adapter
+	7512  Arcadyan 802.11N Wireless Adapter
+	7522  Arcadyan 802.11N Wireless Adapter
+	8522  Arcadyan 802.11N Wireless Adapter
+	8541  WN4501F 802.11g Wireless Adapter [Intersil ISL3887]
+	a512  Arcadyan 802.11N Wireless Adapter
+	a618  SMCWUSBS-N EZ Connect N Draft 11n Wireless Adapter [Ralink RT2870]
+	a701  SMCWUSBS-N3 EZ Connect N Wireless Adapter [Ralink RT3070]
+	b004  CPWUE001 USB/Ethernet Adapter
+	b522  SMCWUSBS-N2 EZ Connect N Wireless Adapter [Ralink RT2870]
+	bb01  BlueExpert Bluetooth Device
+	c003  802.11b Wireless Adapter
+	c501  Zoom 4410 Wireless-G [Intersil ISL3887]
+	c561  802.11a/g Wireless Adapter
+	d522  Speedport W 102 Stick IEEE 802.11n USB 2.0 Adapter
+	e501  ZD1211B
+	e503  Arcadyan WN4501 802.11b/g
+	e506  WUS-201 802.11bg
+	f501  802.11g Wireless Adapter
+	f502  802.11g Wireless Adapter
+	f522  Arcadyan WN7512 802.11n
 083f  Global Village
 	b100  TelePort V.90 Fax/Modem
 0840  Argosy Research, Inc.
+	0060  Storage Adapter Bridge Module
 0841  Rioport.com, Inc.
 	0001  Rio 500
 0844  Welland Industrial Co., Ltd
 0846  NetGear, Inc.
-	1001  EA101 Ethernet [klsi]
-	4110  MA111 WiFi (v1)
-	4200  WG121 WiFi (v1)
-	4210  WG121 WiFi (v2)
-	4220  WG111 WiFi (v1)
-	4230  MA111 WiFi
-	4240  WG111 WiFi (v2)
-	6a00  WG111 WiFi (v2)
+	1001  EA101 10 Mbps 10BASE-T Ethernet [Kawasaki LSI KL5KLUSB101B]
+	1002  Ethernet
+	1020  FA101 Fast Ethernet USB 1.1
+	1040  FA120 Fast Ethernet USB 2.0 [Asix AX88172 / AX8817x]
+	1100  Managed Switch M4100 series, M5300 series, M7100 series
+	4110  MA111(v1) 802.11b Wireless [Intersil Prism 3.0]
+	4200  WG121(v1) 54 Mbps Wireless [Intersil ISL3886]
+	4210  WG121(v2) 54 Mbps Wireless [Intersil ISL3886]
+	4220  WG111(v1) 54 Mbps Wireless [Intersil ISL3886]
+	4230  MA111(v2) 802.11b Wireless [SIS SIS 162]
+	4240  WG111(v1) rev 2 54 Mbps Wireless [Intersil ISL3887]
+	4260  WG111v3 54 Mbps Wireless [realtek RTL8187B]
+	4300  WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX]
+	4301  WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX]
+	5f00  WPN111 802.11g Wireless Adapter [Atheros AR5523]
+	68e1  LB1120-100NAS
+	6a00  WG111v2 54 Mbps Wireless [RealTek RTL8187L]
+	7100  WN121T RangeMax Next Wireless-N [Marvell TopDog]
+	9000  WN111(v1) RangeMax Next Wireless [Marvell 88W8362+88W8060]
+	9001  WN111(v2) RangeMax Next Wireless [Atheros AR9170+AR9101]
+	9010  WNDA3100v1 802.11abgn [Atheros AR9170+AR9104]
+	9011  WNDA3100v2 802.11abgn [Broadcom BCM4323]
+	9012  WNDA4100 802.11abgn 3x3:3 [Ralink RT3573]
+	9014  WNDA3100v3 802.11abgn 2x2:2 [MediaTek MT7632U]
+	9018  WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
+	9020  WNA3100(v1) Wireless-N 300 [Broadcom BCM43231]
+	9021  WNA3100M(v1) Wireless-N 300 [Realtek RTL8192CU]
+	9030  WNA1100 Wireless-N 150 [Atheros AR9271]
+	9040  WNA1000 Wireless-N 150 [Atheros AR9170+AR9101]
+	9041  WNA1000M 802.11bgn [Realtek RTL8188CUS]
+	9042  On Networks N150MA 802.11bgn [Realtek RTL8188CUS]
+	9043  WNA1000Mv2 802.11bgn [Realtek RTL8188CUS?]
+	9050  A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+	9051  A6200v2 802.11a/b/g/n/ac (2x2) Wireless Adapter [Realtek RTL8812AU]
+	9052  A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]
+	9054  Nighthawk A7000 802.11ac Wireless Adapter AC1900 [Realtek 8814AU]
+	a001  PA101 10 Mbps HPNA Home Phoneline RJ-1
+	f001  On Networks N300MA 802.11bgn [Realtek RTL8192CU]
 084d  Minton Optic Industry Co., Inc.
 	0001  Jenoptik JD800i
-	0003  S-Cam F5 Digital Camera
+	0003  S-Cam F5/D-Link DSC-350 Digital Camera
 	0011  Argus DC3500 Digital Camera
 	0014  Praktica DC 32
+	0019  Praktica DPix3000
+	0025  Praktica DC 60
 	1001  ScanHex SX-35d
 084e  KB Gear
-	0001  KBGear JamCam
+	0001  JamCam Camera
+	1001  Jam Studio Tablet
 	1002  Pablo Tablet
 084f  Empeg
 	0001  Empeg-Car Mark I/II Player
 0850  Fast Point Technologies, Inc.
 0851  Macronix International Co., Ltd
 	1542  SiPix Blink
-	1543  Maxell WS30 Slim Digital Camera
+	1543  Maxell WS30 Slim Digital Camera, or Pandigital PI8004W01 digital photo frame
+	a168  MXIC
 0852  CSEM
+0853  Topre Corporation
+	0100  HHKB Professional
+	0119  RealForce 105UB
+	0200  RealForce Compact Keyboard
 0854  ActiveWire, Inc.
 	0100  I/O Board
 	0101  I/O Board, rev1
 0856  B&B Electronics
-	AC01  uLinks USOTL4 RS422/485 Adapter
+	ac01  uLinks USOTL4 RS422/485 Adapter
 0858  Hitachi Maxell, Ltd
+	3102  Bluetooth Device
+	ffff  Maxell module with BlueCore in DFU mode
 0859  Minolta Systems Laboratory, Inc.
 085a  Xircom
 	0001  Portstation Dual Serial Port
 	0003  Portstation Paraller Port
+	0008  Ethernet
+	0009  Ethernet
 	000b  Portstation Dual PS/2 Port
+	0021  1 port to Serial Converter
+	0022  Parallel Port
+	0023  2 port to Serial Converter
+	0024  Parallel Port
+	0026  PortGear SCSI
+	0027  1 port to Serial Converter
+	0028  PortGear to SCSI Converter
+	0032  PortStation SCSI Module
+	003c  Bluetooth Adapter
 	0299  Colorvision, Inc. Monitor Spyder
+	8021  1 port to Serial
+	8023  2 port to Serial
 	8027  PGSDB9 Serial Port
 085c  ColorVision, Inc.
-	0200  Monitor Spyder
+	0100  Spyder 1
+	0200  Spyder 2
+	0300  Spyder 3
+	0400  Spyder 4
 0862  Teletrol Systems, Inc.
 0863  Filanet Corp.
 0864  NetGear, Inc.
@@ -2885,14 +11252,54 @@
 	4102  MA101 802.11b Adapter
 0867  Data Translation, Inc.
 	9812  ECON Data acquisition unit
-086a  Emagic Soft-und Hardware GmbH
+	9816  DT9816 ECON data acquisition module
+	9836  DT9836 data acquisition card
+086a  Emagic Soft- und Hardware GmbH
+	0001  Unitor8
+	0002  AMT8
+	0003  MT4
 086c  DeTeWe - Deutsche Telephonwerke AG & Co.
 	1001  Eumex 504PC ISDN TA
+	1002  Eumex 504PC (FlashLoad)
 	1003  TA33 ISDN TA
-	1055  Eumex 220 ISDN TA
+	1004  TA33 (FlashLoad)
+	1005  Eumex 604PC HomeNet
+	1006  Eumex 604PC HomeNet (FlashLoad)
+	1007  Eumex 704PC DSL
+	1008  Eumex 704PC DSL (FlashLoad)
+	1009  Eumex 724PC DSL
+	100a  Eumex 724PC DSL (FlashLoad)
+	100b  OpenCom 30
+	100c  OpenCom 30 (FlashLoad)
+	100d  BeeTel Home 100
+	100e  BeeTel Home 100 (FlashLoad)
+	1011  USB2DECT
+	1012  USB2DECT (FlashLoad)
+	1013  Eumex 704PC LAN
+	1014  Eumex 704PC LAN (FlashLoad)
+	1019  Eumex 504 SE
+	101a  Eumex 504 SE (Flash-Mode)
+	1021  OpenCom 40
+	1022  OpenCom 40 (FlashLoad)
+	1023  OpenCom 45
+	1024  OpenCom 45 (FlashLoad)
+	1025  Sinus 61 data
+	1029  dect BOX
+	102c  Eumex 604PC HomeNet [FlashLoad]
+	1030  Eumex 704PC DSL [FlashLoad]
+	1032  OpenCom 40 [FlashLoad]
+	1033  OpenCom 30 plus
+	1034  OpenCom 30 plus (FlashLoad)
+	1041  Eumex 220PC
+	1042  Eumex 220PC (FlashMode)
+	1055  Eumex 220 Version 2 ISDN TA
+	1056  Eumex 220 Version 2 ISDN TA (Flash-Mode)
+	2000  OpenCom 1000
 086e  System TALKS, Inc.
+	1920  SGC-X2UL
 086f  MEC IMEX, Inc.
 0870  Metricom
+	0001  Ricochet GS
 0871  SanDisk, Inc.
 	0001  SDDR-01 Compact Flash Reader
 	0002  SDDR-31 Compact Flash Reader
@@ -2902,165 +11309,657 @@
 0879  Comtrol Corp.
 087c  Adesso/Kbtek America, Inc.
 087d  Jaton Corp.
+	5704  Ethernet
 087e  Fujitsu Computer Products of America
-087f  Virtual IP Group, Inc.
+087f  QualCore Logic Inc.
 0880  APT Technologies, Inc.
 0883  Recording Industry Association of America (RIAA)
 0885  Boca Research, Inc.
 0886  XAC Automation Corp.
 	0630  Intel PC Camera CS630
 0887  Hannstar Electronics Corp.
+088a  TechTools
+	1002  DigiView DV3100
 088b  MassWorks, Inc.
 	4944  MassWorks ID-75 TouchScreen
+088c  Swecoin AB
+	2030  Ticket Printer TTP 2030
+088e  iLok
+	5036  Portable secure storage for software licenses
 0892  DioGraphy, Inc.
+	0101  Smartdio Reader/Writer
+0894  TSI Incorporated
+	0010  Remote NDIS Network Device
+0897  Lauterbach
+	0001  ICE In-Circuit Emulator
+	0002  Power Debug/Power Debug II
+	0004  PowerDebug
+	0005  PowerDebug PRO
 089c  United Technologies Research Cntr.
 089d  Icron Technologies Corp.
 089e  NST Co., Ltd
 089f  Primex Aerospace Co.
 08a5  e9, Inc.
+08a6  Toshiba TEC
+	0051  B-SV4
 08a8  Andrea Electronics
+08a9  CWAV Inc.
+	0005  USBee ZX
+	0009  USBee SX
+	0012  USBee AX-Standard
+	0013  USBee AX-Plus
+	0014  USBee AX-Pro
+	0015  USBee DX
+08ac  Macraigor Systems LLC
+	2024  usbWiggler
 08ae  Macally (Mace Group, Inc.)
+08b0  Metrohm
+	0006  814 Sample Processor
+	0015  857 Titrando
+	001a  852 Titrando
 08b4  Sorenson Vision, Inc.
+08b7  NATSU
+	0001  Playstation adapter
 08b8  J. Gordon Electronic Design, Inc.
 	01f4  USBSIMM1
 08b9  RadioShack Corp. (Tandy)
-08bb  Texas Instruments Japan
+08bb  Texas Instruments
+	2702  PCM2702 16-bit stereo audio DAC
+	2704  PCM2704 16-bit stereo audio DAC
+	2705  PCM2705 stereo audio DAC
+	2706  PCM2706 stereo audio DAC
+	2707  PCM2707 stereo audio DAC
+	27c4  PCM2704C stereo audio DAC
+	27c5  PCM2705C stereo audio DAC
+	27c6  PCM2706C stereo audio DAC
+	27c7  PCM2707C stereo audio DAC
 	2900  PCM2900 Audio Codec
+	2901  PCM2901 Audio Codec
+	2902  PCM2902 Audio Codec
 	2904  PCM2904 Audio Codec
+	2910  PCM2912 Audio Codec
+	2912  PCM2912A Audio Codec
+	29b0  PCM2900B Audio CODEC
+	29b2  PCM2902 Audio CODEC
+	29b3  PCM2903B Audio CODEC
+	29b6  PCM2906B Audio CODEC
+	29c0  PCM2900C Audio CODEC
+	29c2  PCM2902C Audio CODEC
+	29c3  PCM2903C Audio CODEC
+	29c6  PCM2906C Audio CODEC
 08bd  Citizen Watch Co., Ltd
+	0208  CLP-521 Label Printer
+	1100  X1-USB Floppy
 08c3  Precise Biometrics
-	0101  Precise 100 MC FingerPrint and SmartCard Reader
+	0001  100 SC
+	0002  100 A
+	0003  100 SC BioKeyboard
+	0006  100 A BioKeyboard
+	0100  100 MC ISP
+	0101  100 MC FingerPrint and SmartCard Reader
+	0300  100 AX
+	0400  100 SC
+	0401  150 MC
+	0402  200 MC FingerPrint and SmartCard Reader
+	0404  100 SC Upgrade
+	0405  150 MC Upgrade
+	0406  100 MC Upgrade
 08c4  Proxim, Inc.
+	0100  Skyline 802.11b Wireless Adapter
+	02f2  Farallon Home Phoneline Adapter
 08c7  Key Nice Enterprise Co., Ltd
 08c8  2Wire, Inc.
 08c9  Nippon Telegraph and Telephone Corp.
 08ca  Aiptek International, Inc.
+	0001  Tablet
 	0010  Tablet
 	0020  APT-6000U Tablet
 	0021  APT-2 Tablet
 	0022  Tablet
 	0023  Tablet
 	0024  Tablet
+	0100  Pen Drive
 	0102  DualCam
 	0103  Pocket DV Digital Camera
 	0104  Pocket DVII
+	0105  Mega DV(Disk)
 	0106  Pocket DV3100+
-	0107  Pocket DV 3100
+	0107  Pocket DV3100
+	0109  Nisis DV4 Digital Camera
+	010a  Trust 738AV LCD PV Mass Storage
 	0111  PenCam VGA Plus
 	2008  Mini PenCam 2
 	2010  Pocket CAM 3 Mega (webcam)
 	2011  Pocket CAM 3 Mega (storage)
-	2018  Pencam SD 2
+	2016  PocketCam 2 Mega
+	2018  Pencam SD 2M
+	2019  Pencam SD 2M (mass storage mode)
+	2020  Slim 3000F
+	2022  Slim 3200
 	2024  Pocket DV3500
+	2028  Pocket Cam4M
+	2040  Pocket DV4100M
+	2042  Pocket DV5100M Composite Device
+	2043  Pocket DV5100M (Disk)
+	2060  Pocket DV5300
 08cd  Jue Hsun Ind. Corp.
 08ce  Long Well Electronics Corp.
 08cf  Productivity Enhancement Products
 08d1  smartBridges, Inc.
 	0001  smartNIC Ethernet [catc]
+	0003  smartNIC 2 PnP Ethernet
 08d3  Virtual Ink
 08d4  Fujitsu Siemens Computers
 	0009  SCR SmartCard Reader
+08d8  IXXAT Automation GmbH
+	0002  USB-to-CAN compact
+	0003  USB-to-CAN II
+	0100  USB-to-CAN
 08d9  Increment P Corp.
 08dd  Billionton Systems, Inc.
+	0112  Wireless LAN Adapter
+	0113  Wireless LAN Adapter
 	0986  USB-100N Ethernet [pegasus]
 	0987  USBLP-100 HomePNA Ethernet [pegasus]
 	0988  USBEL-100 Ethernet [pegasus]
+	1986  10/100 LAN Adapter
+	2103  DVB-T TV-Tuner Card-R
 	8511  USBE-100 Ethernet [pegasus2]
+	90ff  USB2AR Ethernet
 08de  ???
 	7a01  802.11b Adapter
 08df  Spyrus, Inc.
+	0001  Rosetta Token V1
+	0002  Rosetta Token V2
+	0003  Rosetta Token V3
+	0a00  Lynks Interface
 08e3  Olitec, Inc.
 	0002  USB-RS232 Bridge
+	0100  Interface ADSL
+	0101  Interface ADSL
+	0102  ADSL
+	0301  RNIS ISDN TA [HFC-S]
 08e4  Pioneer Corp.
+	0184  DDJ-WeGO
+	0185  DDJ-WeGO2
 08e5  Litronic
-08e6  Gemplus
+08e6  Gemalto (was Gemplus)
+	0001  GemPC-Touch 430
 	0430  GemPC430 SmartCard Reader
 	0432  GemPC432 SmartCard Reader
 	0435  GemPC435 SmartCard Reader
 	0437  GemPC433 SL SmartCard Reader
+	1359  UA SECURE STORAGE TOKEN
+	2202  Gem e-Seal Pro Token
 	3437  GemPC Twin SmartCard Reader
 	3438  GemPC Key SmartCard Reader
+	3478  PinPad Smart Card Reader
+	34ec  Compact Smart Card Reader Writer
+	4433  GemPC433-Swap
+	5501  GemProx-PU Contactless Smart Card Reader
+	5503  Prox-DU Contactless Interface
+	ace0  UA HYBRID TOKEN
 08e7  Pan-International Wire & Cable
 08e8  Integrated Memory Logic
 08e9  Extended Systems, Inc.
 	0100  XTNDAccess IrDA Dongle
 08ea  Ericsson, Inc., Blue Ridge Labs
+	00c9  ADSL Modem HM120dp Loader
+	00ca  ADSL WAN Modem HM120dp
+	00ce  HM230d Virtual Bus for Helium
 	abba  USB Driver for Bluetooth Wireless Technology
+	abbb  Bluetooth Device in DFU State
 08ec  M-Systems Flash Disk Pioneers
+	0001  TravelDrive 2C
+	0002  TravelDrive 2C
+	0005  TravelDrive 2C
+	0008  TravelDrive 2C
 	0010  DiskOnKey
+	0011  DiskOnKey
+	0012  TravelDrive 2C
+	0014  TravelDrive 2C
+	0015  Kingston DataTraveler ELITE
+	0016  Kingston DataTraveler U3
+	0020  TravelDrive Intuix U3 2GB
+	0021  TravelDrive
+	0022  TravelDrive
+	0023  TravelDrive
+	0024  TravelDrive
+	0025  TravelDrive
+	0026  TravelDrive
+	0027  TravelDrive
+	0028  TravelDrive
+	0029  TravelDrive
+	0030  TravelDrive
+	0822  TravelDrive 2C
+	0832  Hi-Speed Mass Storage Device
+	0834  M-Disk 220
+	0998  Kingston Data Traveler2.0 Disk Driver
+	0999  Kingston Data Traveler2.0 Disk Driver
+	1000  TravelDrive 2C
+	2000  TravelDrive 2C
+	2038  TravelDrive
+	2039  TravelDrive
+	204a  TravelDrive
+	204b  TravelDrive
+08ed  MediaTek Inc.
+	0002  CECT M800 memory card
 08ee  CCSI/Hesso
 08f0  Corex Technologies
+	0005  CardScan 800c
 08f1  CTI Electronics Corp.
+08f2  Gotop Information Inc.
+	007f  Super Q2 Tablet
 08f5  SysTec Co., Ltd
 08f6  Logic 3 International, Ltd
 08f7  Vernier
 	0001  LabPro
-	0002  EasyTemp
+	0002  EasyTemp/Go!Temp
+	0003  Go!Link
+	0004  Go!Motion
 08f8  Keen Top International Enterprise Co., Ltd
 08f9  Wipro Technologies
 08fa  Caere
 08fb  Socket Communications
 08fc  Sicon Cable Technology Co., Ltd
 08fd  Digianswer A/S
+	0001  Bluetooth Device
 08ff  AuthenTec, Inc.
+	1600  AES1600
+	1610  AES1600
+	1660  AES1660 Fingerprint Sensor
+	1680  AES1660 Fingerprint Sensor
+	168f  AES1660 Fingerprint Sensor
+	2500  AES2501
+	2501  AES2501
+	2502  AES2501
+	2503  AES2501
+	2504  AES2501
+	2505  AES2501
+	2506  AES2501
+	2507  AES2501
+	2508  AES2501
+	2509  AES2501
+	250a  AES2501
+	250b  AES2501
+	250c  AES2501
+	250d  AES2501
+	250e  AES2501
+	250f  AES2501
+	2510  AES2510
+	2550  AES2550 Fingerprint Sensor
+	2580  AES2501 Fingerprint Sensor
+	2588  AES2501
+	2589  AES2501
+	258a  AES2501
+	258b  AES2501
+	258c  AES2501
+	258d  AES2501
+	258e  AES2501
+	258f  AES2501
+	2660  AES2660 Fingerprint Sensor
+	2680  AES2660 Fingerprint Sensor
+	268f  AES2660 Fingerprint Sensor
+	2810  AES2810
+	3400  AES3400 TruePrint Sensor
+	3401  AES3400 Sensor
+	3402  AES3400 Sensor
+	3403  AES3400 Sensor
+	3404  AES3400 TruePrint Sensor
+	3405  AES3400 TruePrint Sensor
+	3406  AES3400 TruePrint Sensor
+	3407  AES3400 TruePrint Sensor
+	4902  BioMV with TruePrint AES3500
+	4903  BioMV with TruePrint AES3400
+	5500  AES4000
+	5501  AES4000 TruePrint Sensor
+	5503  AES4000 TruePrint Sensor
+	5505  AES4000 TruePrint Sensor
+	5507  AES4000 TruePrint Sensor
+	55ff  AES4000 TruePrint Sensor.
+	5700  AES3500 Fingerprint Reader
+	5701  AES3500 TruePrint Sensor
+	5702  AES3500 TruePrint Sensor
+	5703  AES3500 TruePrint Sensor
+	5704  AES3500-BZ TruePrint Sensor
+	5705  AES3500-BZ TruePrint Sensor
+	5706  AES3500-BZ TruePrint Sensor
+	5707  AES3500-BZ TruePrint Sensor
+	5710  AES3500 TruePrint Sensor
+	5711  AES3500 TruePrint Sensor
+	5712  AES3500 TruePrint Sensor
+	5713  AES3500 TruePrint Sensor
+	5714  AES3500-BZ TruePrint Sensor
+	5715  AES3500-BZ TruePrint Sensor
+	5716  AES3500-BZ TruePrint Sensor
+	5717  AES3500-BZ TruePrint Sensor
+	5730  AES3500 TruePrint Sensor
+	5731  AES3500 TruePrint Sensor
+	5732  AES3500 TruePrint Sensor
+	5733  AES3500 TruePrint Sensor
+	5734  AES3500-BZ TruePrint Sensor
+	5735  AES3500-BZ TruePrint Sensor
+	5736  AES3500-BZ TruePrint Sensor
+	5737  AES3500-BZ TruePrint Sensor
+	afe3  FingerLoc Sensor Module (Anchor)
+	afe4  FingerLoc Sensor Module (Anchor)
+	afe5  FingerLoc Sensor Module (Anchor)
+	afe6  FingerLoc Sensor Module (Anchor)
+	fffd  AES2510 Sensor (USB Emulator)
+	ffff  Sensor (Emulator)
 0900  Pinnacle Systems, Inc.
 0901  VST Technologies
+	0001  Hard Drive Adapter (TPP)
+	0002  SigmaDrive Adapter (TPP)
 0906  Faraday Technology Corp.
+0908  Siemens AG
+	01f4  SIMATIC NET CP 5711
+	01fe  SIMATIC NET PC Adapter A2
+	04b1  MediSET
+	04b2  NC interface
+	04b3  keyboard front panel Cockpit
+	04b4  SCR_CCID
+	2701  ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA
 0909  Audio-Technica Corp.
 090a  Trumpion Microelectronics, Inc.
+	1001  T33520 Flash Card Controller
+	1100  Comotron C3310 MP3 player
+	1200  MP3 player
 	1540  Digitex Container Flash Disk
 090b  Neurosmith
-090c  Feiya Technology Corp.
-	1000  Memory Bar
+090c  Silicon Motion, Inc. - Taiwan (formerly Feiya Technology Corp.)
+	0371  Silicon Motion SM371 Camera
+	0373  Silicon Motion Camera
+	037a  Silicon Motion Camera
+	037b  Silicon Motion Camera
+	037c  300k Pixel Camera
+	1000  Flash Drive
+	1132  5-in-1 Card Reader
+	337b  Silicon Motion Camera
+	3710  Silicon Motion Camera
+	3720  Silicon Motion Camera
+	37bc  HP Webcam-101 Integrated Camera
+	37c0  Silicon Motion Camera
+	6000  SD/SDHC Card Reader (SG365 / FlexiDrive XC+)
+	6200  microSD card reader
+	71b3  SM731 Camera
+	837b  Silicon Motion Camera
+	937b  Silicon Motion Camera
+	b370  Silicon Motion SM370 Camera
+	b371  Silicon Motion SM371 Camera
+	f37d  Endoscope camera
 090d  Multiport Computer Vertriebs GmbH
 090e  Shining Technology, Inc.
 090f  Fujitsu Devices, Inc.
 0910  Alation Systems, Inc.
 0911  Philips Speech Processing
+	0c1c  SpeechMike III
+	149a  SpeechMike II Pro Plus LFH5276
+	2512  SpeechMike Pro
 0912  Voquette, Inc.
 0915  GlobeSpan, Inc.
+	0001  DSL Modem
+	0002  ADSL ATM Modem
+	0005  LAN Modem
+	2000  802.11 Adapter
+	2002  802.11 Adapter
+	8000  ADSL LAN Modem
+	8005  DSL-302G Modem
+	8101  ADSL WAN Modem
+	8102  DSL-200 ADSL Modem
+	8103  DSL-200 ADSL Modem
+	8104  DSL-200 Modem
+	8400  DSL Modem
+	8401  DSL Modem
+	8402  DSL Modem
+	8500  DSL Modem
+	8501  DSL Modem
 0917  SmartDisk Corp.
+	0001  eFilm Reader-11 SM/CF
+	0002  eFilm Reader-11 SM
+	0003  eFilm Reader-11 CF
+	0200  FireFly
+	0201  FireLite
+	0202  STORAGE ADAPTER (FirePower)
+	0204  FlashTrax Storage
+	0205  STORAGE ADAPTER (CrossFire)
+	0206  FireFly 20G HDD
+	0207  FireLite
+	020f  STORAGE ADAPTER (FireLite)
+	da01  eFilm Reader-11 Test
+	ffff  eFilm Reader-11 (Class/PDR)
 0919  Tiger Electronics
 	0100  Fast Flicks Digital Camera
 091e  Garmin International
-	0003  GPSmap (various models)
-	0004  Garmin iQue 3600
+	0003  GPS (various models)
+	0004  iQue 3600
+	0200  Data Card Programmer (install)
+	086e  Forerunner 735XT
+	097f  Forerunner 235
+	1200  Data Card Programmer
+	21a5  etrex Cx (msc)
+	2236  nuvi 360
+	2271  Edge 605/705
+	2295  Colorado 300
+	22b6  eTrex Vista HCx (Mass Storage mode)
+	231b  Oregon 400t
+	2353  Nüvi 205T
+	2380  Oregon series
+	23cc  nüvi 1350
+	2459  GPSmap 62/78 series
+	2491  Edge 800
+	2518  eTrex 10
+	2519  eTrex 30
+	2535  Edge 800
+	253c  GPSmap 62sc
+	255b  Nuvi 2505LM
+	2613  Edge 200 TWN
+	26a1  Nuvi 55
+	2802  fenix 3
+	28db  Drive 5
+	47fb  nuviCam
+	4cdb  Fenix 6
 0920  Echelon Co.
+	7500  Network Interface
 0921  GoHubs, Inc.
+	1001  GoCOM232 Serial
 0922  Dymo-CoStar Corp.
 	0007  LabelWriter 330
 	0009  LabelWriter 310
+	0013  LabelManager 400
+	0019  LabelWriter 400
+	001a  LabelWriter 400 Turbo
+	0020  LabelWriter 450
+	0400  LabelWriter SE450
+	1001  LabelManager PnP
+	8003  M10 Digital Postal Scale
+	8004  M25 Digital Postal Scale
+	8009  S250 Digital Postal Scale
 0923  IC Media Corp.
 	010f  SIIG MobileCam
 0924  Xerox
+	23dd  DocuPrint M760 (X760_USB)
+	3ce8  Phaser 3428 Printer
+	3cea  Phaser 3125
+	3cec  Phaser 3250
+	3d5b  Phaser 6115MFP TWAIN Scanner
+	3d6d  WorkCentre 6015N/NI
+	420f  WorkCentre PE220 Series
+	421f  M20 Scanner
+	423b  Printing Support
+	4274  Xerox Phaser 3635MFPX
+	ffef  WorkCenter M15
+	fffb  DocuPrint M750 (X750_USB)
 0925  Lakeview Research
+	0005  Gamtec.,Ltd SmartJoy PLUS Adapter
+	03e8  Wii Classic Controller Adapter
+	1031  WiseGroup Ltd, Gameport Controller
+	1700  PS/SS/N64 Joypad
+	3881  Saleae Logic
 	8101  Phidgets, Inc., 1-Motor PhidgetServo v2.0
 	8104  Phidgets, Inc., 4-Motor PhidgetServo v2.0
 	8800  WiseGroup Ltd, MP-8800 Quad Joypad
 	8866  WiseGroup Ltd, MP-8866 Dual Joypad
 0927  Summus, Ltd
-0928  Oxford Semiconductor, Ltd
+0928  PLX Technology, Inc. (formerly Oxford Semiconductor, Ltd)
+	8000  Firmware uploader
+	ffff  Blank Oxford Device
 0929  American Biometric Co.
 092a  Toshiba Information & Industrial Sys. And Services
 092b  Sena Technologies, Inc.
+	4210  20S - Bluetooth Motorcycle headset & universal intercom
+092f  Northern Embedded Science/CAVNEX
+	0004  JTAG-4
+	0005  JTAG-5
 0930  Toshiba Corp.
-	0009  Toshiba Gigabeat (HDD audio player)
+	0009  Gigabeat F/X (HDD audio player)
+	000c  Gigabeat F (mtp)
+	0010  Gigabeat S (mtp)
+	01bf  2.5"External Hard Disk
+	0200  Integrated Bluetooth (Taiyo Yuden)
+	021c  Atheros AR3012 Bluetooth
+	0301  PCX1100U Cable Modem (WDM)
+	0302  PCX2000 Cable Modem (WDM)
+	0305  Cable Modem PCX3000
+	0307  Cable Modem PCX2500
+	0308  PCX2200 Cable Modem (WDM)
+	0309  PCX5000 Cable Modem (WDM)
+	030b  Cable Modem PCX2600
+	0501  Bluetooth Controller
+	0502  Integrated Bluetooth
+	0503  Bluetooth Controller
+	0505  Integrated Bluetooth
+	0506  Integrated Bluetooth
+	0507  Bluetooth Adapter
+	0508  Integrated Bluetooth HCI
+	0509  BT EDR Dongle
+	0706  PocketPC e740
+	0707  Pocket PC e330 Series
+	0708  Pocket PC e350 Series
+	0709  Pocket PC e750 Series
+	070a  Pocket PC e400 Series
+	070b  Pocket PC e800 Series
+	0a07  WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]
+	0a08  WLM-20U2/GN-1080 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]
+	0a0b  WLU5053 802.11abgn Wireless Module [Broadcom BCM43236B]
+	0a13  AX88179 Gigabit Ethernet [Toshiba]
+	0b05  PX1220E-1G25 External hard drive
+	0b09  PX1396E-3T01 External hard drive
+	0b1a  STOR.E ALU 2S
+	1300  Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port
+	1301  Wireless Broadband (CDMA EV-DO) Minicard Status Port
+	1302  Wireless Broadband (3G HSDPA) SM-Bus Minicard Status Port
+	1303  Wireless Broadband (3G HSDPA) Minicard Status Port
+	1308  Broadband (3G HSDPA) SM-Bus Minicard Diagnostics Port
+	130b  F3507g Mobile Broadband Module
+	130c  F3607gw Mobile Broadband Module
+	1311  F3607gw v2 Mobile Broadband Module
+	1400  Memory Stick 2GB
+	140b  Memory Stick 64GB
+	642f  TravelDrive
+	6506  TravelDrive 2C
+	6507  TravelDrive 2C
+	6508  TravelDrive 2C
+	6509  TravelDrive 2C
+	6510  TravelDrive 2C
+	6517  TravelDrive 2C
+	6518  TravelDrive 2C
 	6519  Kingston DataTraveler 2.0 USB Stick
-	6533  512M USB Stick
+	651a  TravelDrive 2C
+	651b  TravelDrive 2C
+	651c  TravelDrive 2C
+	651d  TravelDrive 2C
+	651e  TravelDrive 2C
+	651f  TravelDrive 2C
+	6520  TravelDrive 2C
+	6521  TravelDrive 2C
+	6522  TravelDrive 2C
+	6523  TravelDrive
+	6524  TravelDrive
+	6525  TravelDrive
+	6526  TravelDrive
+	6527  TravelDrive
+	6528  TravelDrive
+	6529  TravelDrive
+	652a  TravelDrive
+	652b  TravelDrive
+	652c  TravelDrive
+	652d  TravelDrive
+	652f  TravelDrive
+	6530  TravelDrive
+	6531  TravelDrive
+	6532  256M Stick
+	6533  512M Stick
+	6534  TravelDrive
+	653c  Kingston DataTraveler 2.0 Stick (512M)
+	653d  Kingston DataTraveler 2.0 Stick (1GB)
+	653e  Flash Memory
+	6540  TransMemory Flash Memory
+	6544  TransMemory-Mini / Kingston DataTraveler 2.0 Stick
+	6545  Kingston DataTraveler 102/2.0 / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick
+	a002  SunplusIT SATA bridge
 0931  Harmonic Data Systems, Ltd
 0932  Crescentec Corp.
+	0300  VideoAdvantage
+	0302  Syntek DC-112X
+	0320  VideoAdvantage
+	0482  USB2.0 TVBOX
+	1100  DC-1100 Video Enhamcement Device
+	1112  Veo Web Camera
+	a311  Video Enhancement Device
 0933  Quantum Corp.
-0934  Netcom Systems
+0934  Spirent Communications
+0936  NuTesla
+	000a  Moebius
+	000b  iMoebius
+	000c  Rhythmedics 6 BioData Integrator
+	000d  Hypurius
+	000e  Millennius
+	000f  Purius
+	0030  Composite Device, Mass Storage Device (Flash Drive) amd HID
+	003c  Rhythmedics HID Bootloader
 0939  Lumberg, Inc.
+	0b15  Toshiba Stor.E Alu 2
+	0b16  Toshiba StorE HDD
 093a  Pixart Imaging, Inc.
+	0007  CMOS 100K-R Rev. 1.90
 	010e  Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A
 	010f  Argus DC-1610/DC-1620/Emprex PCD3600/Philips P44417B keychain camera/Precision Mini,Model HA513A/Vivitar Vivicam 55
-	2468  Easy Snap Snake Eye WebCam
+	020f  Bullet Line Photo Viewer
+	050f  Mars-Semi Pc-Camera
+	2460  Q-TEC WEBCAM 100
+	2468  SoC PC-Camera
+	2470  SoC PC-Camera
+	2471  SoC PC-Camera
 	2500  USB Optical Mouse
+	2510  Optical Mouse
+	2521  Optical Mouse
+	2600  Typhoon Easycam USB 330K (newer)/Typhoon Easycam USB 2.0 VGA 1.3M/Sansun SN-508
+	2601  SPC 610NC Laptop Camera
+	2603  PAC7312 Camera
+	2608  PAC7311 Trust WB-3300p
+	260e  PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350
+	260f  PAC7311 SnakeCam
+	2621  PAC731x Trust Webcam
+	2622  Webcam Genius
+	2624  Webcam
+	2628  Webcam Genius iLook 300
+	2700  GE 1.3 MP MiniCam Pro
 093b  Plextor Corp.
+	0010  Storage Adapter
+	0011  PlexWriter 40/12/40U
+	0012  PlexWriter 48/24/48U
+	0041  PX-708A DVD RW
 	0042  PX-712UF DVD RW
+	a002  ConvertX M402U XLOADER
+	a003  ConvertX AV100U A/V Capture Audio
+	a004  ConvertX TV402U XLOADER
+	a005  ConvertX TV100U A/V Capture
+	a102  ConvertX M402U A/V Capture
+	a104  ConvertX PX-TV402U/NA
 093c  Intrepid Control Systems, Inc.
 	0601  ValueCAN
+	0701  NeoVI Blue vehicle bus interface
 093d  InnoSync, Inc.
 093e  J.S.T. Mfg. Co., Ltd
 093f  Olympia Telecom Vertriebs GmbH
@@ -3069,6 +11968,14 @@
 0942  i2Go.com, LLC
 0943  HCL Technologies India Private, Ltd
 0944  KORG, Inc.
+	0001  PXR4 4-Track Digital Recorder
+	0020  KAOSS Pad KP3 Dynamic Effect/Sampler
+	0023  KAOSSILATOR PRO Dynamic Phrase Synthesizer
+	010d  nanoKEY MIDI keyboard
+	010e  nanoPAD pad controller
+	010f  nanoKONTROL studio controller
+	0117  nanoKONTROL2 MIDI Controller
+	0f03  K-Series K61P MIDI studio controller
 0945  Pasco Scientific
 0948  Kronauer music in digital
 	0301  USB Pro (24/48)
@@ -3077,60 +11984,177 @@
 	0304  USB Pro (16/48)
 	1105  USB One
 094b  Linkup Systems Corp.
+	0001  neonode N2
 094d  Cable Television Laboratories
+094f  Yano
+	0101  U640MO-03
+	05fc  METALWEAR-HDD
 0951  Kingston Technology
+	0008  Ethernet
 	000a  KNU101TX 100baseTX Ethernet
-	1600  Data Traveler II Pen Drive
+	1539  Iron Key D300 (Virtual CD-ROM and USB Stick)
+	1600  DataTraveler II Pen Drive
+	1601  DataTraveler II+ Pen Drive
+	1602  DataTraveler Mini
+	1603  DataTraveler 1GB/2GB Pen Drive
+	1606  Eee PC 701 SD Card Reader [ENE UB6225]
+	1607  DataTraveler 100
+	160b  DataTraveler 2.0 (2GB)
+	160d  DataTraveler Vault Privacy
+	160e  DT110P/1GB Capless
+	1613  DataTraveler DT101C Flash Drive
+	1616  DataTraveler Locker 4GB
+	161a  Dell HyperVisor internal flash drive
+	1621  DataTraveler 150 (32GB)
+	1624  DataTraveler G2
+	1625  DataTraveler 101 II
+	162a  DataTraveler 112 4GB Pen Drive
+	162b  DataTraveler HyperX 3.0
+	162d  DataTraveler 102
+	1630  DataTraveler 200 (32GB)
+	1642  DT101 G2
+	1643  DataTraveler G3
+	1653  Data Traveler 100 G2 8 GiB
+	1656  DataTraveler Ultimate G2
+	1660  Data Traveller 108
+	1665  Digital DataTraveler SE9
+	1666  DataTraveler 100 G3/G4/SE9 G2/50
+	1689  DataTraveler SE9
+	168a  DataTraveler Micro
+	168c  DT Elite 3.0
+	16a4  HyperX 7.1 Audio
+	16b3  HyperX Savage
+	16d2  HX-KB4BL1-US [HYPERX Alloy FPS Pro]
+	16d4  HyperX SavageEXO [0382]
+	16d5  DataTraveler Elite G2
+	16df  HyperX QuadCast
+	16e4  HyperX Pulsefire Raid
 0954  RPM Systems Corp.
-0955  NVidia Corp.
+0955  NVIDIA Corp.
+	7005  Bootloader
+	7018  T186 [Tegra Parker]
+	701a  U-Boot running on Tegra
+	7020  L4T (Linux for Tegra) running on Tegra
+	7030  T30 [Tegra 3] recovery mode
+	7100  Tegra Device
+	7140  T124 [Tegra K1/Logan 32-bit]
+	7210  SHIELD Controller
+	7321  Switch [Tegra Erista] recovery mode
+	7721  T210 [TX1 Tegra Erista] recovery mode
+	7820  T20 [Tegra 2] recovery mode
+	7c18  T186 [TX2 Tegra Parker] recovery mode
+	b400  SHIELD (debug)
+	b401  SHIELD
+	cf05  SHIELD Tablet (debug)
+	cf06  SHIELD Tablet
+	cf07  SHIELD Tablet
+	cf08  SHIELD Tablet
+	cf09  SHIELD Tablet
 0956  BSquare Corp.
 0957  Agilent Technologies, Inc.
+	0200  E-Video DC-350 Camera
+	0202  E-Video DC-350 Camera
+	0407  33220A Waveform Generator
+	0518  82357B GPIB Interface
+	0a07  34411A Multimeter
+	1507  33210A Waveform Generator
+	1745  Test and Measurement Device (IVI)
+	1f01  N5181A MXG Analog Signal Generator
+	2918  U2702A oscilloscope
+	fb18  LC Device
 0958  CompuLink Research, Inc.
 0959  Cologne Chip AG
+	2bd0  Intelligent ISDN (Ver. 3.60.04) [HFC-S]
 095a  Portsmith
+	3003  Express Ethernet
 095b  Medialogic Corp.
 095c  K-Tec Electronics
 095d  Polycom, Inc.
-0967  Acer (??)
+	0001  Polycom ViaVideo
+0964  BITRAN
+0967  Acer NeWeb Corp.
 	0204  WarpLink 802.11b Adapter
 0968  Catalyst Enterprises, Inc.
+096e  Feitian Technologies, Inc.
+	0005  ePass2000
+	0006  HID Dongle (for OEMs - manufacturer string is "OEM")
+	0120  Microcosm Ltd Dinkey
+	0305  ePass2000Auto
+	0309  ePass3000GM
+	0401  ePass3000
+	0405  Zzkey Dongle
+	0608  SC Reader KP382
+	0702  ePass3003
+	0703  ePass3003Auto
+	0802  ePass2000 (G&D STARCOS SPK 2.4)
+	0807  ePass2003
 0971  Gretag-Macbeth AG
+	2000  i1 Pro
+	2001  i1 Monitor
+	2003  Eye-One display
+	2005  Huey
+	2007  ColorMunki Photo
 0973  Schlumberger
+	0001  e-gate Smart Card
 0974  Datagraphix, a business unit of Anacomp
 0975  OL'E Communications, Inc.
 0976  Adirondack Wire & Cable
 0977  Lightsurf Technologies
 0978  Beckhoff GmbH
 0979  Jeilin Technology Corp., Ltd
+	0222  Keychain Display
+	0224  JL2005A Toy Camera
+	0226  JL2005A Toy Camera
+	0227  JL2005B/C/D Toy Camera
 097a  Minds At Work LLC
+	0001  Digital Wallet
 097b  Knudsen Engineering, Ltd
 097c  Marunix Co., Ltd
 097d  Rosun Technologies, Inc.
+097e  Biopac Systems Inc.
+	0035  MP35 v1.0
 097f  Barun Electronics Co., Ltd
 0981  Oak Technology, Ltd
 0984  Apricorn
+	0040  SATA Wire (2.5")
+	0200  Hard Drive Storage (TPP)
+	1407  Secure Key 3.0
 0985  cab Produkttechnik GmbH & Co KG
+	0045  Mach4/200 Label Printer
 	00a3  A3/200 or A3/300 Label Printer
+0986  Matsushita Electric Works, Ltd.
 098c  Vitana Corp.
 098d  INDesign
 098e  Integrated Intellectual Property, Inc.
 098f  Kenwood TMI Corp.
 0993  Gemstar eBook Group, Ltd
 	0001  REB1100 eBook Reader
+	0002  eBook
 0996  Integrated Telecom Express, Inc.
 099a  Zippy Technology Corp.
+	0638  Sanwa Supply Inc. Small Keyboard
+	2620  Graphics tablet [Polostar PT1001, Zeniq PT1001, Leogics PT1001]
 	610c  EL-610 Super Mini Electron luminescent Keyboard
+	6330  SANWA Supply Inc. Slim Keyboard
+	713a  WK-713 Multimedia Keyboard
+	7160  Hyper Slim Keyboard
+099e  Trimble Navigation, Ltd
 09a3  PairGain Technologies
 09a4  Contech Research, Inc.
 09a5  VCON Telecommunications
 09a6  Poinchips
+	8001  Mass Storage Device
 09a7  Data Transmission Network Corp.
 09a8  Lin Shiung Enterprise Co., Ltd
 09a9  Smart Card Technologies Co., Ltd
 09aa  Intersil Corp.
 	1000  Prism GT 802.11b/g Adapter
 	3642  Prism 2.x 802.11b Adapter
+09ab  Japan Cash Machine Co., Ltd.
 09ae  Tripp Lite
+	0002  Any Device (see discussion)
+09b0  Fargo
+	2400  HDP5000
 09b2  Franklin Electronic Publishers, Inc.
 	0001  eBookman Palm Computer
 09b3  Altius Solutions, Inc.
@@ -3142,104 +12166,276 @@
 	0001  MySmartPad
 09bf  Auerswald GmbH & Co. KG
 	00c0  COMpact 2104 ISDN PBX
-	00db  COMpact 4410/2206 ISDN ISDN
-	00f1  COMfort System Telephones
+	00db  COMpact 4410/2206 ISDN
+	00dc  COMpact 4406 DSL (PBX)
+	00dd  COMpact 2204 (PBX)
+	00de  COMpact 2104 (Rev.2 PBX)
+	00e0  COMmander Business (PBX)
+	00e2  COMmander Basic.2 (PBX)
+	00f1  COMfort 2000 (System telephone)
+	00f2  COMfort 1200 (System telephone)
+	00f5  COMfortel 2500 (System telephone)
+	8000  COMpact 2104 DSL (DSL modem)
+	8001  COMpact 4406 DSL (DSL modem)
+	8002  Analog/ISDN Converter (Line converter)
+	8005  WG-640 (Automatic event dialer)
+09c0  Genpix Electronics, LLC
+	0136  Axon CNS, MultiClamp 700B
+	0202  8PSK DVB-S tuner
+	0203  Skywalker-1 DVB-S tuner
+	0204  Skywalker-CW3K DVB-S tuner
+	0205  Skywalker-CW3K DVB-S tuner
+	0206  Skywalker-2 DVB-S tuner
 09c1  Arris Interactive LLC
+	1337  TOUCHSTONE DEVICE
 09c2  Nisca Corp.
-09c3  ActivCard, Inc.
-	0008  SmartCard Reader
+09c3  HID Global
+	0007  Reader V2
+	0008  ZFG-9800-AC SmartCard Reader
+	0014  ActivIdentity ActivKey SIM USB Token
+	0028  Crescendo Key
+	0029  Crescendo Key
+	002a  Crescendo Key
+	002b  Crescendo Key
+	002c  Crescendo Key
+	002e  Crescendo Key
 09c4  ACTiSYS Corp.
 	0011  ACT-IR2000U IrDA Dongle
 09c5  Memory Corp.
+09ca  BMC Messsysteme GmbH
+	5544  PIO
+09cb  FLIR Systems
+	1001  Network Adapter
+	1002  Ex-Series RNDIS interface
+	1004  Ex-Series UVC interface
+	1005  Ex-Series RNDIS and UVC interface
+	1006  Ex-Series RNDIS and MSD interface
+	1007  Ex-Series UVC and MSD interface
+	1008  Serial Port
+	1996  FLIR ONE Camera
+	4007  Breach
 09cc  Workbit Corp.
+	0404  BAFO USB-ATA/ATAPI Bridge Controller
 09cd  Psion Dacom Home Networks, Ltd
+	2001  Psion WaveFinder DAB radio receiver
 09ce  City Electronics, Ltd
 09cf  Electronics Testing Center, Taiwan
 09d1  NeoMagic, Inc.
 09d2  Vreelin Engineering, Inc.
 09d3  Com One
-	0001  ISDN TA
+	0001  ISDN TA / Light Rider 128K
+	000b  Bluetooth Adapter class 2
+09d7  Hexagon NovAtel Inc.
+	0100  GPS/GNSS/SPAN sensor
+09d8  ELATEC GmbH
+	0320  TWN3 Multi125
+	0406  TWN4 MIFARE NFC
 09d9  KRF Tech, Ltd
-09da  A4 Tech Co., Ltd
+09da  A4Tech Co., Ltd.
 	0006  Optical Mouse WOP-35 / Trust 450L Optical Mouse
+	000a  Optical Mouse Opto 510D / OP-620D
+	000e  X-F710F Optical Mouse 3xFire Gaming Mouse
+	0018  Trust Human Interface Device
 	001a  Wireless Mouse & RXM-15 Receiver
 	002a  Wireless Optical Mouse NB-30
+	022b  Wireless Mouse (Battery Free)
+	024f  RF Receiver and G6-20D Wireless Optical Mouse
+	0260  KV-300H Isolation Keyboard
+	032b  Wireless Mouse (Battery Free)
+	09da  Bloody V8 Mouse
+	1068  Bloody A90 Mouse
+	112c  Bloody V5 Mouse
+	3a60  Bloody V8M Core 2 Mouse
+	8090  X-718BK Oscar Optical Gaming Mouse
+	9033  X-718BK Optical Mouse
+	9066  F3 V-Track Gaming Mouse
+	9090  XL-730K / XL-750BK / XL-755BK Mice
+	f613  Bloody V7M Mouse
 09db  Measurement Computing Corp.
 	0075  MiniLab 1008
 	0076  PMD-1024
-	007A  PMD-1208LS
+	007a  PMD-1208LS
+	0081  USB-1616FS
+	0082  USB-1208FS
+	0088  USB-1616FS internal hub
 09dc  Aimex Corp.
 09dd  Fellowes, Inc.
 09df  Addonics Technologies Corp.
 09e1  Intellon Corp.
+	5121  MicroLink dLAN
 09e5  Jo-Dan International, Inc.
 09e6  Silutia, Inc.
 09e7  Real 3D, Inc.
 09e8  AKAI  Professional M.I. Corp.
+	0045  MPK Mini Mk II MIDI Controller
+	0062  MPD16 MIDI Pad Controller Unit
+	006d  EWI electronic wind instrument
+	0071  MPK25 MIDI Keyboard
+	0076  LPK25 MIDI Keyboard
 09e9  Chen-Source, Inc.
 09eb  IM Networks, Inc.
 	4331  iRhythm Tuner Remote
 09ef  Xitel
 	0101  MD-Port DG2 MiniDisc Interface
+09f3  GoFlight, Inc.
+	0018  GF-46 Multi-Mode Display Module
+	0028  RP-48 Combination Pushbutton-Rotary Module
+	0048  LGTII - Landing Gear and Trim Control Module
+	0064  MCPPro - Airliner Mode Control Panel (Autopilot)
+	0300  EFIS - Electronic Flight Information System
 09f5  AresCom
+	0168  Network Adapter
+	0188  LAN Adapter
+	0850  Adapter
 09f6  RocketChips, Inc.
 09f7  Edu-Science (H.K.), Ltd
 09f8  SoftConnex Technologies, Inc.
 09f9  Bay Associates
 09fa  Mtek Vision
 09fb  Altera
+	6001  Blaster
 09ff  Gain Technology Corp.
 0a00  Liquid Audio
 0a01  ViA, Inc.
+0a05  Unknown Manufacturer
+	0001  Hub
+	7211  hub
 0a07  Ontrak Control Systems Inc.
 	0064  ADU100 Data Acquisition Interface
+	0078  ADU120 Data Acquisition Interface
+	0082  ADU130 Data Acquisition Interface
 	00c8  ADU200 Relay I/O Interface
-	00d0  ADU208 Data Acquisition Interface
+	00d0  ADU208 Relay I/O Interface
+	00da  ADU218 Solid-State Relay I/O Interface
 0a0b  Cybex Computer Products Co.
+0a0d  Servergy, Inc
+	2514  CTS-1000 Internal Hub
 0a11  Xentec, Inc.
 0a12  Cambridge Silicon Radio, Ltd
 	0001  Bluetooth Dongle (HCI mode)
+	0002  Frontline Test Equipment Bluetooth Device
+	0003  Nanosira
+	0004  Nanosira WHQL Reference Radio
+	0005  Nanosira-Multimedia
+	0006  Nanosira-Multimedia WHQL Reference Radio
+	0007  Nanosira3-ROM
+	0008  Nanosira3-ROM
+	0009  Nanosira4-EDR WHQL Reference Radio
+	000a  Nanosira4-EDR-ROM
+	000b  Nanosira5-ROM
+	0042  SPI Converter
+	0043  Bluetooth Device
+	0100  Casira with BlueCore2-External Module
+	0101  Casira with BlueCore2-Flash Module
+	0102  Casira with BlueCore3-Multimedia Module
+	0103  Casira with BlueCore3-Flash Module
+	0104  Casira with BlueCore4-External Module
+	0105  Casira with BlueCore4-Multimedia Module
 	1000  Bluetooth Dongle (HID proxy mode)
+	1010  Bluetooth Device
+	1011  Bluetooth Device
+	1012  Bluetooth Device
+	ffff  USB Bluetooth Device in DFU State
 0a13  Telebyte, Inc.
 0a14  Spacelabs Medical, Inc.
 0a15  Scalar Corp.
 0a16  Trek Technology (S) PTE, Ltd
+	1111  ThumbDrive
+	8888  IBM USB Memory Key
 	9988  Trek2000 TD-G2
 0a17  Pentax Corp.
-	0004  Pentax Optio 330
-	0006  Pentax Optio S
-	0007  Pentax Optio 550
-	0009  Pentax Optio 33WR
-	000a  Pentax Optio 555
-	000c  Pentax Optio 43WR (mass storage mode)
-	000d  Pentax Optio 43WR
-	0015  Pentax Optio S40/S5i
-	003b  Pentax Optio 50 (mass storage mode)
-	003d  Pentax Optio S55
-	0043  Pentax *ist DL
-	0047  Pentax Optio S60
+	0004  Optio 330
+	0006  Optio S / S4
+	0007  Optio 550
+	0009  Optio 33WR
+	000a  Optio 555
+	000c  Optio 43WR (mass storage mode)
+	000d  Optio 43WR
+	0015  Optio S40/S5i
+	003b  Optio 50 (mass storage mode)
+	003d  Optio S55
+	0041  Optio S5z
+	0043  *ist DL
+	0047  Optio S60
+	0052  Optio 60 Digital Camera
+	006e  K10D
+	0070  K100D
+	0093  K200D
+	00a7  Optio E50
+	1001  EI2000 Camera powered by Digita!
 0a18  Heidelberger Druckmaschinen AG
 0a19  Hua Geng Technologies, Inc.
 0a21  Medtronic Physio Control Corp.
+	8001  MMT-7305WW [Medtronic Minimed CareLink]
 0a22  Century Semiconductor USA, Inc.
+0a27  Datacard Group
+	0102  SP35
 0a2c  AK-Modul-Bus Computer GmbH
 	0008  GPIO Ports
+0a34  TG3 Electronics, Inc.
+	0101  TG82tp
+	0110  Deck 82-key backlit keyboard
+0a35  Radikal Technologies
+	002a  SAC - Software Assigned Controller
+	008a  SAC Hub
 0a39  Gilat Satellite Networks, Ltd
 0a3a  PentaMedia Co., Ltd
+	0163  KN-W510U 1.0 Wireless LAN Adapter
 0a3c  NTT DoCoMo, Inc.
 0a3d  Varo Vision
 0a3f  Swissonic AG
 0a43  Boca Systems, Inc.
 0a46  Davicom Semiconductor, Inc.
+	0268  ST268
+	6688  ZT6688 Fast Ethernet Adapter
+	8515  ADMtek ADM8515 NIC
+	9000  DM9000E Fast Ethernet Adapter
+	9601  DM9601 Fast Ethernet Adapter
 0a47  Hirose Electric
 0a48  I/O Interconnect
+	3233  Multimedia Card Reader
+	3239  Multimedia Card Reader
 	3258  Dane Elec zMate SD Reader
 	3259  Dane Elec zMate CF Reader
+	5000  MediaGear xD-SM
+	500a  Mass Storage Device
+	500f  Mass Storage Device
+	5010  Mass Storage Device
+	5011  Mass Storage Device
+	5014  Mass Storage Device
+	5020  Mass Storage Device
+	5021  Mass Storage Device
+	5022  Mass Storage Device
+	5023  Mass Storage Device
+	5024  Mass Storage Device
+	5025  Mass Storage Device
+0a4a  Ploytec GmbH
+	a400  AUDIO JUNCTION 2.0
 0a4b  Fujitsu Media Devices, Ltd
 0a4c  Computex Co., Ltd
+	15d9  OPTICAL MOUSE
 0a4d  Evolution Electronics, Ltd
+	0064  MK-225 Driver
+	0065  MK-225C Driver
+	0066  MK-225C Driver
+	0067  MK-425C Driver
+	0078  MK-37 Driver
+	0079  MK-37C Driver
+	007a  MK-37C Driver
+	008c  TerraTec MIDI MASTER
+	008d  MK-249C Driver
 	008e  MK-249C MIDI Keyboard
+	008f  MK-449C Driver
+	0090  Keystation 49e Driver
+	0091  Keystation 61es Driver
+	00a0  MK-361 Driver
+	00a1  MK-361C Driver
+	00a2  MK-361C Driver
 	00a3  MK-461C MIDI Keyboard
+	00b5  Keystation Pro 88 Driver
+	00d2  E-Keys Driver
+	00f0  UC-16 Driver
+	00f1  X-Session Driver
 	00f5  UC-33e MIDI Controller
 0a4e  Steinberg Soft-und Hardware GmbH
 0a4f  Litton Systems, Inc.
@@ -3247,15 +12443,111 @@
 0a51  Sony Electronics, Inc.
 0a52  Jebsee Electronics Co., Ltd
 0a53  Portable Peripheral Co., Ltd
+	1000  Scanner
+	2000  Q-Scan A6 Scanner
+	2001  Q-Scan A6 Scanner
+	2013  Media Drive A6 Scanner
+	2014  Media Drive A6 Scanner
+	2015  BizCardReader 600C
+	2016  BizCardReader 600C
+	202a  Scanshell-CSSN
+	3000  Q-Scan A8 Scanner
+	3002  Q-Scan A8 Reader
+	3015  BizCardReader 300G
+	302a  LM9832 - PA570 Mini Business Card Scanner [Targus]
+	5001  BizCardReader 900C
 0a5a  Electronics For Imaging, Inc.
 0a5b  EAsics NV
 0a5c  Broadcom Corp.
-	200a  Bluetooth dongle
+	0201  iLine10(tm) Network Adapter
+	0bdc  802.11a/b/g/n/ac Wireless Adapter
+	2000  Bluetooth Device
+	2001  Bluetooth Device
+	2009  BCM2035 Bluetooth
+	200a  BCM2035 Bluetooth dongle
+	200f  Bluetooth Controller
+	201d  Bluetooth Device
+	201e  IBM Integrated Bluetooth IV
+	2020  Bluetooth dongle
+	2021  BCM2035B3 Bluetooth Adapter
 	2033  BCM2033 Bluetooth
 	2035  BCM2035 Bluetooth
+	2038  Blutonium Device
+	2039  BCM2045 Bluetooth
+	2045  Bluetooth Controller
+	2046  Bluetooth Device
+	2047  Bluetooth Device
+	205e  Bluetooth Device
+	2100  Bluetooth 2.0+eDR dongle
+	2101  BCM2045 Bluetooth
+	2102  ANYCOM Blue USB-200/250
+	2110  BCM2045B (BDC-2) [Bluetooth Controller]
+	2111  ANYCOM Blue USB-UHE 200/250
+	2120  2045 Bluetooth 2.0 USB-UHE Device with trace filter
+	2121  BCM2210 Bluetooth
+	2122  Bluetooth 2.0+EDR dongle
+	2123  Bluetooth dongle
+	2130  2045 Bluetooth 2.0 USB-UHE Device with trace filter
+	2131  2045 Bluetooth 2.0 Device with trace filter
+	2145  BCM2045B (BDC-2.1) [Bluetooth Controller]
+	2148  BCM92046DG-CL1ROM Bluetooth 2.1 Adapter
+	2150  BCM2046 Bluetooth Device
+	2151  Bluetooth
+	2154  BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle
+	216a  BCM43142A0 Bluetooth
+	216c  BCM43142A0 Bluetooth Device
+	216d  BCM43142A0 Bluetooth 4.0
+	216f  BCM20702A0 Bluetooth
+	217d  HP Bluethunder
+	217f  BCM2045B (BDC-2.1)
+	2198  Bluetooth 3.0 Device
+	219b  Bluetooth 2.1 Device
+	21b1  HP Bluetooth Module
+	21b4  BCM2070 Bluetooth 2.1 + EDR
+	21b9  BCM2070 Bluetooth 2.1 + EDR
+	21ba  BCM2070 Bluetooth 2.1 + EDR
+	21bb  BCM2070 Bluetooth 2.1 + EDR
+	21bc  BCM2070 Bluetooth 2.1 + EDR
+	21bd  BCM2070 Bluetooth 2.1 + EDR
+	21d7  BCM43142 Bluetooth 4.0
+	21e1  HP Portable SoftSailing
+	21e3  HP Portable Valentine
+	21e6  BCM20702 Bluetooth 4.0 [ThinkPad]
+	21e8  BCM20702A0 Bluetooth 4.0
+	21ec  BCM20702A0 Bluetooth 4.0
+	21f1  HP Portable Bumble Bee
+	22be  BCM2070 Bluetooth 3.0 + HS
+	4500  BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth)
+	4502  Keyboard (Boot Interface Subclass)
+	4503  Mouse (Boot Interface Subclass)
+	5800  BCM5880 Secure Applications Processor
+	5801  BCM5880 Secure Applications Processor with fingerprint swipe sensor
+	5802  BCM5880 Secure Applications Processor with fingerprint touch sensor
+	5803  BCM5880 Secure Applications Processor with secure keyboard
+	5804  BCM5880 Secure Applications Processor with fingerprint swipe sensor
+	6300  Pirelli Remote NDIS Device
+	6410  BCM20703A1 Bluetooth 4.1 + LE
+	bd11  BCM4320 802.11bg Wireless Adapter
+	bd12  BCM4326U 802.11bg Wireless Adapter
+	bd13  BCM4323 802.11abgn Wireless Adapter
+	bd16  BCM4319 802.11bgn Wireless Adapter
+	bd17  BCM43236 802.11abgn Wireless Adapter
+	bd1d  BCM43526 802.11a/b/g/n/ac (2x2) Wireless Adapter
+	bd1e  BCM43143 802.11bgn (1x1) Wireless Adapter
+	bd1f  BCM43242 802.11abgn Wireless Adapter
+	d11b  Eminent EM4045 [Broadcom 4320 USB]
 0a5d  Diatrend Corp.
 0a5f  Zebra
 	0009  LP2844 Printer
+	0050  P120i / WM120i
+	0080  GK420d Label Printer
+	0081  GK420t Label Printer
+	0084  GX420d Desktop Label Printer
+	008b  HC100 wristbands Printer
+	008c  ZP 450 Printer
+	00d1  Zebra GC420d Label Printer
+	0110  ZD500 Desktop Label Printer
+	930a  Printer
 0a62  MPMan
 	0010  MPMan MP-F40 MP3 Player
 0a66  ClearCube Technology
@@ -3264,13 +12556,18 @@
 0a69  Chroma ate, Inc.
 0a6b  Green House Co., Ltd
 	0001  Compact Flash R/W with MP3 player
+	000f  FlashDisk
 0a6c  Integrated Circuit Systems, Inc.
 0a6d  UPS Manufacturing
 0a6e  Benwin
 0a6f  Core Technology, Inc.
 	0400  Xanboo
 0a70  International Game Technology
+0a71  VIPColor Technologies USA, Inc.
+	0001  VP485 Printer
 0a72  Sanwa Denshi
+0a73  Mackie Designs
+	0002  XD-2 [Spike]
 0a7d  NSTL, Inc.
 0a7e  Octagon Systems Corp.
 0a80  Rexon Technology Corp., Ltd
@@ -3279,72 +12576,226 @@
 	0103  Keyboard
 	0203  Mouse
 	0205  PS/2 Keyboard+Mouse Adapter
+	0701  USB Missile Launcher
+	ff01  Wireless Missile Launcher
 0a82  Syscan
 	4600  TravelScan 460/464
+	6605  ScanShell 800N
 0a83  NextComm, Inc.
 0a84  Maui Innovative Peripherals
 0a85  Idexx Labs
 0a86  NITGen Co., Ltd
+0a89  Aktiv
+	0001  Guardant Stealth/Net
+	0002  Guardant ID
+	0003  Guardant Stealth 2
+	0004  Rutoken
+	0005  Guardant Fidus
+	0006  Guardant Stealth 3
+	0007  Guardant Stealth 2
+	0008  Guardant Stealth 3 Sign/Time
+	0009  Guardant Code
+	000a  Guardant Sign Pro
+	000b  Guardant Sign Pro HID
+	000c  Guardant Stealth 3 Sign/Time
+	000d  Guardant Code HID
+	000f  Guardant System Firmware Update
+	0020  Rutoken S
+	0025  Rutoken lite
+	0026  Rutoken lite HID
+	002a  Rutoken Mass Storage
+	002b  Guardant Mass Storage
+	0030  Rutoken ECP
+	0040  Rutoken ECP HID
+	0060  Rutoken Magistra
+	0061  Rutoken Magistra
+	0069  Reader
+	0080  Rutoken PinPad Ex
+	0081  Rutoken PinPad In
+	0082  Rutoken PinPad 2
 0a8d  Picturetel
 0a8e  Japan Aviation Electronics Industry, Ltd
+	2011  Filter Driver For JAE XMC R/W
 0a90  Candy Technology Co., Ltd
 0a91  Globlink Technology, Inc.
+	3801  Targus PAKP003 Mouse
 0a92  EGO SYStems, Inc.
+	0011  SYS WaveTerminal U2A
+	0021  GIGAPort
+	0031  GIGAPortAG
+	0053  AudioTrak Optoplay
+	0061  Waveterminal U24
+	0071  MAYA EX7
+	0091  Maya 44
+	00b1  MAYA EX5
+	1000  MIDI Mate
+	1010  RoMI/O
+	1020  M4U
+	1030  M8U
+	1090  KeyControl49
+	10a0  KeyControl25
 0a93  C Technologies AB
+	0002  C-Pen 10
+	0005  MyPen Light
+	000d  Input Pen
+	0010  C-Pen 20
+	0a93  PayPen
 0a94  Intersense
 0aa3  Lava Computer Mfg., Inc.
 0aa4  Develco Elektronik
 0aa5  First International Digital
+	0002  irock! 500 Series
+	0801  MP3 Player
 0aa6  Perception Digital, Ltd
 	0101  Hercules Jukebox
-0aa7  Wincor Nixdorf GmbH & Co KG
-	0200  POS Display BA63
-	0201  POS Display BA66
-	0300  POS Printer TH210
-	0302  POS Printer TH220
-	0305  Lottery Printer XiPrintPlus
-	0306  POS Printer TH320
-	0308  POS Printer TH420
+	1501  Store 'n' Go HD Drive
+0aa7  Wincor Nixdorf International GmbH
+	0100  POS Keyboard, TA58P-USB
+	0101  POS Keyboard, TA85P-USB
+	0102  POS Keyboard, TA59-USB
+	0103  POS Keyboard, TA60-USB
+	0104  SNIkey Keyboard, SNIKey-KB-USB
+	0200  Operator Display, BA63-USB
+	0201  Operator Display, BA66-USB
+	0202  Operator Display & Scanner, XiCheck-BA63
+	0203  Operator Display & Scanner, XiCheck-BA66
+	0204  Graphics Operator Display, BA63GV
+	0300  POS Printer (printer class mode), TH210
+	0301  POS Printer (native mode), TH210
+	0302  POS Printer (printer class mode), TH220
+	0303  POS Printer (native mode), TH220
+	0304  POS Printer, TH230
+	0305  Lottery Printer, XiPrintPlus
+	0306  POS Printer (printer class mode), TH320
+	0307  POS Printer (native mode), TH320
+	0308  POS Printer (printer class mode), TH420
+	0309  POS Printer (native mode), TH420
+	030a  POS Printer, TH200B
+	0400  Lottery Scanner, Xiscan S
+	0401  Lottery Scanner, Xiscan 3
+	0402  Programmable Magnetic Swipe Card Reader, MSRP-USB
+	0500  IDE Adapter
+	0501  Hub Printer Interface
+	0502  Hub SNIKey Keyboard
 	4304  Banking Printer TP07
+	4305  Banking Printer TP07c
+	4500  WN Central Special Electronics
 0aa8  TriGem Computer, Inc.
+	0060  TG 11Mbps WLAN Mini Adapter
+	1001  DreamComboM4100
+	3002  InkJet Color Printer
+	8001  TG_iMON
+	8002  TG_KLOSS
+	a001  TG_X2
+	a002  TGVFD_KLOSS
+	ffda  iMON_VFD
 0aa9  Baromtec Co.
 	f01b  Medion MD 6242 MP3 Player
 0aaa  Japan CBM Corp.
 0aab  Vision Shape Europe SA
 0aac  iCompression, Inc.
 0aad  Rohde & Schwarz GmbH & Co. KG
+	0003  NRP-Z21
+	000c  NRP-Z11
+	0013  NRP-Z22
+	0014  NRP-Z23
+	0015  NRP-Z24
+	0016  NRP-Z51
+	0017  NRP-Z52
+	0018  NRP-Z55
+	0019  NRP-Z56
+	0021  NRP-Z91
+	0023  NRP-Z81
+	002c  NRP-Z31
+	002d  NRP-Z37
+	002f  NRP-Z27
+	0051  NRP-Z28
+	0052  NRP-Z98
+	0062  NRP-Z92
+	0070  NRP-Z57
+	0083  NRP-Z85
+	0095  NRP-Z86
+	0117  HMF / HMP / HMS-X / HMO series Oscilloscopes
+	0118  HMF / HMP / HMS-X / HMO series Oscilloscopes
+	0119  HMF / HMP / HMS-X / HMO series Oscilloscopes
 0aae  NEC infrontia Corp. (Nitsuko)
 0aaf  Digitalway Co., Ltd
 0ab0  Arrow Strong Electronics Co., Ltd
+0ab1  FEIG ELECTRONIC GmbH
+	0002  OBID RFID-Reader
+	0004  OBID classic-pro
 0aba  Ellisys
-	8001  USB Tracker 110 Protocol Analyzer
+	8001  Tracker 110 Protocol Analyzer
+	8002  Explorer 200 Protocol Analyzer
 0abe  Stereo-Link
 	0101  SL1200 DAC
+0abf  Diolan
+	3370  I2C/SPI Adapter - U2C-12
 0ac3  Sanyo Semiconductor Company Micro
 0ac4  Leco Corp.
 0ac5  I & C Corp.
 0ac6  Singing Electrons, Inc.
 0ac7  Panwest Corp.
 0ac8  Z-Star Microelectronics Corp.
-	0302  ZC0302 WebCam
-	0321  USB 2.0 Webcam
-	301b  ZC0301 WebCam
-	303b  ZC0303 WebCam
-	305b  ZC0305 WebCam
+	0301  Web Camera
+	0302  ZC0302 Webcam
+	0321  Vimicro generic vc0321 Camera
+	0323  Luxya WC-1200 USB 2.0 Webcam
+	0328  A4Tech PK-130MG
+	0336  Elecom UCAM-DLQ30
+	301b  ZC0301 Webcam
+	303b  ZC0303 Webcam
+	305b  ZC0305 Webcam
+	307b  USB 1.1 Webcam
+	332d  Vega USB 2.0 Camera
+	3343  Sirius USB 2.0 Camera
+	3370  Traveler TV 6500 SF Dia-scanner
+	3420  Venus USB2.0 Camera
+	c001  Sony embedded vimicro Camera
+	c002  Visual Communication Camera VGP-VCC1
+	c302  Vega USB 2.0 Camera
+	c303  Saturn USB 2.0 Camera
+	c326  Namuga 1.3M Webcam
+	c33f  Webcam
+	c412  Lenovo IdeaCentre Web Camera
+	c429  Lenovo ThinkCentre Web Camera
+	c42d  Lenovo IdeaCentre Web Camera
 0ac9  Micro Solutions, Inc.
 	0000  Backpack CD-ReWriter
+	0001  BACKPACK  2 Cable
+	0010  BACKPACK
 	0011  Backpack 40GB Hard Drive
+	0110  BACKPACK
+	0111  BackPack
+	1234  BACKPACK
 0aca  OPEN Networks Ltd
 	1060  OPEN NT1 Plus II
 0acc  Koga Electronics Co.
 0acd  ID Tech
+	0300  IDT1221U RS-232 Adapter
+	0401  Spectrum III Hybrid Smartcard Reader
+	0630  Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC
+	0810  SecurePIN (IDPA-506100Y) PIN Pad
+	2030  ValueMag Magnetic Stripe Reader
+	3710  ViVOpay Kiosk III
 0ace  ZyDAS
-	1201 802.11b WiFi
-	1211 802.11b/g USB2 WiFi
+	1201  ZD1201 802.11b
+	1211  ZD1211 802.11g
+	1215  ZD1211B 802.11g
+	1221  ZD1221 802.11n
+	1602  ZyXEL Omni FaxModem 56K
+	1608  ZyXEL Omni FaxModem 56K UNO
+	1611  ZyXEL Omni FaxModem 56K Plus
+	2011  Virtual media for 802.11bg
+	20ff  Virtual media for 802.11bg
+	a211  ZD1211 802.11b/g Wireless Adapter
+	b215  802.11bg
 0acf  Intoto, Inc.
 0ad0  Intellix Corp.
 0ad1  Remotec Technology, Ltd
 0ad2  Service & Quality Technology Co., Ltd
+0ada  Data Encryption Systems Ltd.
+	0005  DK2
 0ae3  Allion Computer, Inc.
 0ae4  Taito Corp.
 0ae7  Neodym Systems, Inc.
@@ -3353,31 +12804,177 @@
 0aea  SciEssence, LLC
 0aeb  TTP Communications, Ltd
 0aec  Neodio Technologies Corp.
+	2101  SmartMedia Card Reader
+	2102  CompactFlash Card Reader
+	2103  MMC/SD Card Reader
+	2104  MemoryStick Card Reader
+	2201  SmartMedia+CompactFlash Card Reader
+	2202  SmartMedia+MMC/SD Card Reader
+	2203  SmartMedia+MemoryStick Card Reader
+	2204  CompactFlash+MMC/SD Card Reader
+	2205  CompactFlash+MemoryStick Card Reader
+	2206  MMC/SD+MemoryStick Card Reader
+	2301  SmartMedia+CompactFlash+MMC/SD Card Reader
+	2302  SmartMedia+CompactFlash+MemoryStick Card Reader
+	2303  SmartMedia+MMC/SD+MemoryStick Card Reader
+	2304  CompactFlash+MMC/SD+MemoryStick Card Reader
+	3016  MMC/SD+Memory Stick Card Reader
 	3050  ND3050 8-in-1 Card Reader
+	3060  1.1 FS Card Reader
+	3101  MMC/SD Card Reader
+	3102  MemoryStick Card Reader
+	3201  MMC/SD+MemoryStick Card Reader
+	3216  HS Card Reader
 	3260  7-in-1 Card Reader
 	5010  ND5010 Card Reader
 0af0  Option
 	5000  UMTS Card
+	6000  GlobeTrotter 3G datacard
 	6300  GT 3G Quad UMTS/GPRS Card
+	6600  GlobeTrotter 3G+ datacard
+	6711  GlobeTrotter Express 7.2 v2
+	6971  Globetrotter HSDPA Modem
+	7251  Globetrotter HSUPA Modem (aka iCON HSUPA E)
+	7501  Globetrotter HSUPA Modem (icon 411 aka "Vodafone K3760")
+	7601  Globetrotter MO40x 3G Modem (GTM 382)
+	7701  Globetrotter HSUPA Modem (aka icon 451)
+	d055  Globetrotter GI0505 [iCON 505]
 0af6  Silver I Co., Ltd
 0af7  B2C2, Inc.
 	0101  Digital TV USB Receiver (DVB-S/T/C / ATSC)
 0af9  Hama, Inc.
 	0010  USB SightCam 100
-	0011  Micro Innovations IC50C WebCam
+	0011  Micro Innovations IC50C Webcam
+0afa  DMC Co., Ltd.
+	07d2  Controller Board for Projected Capacitive Touch Screen DUS3000
 0afc  Zaptronix Ltd
 0afd  Tateno Dennou, Inc.
 0afe  Cummins Engine Co.
 0aff  Jump Zone Network Products, Inc.
+0b00  INGENICO
 0b05  ASUSTek Computer, Inc.
-	1706  WL-167G 802.11g Adapter [ralink]
-0b0c  Todos Data System AB
-	0009 Todos Argos Mini II Smart Card Reader
+	0001  MeMO Pad HD 7 (CD-ROM mode)
+	0301  MyPal A696 GPS PDA
+	1101  Mass Storage (UISDMC4S)
+	1706  WL-167G v1 802.11g Adapter [Ralink RT2571]
+	1707  WL-167G v1 802.11g Adapter [Ralink RT2571]
+	1708  Mass Storage Device
+	170b  Multi card reader
+	170c  WL-159g 802.11bg [ZyDAS ZD1211B+AL2230]
+	170d  802.11b/g Wireless Network Adapter
+	1712  BT-183 Bluetooth 2.0+EDR adapter
+	1715  2045 Bluetooth 2.0 Device with trace filter
+	1716  Bluetooth Device
+	1717  WL169gE 802.11g Adapter [Broadcom 4320 USB]
+	171b  A9T wireless 802.11bg
+	171c  802.11b/g Wireless Network Adapter
+	171f  My Cinema U3000 Mini [DiBcom DiB7700P]
+	1723  WL-167G v2 802.11g Adapter [Ralink RT2571W]
+	1724  RT2573
+	1726  Laptop OLED Display
+	172a  802.11n Network Adapter
+	172b  802.11n Network Adapter
+	1731  802.11n Network Adapter
+	1732  802.11n Network Adapter
+	1734  AF-200
+	173c  BT-183 Bluetooth 2.0
+	173f  My Cinema U3100 Mini
+	1742  802.11n Network Adapter
+	1743  Xonar U1 Audio Station
+	1751  BT-253 Bluetooth Adapter
+	175b  Laptop OLED Display
+	1760  802.11n Network Adapter
+	1761  USB-N11 802.11n Network Adapter [Ralink RT2870]
+	1774  Gobi Wireless Modem (QDL mode)
+	1776  Gobi Wireless Modem
+	1779  My Cinema U3100 Mini Plus [AF9035A]
+	1784  USB-N13 802.11n Network Adapter (rev. A1) [Ralink RT3072]
+	1786  USB-N10 802.11n Network Adapter [Realtek RTL8188SU]
+	1788  BT-270 Bluetooth Adapter
+	1791  WL-167G v3 802.11n Adapter [Realtek RTL8188SU]
+	179c  Bluetooth Adapter
+	179d  USB-N53 802.11abgn Network Adapter [Ralink RT3572]
+	179e  Eee Note EA800 (network mode)
+	179f  Eee Note EA800 (tablet mode)
+	17a0  Xonar U3 sound card
+	17a1  Eee Note EA800 (mass storage mode)
+	17ab  USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]
+	17ba  N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]
+	17c2  ROG Spitfire
+	17c7  WL-330NUL
+	17c9  USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+	17cb  Broadcom BCM20702A0 Bluetooth
+	17d1  AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610U]
+	17d2  USB-AC56 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]
+	17d3  USB-N10 v2 802.11b/g/n Wireless Adapter [MediaTek MT7601U]
+	17db  USB-AC50 802.11a/b/g/n/ac (1x1) Wireless Adapter [MediaTek MT7610U]
+	17e8  USB-N14 802.11b/g/n (2x2) Wireless Adapter [Ralink RT5372]
+	17eb  USB-AC55 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7612U]
+	17f5  Xonar U5 sound card
+	180a  Broadcom BCM20702 Single-Chip Bluetooth 4.0 + LE
+	1817  USB-AC68 802.11a/b/g/n/ac (4x4) Wireless Adapter [Realtek RTL8814AU]
+	1825  Qualcomm Bluetooth 4.1
+	18f0  Realtek 8188EUS [USB-N10 Nano]
+	4c80  Transformer Pad TF300TG
+	4c90  Transformer Pad Infinity TF700
+	4c91  Transformer Pad Infinity TF700 (Debug mode)
+	4ca0  Transformer Pad TF701T
+	4ca1  Transformer Pad TF701T (Debug mode)
+	4d00  Transformer Prime TF201
+	4d01  Transformer Prime TF201 (debug mode)
+	4daf  Transformer Pad Infinity TF700 (Fastboot)
+	5410  MeMO Pad HD 7 (MTP mode)
+	5412  MeMO Pad HD 7 (PTP mode)
+	550f  Fonepad 7
+	6101  Cable Modem
+	620a  Remote NDIS Device
+	7772  Zenfone GO (ZB500KL) (MTP mode)
+	7773  Zenfone GO (ZB500KL) (Debug, MTP mode)
+	7774  Zenfone GO (ZB500KL) (RNDIS mode)
+	7775  Zenfone GO (ZB500KL) (Debug, RNDIS mode)
+	7776  Zenfone GO (ZB500KL) (PTP mode)
+	7777  Zenfone GO (ZB500KL) (Debug, PTP mode)
+	b700  Broadcom Bluetooth 2.1
+0b0b  Datamax-O'Neil
+	106e  Datamax E-4304
+0b0c  Todos AB
+	0009  Todos Argos Mini II Smart Card Reader
+	001e  e.dentifier2 (ABN AMRO electronic banking card reader NL)
+	002e  C200 smartcard controller (Nordea card reader)
+	003f  Todos C400 smartcard controller (Handelsbanken card reader)
+	0050  Argos Mini II Smart Card Reader (CCID)
+0b0d  ProjectLab
+	0000  CenturyCD
 0b0e  GN Netcom
+	0305  Jabra EVOLVE Link MS
+	0311  Jabra EVOLVE 65
+	0312  enc060:Buttons Volume up/down/mute + phone [Jabra]
+	0343  Jabra UC VOICE 150a
+	0348  Jabra UC VOICE 550a MS
+	034c  Jabra UC Voice 750 MS
+	034d  Jabra UC VOICE 750
+	0410  Jabra SPEAK 410
+	0420  Jabra SPEAK 510
+	0422  Jabra SPEAK 510 USB
+	0933  Jabra Freeway
+	094d  GN Netcom / Jabra REVO Wireless
+	1017  Jabra PRO 930
+	1022  Jabra PRO 9450, Type 9400BS (DECT Headset)
+	1041  Jabra PRO 9460
+	1900  Jabra Biz 1900
+	2007  GN 2000 Stereo Corded Headset
+	2456  Jabra SPEAK 810
+	245e  Jabra Link 370
+	620c  Jabra BT620s
+	9330  Jabra GN9330 Headset
+	a346  Jabra Engage 75 Stereo
+	a50a  Alienware Wireless Gaming Headset AW988
 0b0f  AVID Technology
+	0400  DNxID
 0b10  Pcally
 0b11  I Tech Solutions Co., Ltd
 0b1e  Electronic Warfare Assoc., Inc. (EWA)
+	8007  Blackhawk USB560-BP JTAG Emulator
 0b1f  Insyde Software Corp.
 0b20  TransDimension, Inc.
 0b21  Yokogawa Electric Corp.
@@ -3390,32 +12987,84 @@
 0b30  PNY Technologies, Inc.
 	0006  SM Media-Shuttle Card Reader
 0b33  Contour Design, Inc.
+	0020  ShuttleXpress
+	0030  ShuttlePro v2
+	0401  RollerMouse Free 2
+	0700  RollerMouse Pro
+	08a0  Perfit Mouse
+	1000  RollerMouse Red
+	1010  Vidamic Technomouse IQ
 0b37  Hitachi ULSI Systems Co., Ltd
+0b38  Gear Head
+	0003  Keyboard
+	0010  107-Key Keyboard
 0b39  Omnidirectional Control Technology, Inc.
+	0001  Composite USB PS2 Converter
+	0109  USB TO Ethernet
+	0421  Serial
+	0801  USB-Parallel Bridge
+	0901  OCT To Fast Ethernet Converter
+	0c03  LAN DOCK Serial Converter
 0b3a  IPaxess
 0b3b  Tekram Technology Co., Ltd
+	0163  TL-WN320G 1.0 WLAN Adapter
 	1601  Allnet 0193 802.11b Adapter
 	1602  ZyXEL ZyAIR B200 802.11b Adapter
 	1612  AIR.Mate 2@net 802.11b Adapter
-	1620  Allnet USB 2.0 Wireless Network Adapter
+	1613  802.11b Wireless LAN Adapter
+	1620  Allnet Wireless Network Adapter [Envara WiND512]
+	1630  QuickWLAN 802.11bg
+	5630  802.11bg
+	6630  ZD1211
 0b3c  Olivetti Techcenter
 	a010  Simple_Way Printer/Scanner/Copier
+	c000  Olicard 100
+	c700  Olicard 100 (Mass Storage mode)
 0b3e  Kikusui Electronics Corp.
 0b41  Hal Corp.
+	0011  Crossam2+USB IR commander
 0b43  Play.com, Inc.
 	0003  PS2 Controller Converter
+	0005  GameCube Adaptor
 0b47  Sportbug.com, Inc.
 0b48  TechnoTrend AG
 	1003  Technotrend/Hauppauge USB-Nova
+	1004  TT-PCline
 	1005  Technotrend/Hauppauge USB-Nova
 	1006  Technotrend/Hauppauge DEC3000-s
+	1007  TT-micro plus Device
 	1008  Technotrend/Hauppauge DEC2000-t
 	1009  Technotrend/Hauppauge DEC2540-t
+	3001  DVB-S receiver
+	3002  DVB-C receiver
+	3003  DVB-T receiver
+	3004  TT TV-Stick
+	3005  TT TV-Stick (8kB EEPROM)
+	3006  TT-connect S-2400 DVB-S receiver
+	3007  TT-connect S2-3600
+	3008  TT-connect
+	3009  TT-connect S-2400 DVB-S receiver (8kB EEPROM)
+	300a  TT-connect S2-3650 CI
+	300b  TT-connect C-3650 CI
+	300c  TT-connect T-3650 CI
+	300d  TT-connect CT-3650 CI
+	300e  TT-connect C-2400
+	3011  TT-connect S2-4600
+	3012  TT-connect CT2-4650 CI
+	3014  TT-TVStick CT2-4400
+	3015  TT-connect CT2-4650 CI
+	3017  TT-connect S2-4650 CI
 0b49  ASCII Corp.
 	064f  Trance Vibrator
 0b4b  Pine Corp. Ltd.
 	0100  D'music MP3 Player
+0b4d  Graphtec America, Inc.
+	110a  Graphtec CC200-20
+	1123  Electronic Cutting Tool [Silhouette Portrait]
 0b4e  Musical Electronics, Ltd
+	6500  MP3 Player
+	8028  MP3 Player
+	8920  MP3 Player
 0b50  Dumpries Co., Ltd
 0b51  Comfort Keyboard Co.
 	0020  Comfort Keyboard
@@ -3429,33 +13078,72 @@
 0b60  Nsine, Ltd
 0b61  NEC Viewtechnology, Ltd
 0b62  Orange Micro, Inc.
-	0059  iBOT2 WebCam
+	000b  Bluetooth Device
+	0059  iBOT2 Webcam
 0b63  ADLink Technology, Inc.
 0b64  Wonderful Wire Cable Co., Ltd
 0b65  Expert Magnetics Corp.
+0b66  Cybiko Inc.
+	0041  Xtreme
+0b67  Fairbanks Scales
+	555e  SCB-R9000
 0b69  CacheVision
 0b6a  Maxim Integrated Products
+	a132  WUP-005 [Nintendo Wii U Pro Controller]
 0b6f  Nagano Japan Radio Co., Ltd
 0b70  PortalPlayer, Inc.
+	00ba  iRiver H10 20GB
 0b71  SHIN-EI Sangyo Co., Ltd
 0b72  Embedded Wireless Technology Co., Ltd
 0b73  Computone Corp.
 0b75  Roland DG Corp.
 0b79  Sunrise Telecom, Inc.
 0b7a  Zeevo, Inc.
+	07d0  Bluetooth Dongle
 0b7b  Taiko Denki Co., Ltd
 0b7c  ITRAN Communications, Ltd
 0b7d  Astrodesign, Inc.
+0b81  id3 Technologies
+	0001  Biothentic II smartcard reader with fingerprint sensor
+	0002  DFU-Enabled Devices (DFU)
+	0012  BioPAD biometric module (DFU + CDC)
+	0102  Certis V1 fingerprint reader
+	0103  Certis V2 fingerprint reader
+	0200  CL1356T / CL1356T5 / CL1356A smartcard readers (CCID)
+	0201  CL1356T / CL1356T5 / CL1356A smartcard readers (DFU + CCID)
+	0220  CL1356A FFPJP smartcard reader (CCID + HID)
+	0221  CL1356A smartcard reader (DFU + CCID + HID)
 0b84  Rextron Technology, Inc.
 0b85  Elkat Electronics, Sdn., Bhd.
 0b86  Exputer Systems, Inc.
+	5100  XMC5100 Zippy Drive
+	5110  XMC5110 Flash Drive
+	5200  XMC5200 Zippy Drive
+	5201  XMC5200 Zippy Drive
+	5202  XMC5200 Zippy Drive
+	5280  XMC5280 Storage Drive
+	fff0  ISP5200 Debugger
 0b87  Plus-One I & T, Inc.
 0b88  Sigma Koki Co., Ltd, Technology Center
 0b89  Advanced Digital Broadcast, Ltd
+0b8c  SMART Technologies Inc.
+	0001  Interactive Whiteboard Controller (SB6) (HID)
+	00c3  Sympodium ID350
 0b95  ASIX Electronics Corp.
+	1720  10/100 Ethernet
+	1780  AX88178
+	1790  AX88179 Gigabit Ethernet
+	6802  AX68002 KVM Switch SoC
+	7720  AX88772
+	772a  AX88772A Fast Ethernet
+	772b  AX88772B
+	7e2b  AX88772B Fast Ethernet Controller
 0b96  Sewon Telecom
 0b97  O2 Micro, Inc.
+	7732  Smart Card Reader
+	7761  Oz776 1.1 Hub
 	7762  Oz776 SmartCard Reader
+	7772  OZ776 CCID Smartcard Reader
 0b98  Playmates Toys, Inc.
 0b99  Audio International, Inc.
 0b9b  Dipl.-Ing. Stefan Kunde
@@ -3463,20 +13151,239 @@
 0b9d  Softprotec Co.
 0b9f  Chippo Technologies
 0baf  U.S. Robotics
+	00e5  USR6000
 	00eb  USR1120 802.11b Adapter
+	00ec  56K Faxmodem
+	00f1  SureConnect ADSL ATM Adapter
+	00f2  SureConnect ADSL Loader
+	00f5  SureConnect ADSL ATM Adapter
+	00f6  SureConnect ADSL Loader
+	00f7  SureConnect ADSL ATM Adapter
+	00f8  SureConnect ADSL Loader
+	00f9  SureConnect ADSL ATM Adapter
+	00fa  SureConnect ADSL Loader
+	00fb  SureConnect ADSL Ethernet/USB Router
+	0111  USR5420 802.11g Adapter [Broadcom 4320 USB]
 	0118  U5 802.11g Adapter
+	011b  Wireless MAXg Adapter [Broadcom 4320]
+	0121  USR5423 802.11bg Wireless Adapter [ZyDAS ZD1211B]
+	0303  USR5637 56K Faxmodem
 	6112  FaxModem Model 5633
 0bb0  Concord Camera Corp.
+	0100  Sound Vision Stream
 	5007  3340z/Rollei DC3100
 0bb1  Infinilink Corp.
 0bb2  Ambit Microsystems Corp.
+	0302  U10H010 802.11b Wireless Adapter [Intersil PRISM 3]
 	6098  USB Cable Modem
 0bb3  Ofuji Technology
-0bb4  High Tech Computer Corp.
+0bb4  HTC (High Tech Computer Corp.)
+	0001  Android Phone via mass storage [Wiko Cink Peax 2]
 	00ce  mmO2 XDA GSM/GPRS Pocket PC
 	00cf  SPV C500 Smart Phone
+	0306  Vive Hub Bluetooth 4.1 (Broadcom BCM920703)
+	0a01  PocketPC Sync
 	0a02  Himalaya GSM/GPRS Pocket PC
+	0a03  PocketPC Sync
+	0a04  PocketPC Sync
+	0a05  PocketPC Sync
+	0a06  PocketPC Sync
+	0a07  Magician PocketPC SmartPhone / O2 XDA
+	0a08  PocketPC Sync
+	0a09  PocketPC Sync
+	0a0a  PocketPC Sync
+	0a0b  PocketPC Sync
+	0a0c  PocketPC Sync
+	0a0d  PocketPC Sync
+	0a0e  PocketPC Sync
+	0a0f  PocketPC Sync
+	0a10  PocketPC Sync
+	0a11  PocketPC Sync
+	0a12  PocketPC Sync
+	0a13  PocketPC Sync
+	0a14  PocketPC Sync
+	0a15  PocketPC Sync
+	0a16  PocketPC Sync
+	0a17  PocketPC Sync
+	0a18  PocketPC Sync
+	0a19  PocketPC Sync
+	0a1a  PocketPC Sync
+	0a1b  PocketPC Sync
+	0a1c  PocketPC Sync
+	0a1d  PocketPC Sync
+	0a1e  PocketPC Sync
+	0a1f  PocketPC Sync
+	0a20  PocketPC Sync
+	0a21  PocketPC Sync
+	0a22  PocketPC Sync
+	0a23  PocketPC Sync
+	0a24  PocketPC Sync
+	0a25  PocketPC Sync
+	0a26  PocketPC Sync
+	0a27  PocketPC Sync
+	0a28  PocketPC Sync
+	0a29  PocketPC Sync
+	0a2a  PocketPC Sync
+	0a2b  PocketPC Sync
+	0a2c  PocketPC Sync
+	0a2d  PocketPC Sync
+	0a2e  PocketPC Sync
+	0a2f  PocketPC Sync
+	0a30  PocketPC Sync
+	0a31  PocketPC Sync
+	0a32  PocketPC Sync
+	0a33  PocketPC Sync
+	0a34  PocketPC Sync
+	0a35  PocketPC Sync
+	0a36  PocketPC Sync
+	0a37  PocketPC Sync
+	0a38  PocketPC Sync
+	0a39  PocketPC Sync
+	0a3a  PocketPC Sync
+	0a3b  PocketPC Sync
+	0a3c  PocketPC Sync
+	0a3d  PocketPC Sync
+	0a3e  PocketPC Sync
+	0a3f  PocketPC Sync
+	0a40  PocketPC Sync
+	0a41  PocketPC Sync
+	0a42  PocketPC Sync
+	0a43  PocketPC Sync
+	0a44  PocketPC Sync
+	0a45  PocketPC Sync
+	0a46  PocketPC Sync
+	0a47  PocketPC Sync
+	0a48  PocketPC Sync
+	0a49  PocketPC Sync
+	0a4a  PocketPC Sync
+	0a4b  PocketPC Sync
+	0a4c  PocketPC Sync
+	0a4d  PocketPC Sync
+	0a4e  PocketPC Sync
+	0a4f  PocketPC Sync
+	0a50  SmartPhone (MTP)
 	0a51  SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC
+	0a52  SmartPhone Sync
+	0a53  SmartPhone Sync
+	0a54  SmartPhone Sync
+	0a55  SmartPhone Sync
+	0a56  SmartPhone Sync
+	0a57  SmartPhone Sync
+	0a58  SmartPhone Sync
+	0a59  SmartPhone Sync
+	0a5a  SmartPhone Sync
+	0a5b  SmartPhone Sync
+	0a5c  SmartPhone Sync
+	0a5d  SmartPhone Sync
+	0a5e  SmartPhone Sync
+	0a5f  SmartPhone Sync
+	0a60  SmartPhone Sync
+	0a61  SmartPhone Sync
+	0a62  SmartPhone Sync
+	0a63  SmartPhone Sync
+	0a64  SmartPhone Sync
+	0a65  SmartPhone Sync
+	0a66  SmartPhone Sync
+	0a67  SmartPhone Sync
+	0a68  SmartPhone Sync
+	0a69  SmartPhone Sync
+	0a6a  SmartPhone Sync
+	0a6b  SmartPhone Sync
+	0a6c  SmartPhone Sync
+	0a6d  SmartPhone Sync
+	0a6e  SmartPhone Sync
+	0a6f  SmartPhone Sync
+	0a70  SmartPhone Sync
+	0a71  SmartPhone Sync
+	0a72  SmartPhone Sync
+	0a73  SmartPhone Sync
+	0a74  SmartPhone Sync
+	0a75  SmartPhone Sync
+	0a76  SmartPhone Sync
+	0a77  SmartPhone Sync
+	0a78  SmartPhone Sync
+	0a79  SmartPhone Sync
+	0a7a  SmartPhone Sync
+	0a7b  SmartPhone Sync
+	0a7c  SmartPhone Sync
+	0a7d  SmartPhone Sync
+	0a7e  SmartPhone Sync
+	0a7f  SmartPhone Sync
+	0a80  SmartPhone Sync
+	0a81  SmartPhone Sync
+	0a82  SmartPhone Sync
+	0a83  SmartPhone Sync
+	0a84  SmartPhone Sync
+	0a85  SmartPhone Sync
+	0a86  SmartPhone Sync
+	0a87  SmartPhone Sync
+	0a88  SmartPhone Sync
+	0a89  SmartPhone Sync
+	0a8a  SmartPhone Sync
+	0a8b  SmartPhone Sync
+	0a8c  SmartPhone Sync
+	0a8d  SmartPhone Sync
+	0a8e  SmartPhone Sync
+	0a8f  SmartPhone Sync
+	0a90  SmartPhone Sync
+	0a91  SmartPhone Sync
+	0a92  SmartPhone Sync
+	0a93  SmartPhone Sync
+	0a94  SmartPhone Sync
+	0a95  SmartPhone Sync
+	0a96  SmartPhone Sync
+	0a97  SmartPhone Sync
+	0a98  SmartPhone Sync
+	0a99  SmartPhone Sync
+	0a9a  SmartPhone Sync
+	0a9b  SmartPhone Sync
+	0a9c  SmartPhone Sync
+	0a9d  SmartPhone Sync
+	0a9e  SmartPhone Sync
+	0a9f  SmartPhone Sync
+	0b03  Ozone Mobile Broadband
+	0b04  Hermes / TyTN / T-Mobile MDA Vario II / O2 Xda Trion
+	0b05  P3600
+	0b06  Athena / Advantage x7500 / Dopod U1000 / T-Mobile AMEO
+	0b0c  Elf / Touch / P3450 / T-Mobile MDA Touch / O2 Xda Nova / Dopod S1
+	0b1f  Sony Ericsson XPERIA X1
+	0b2f  Rhodium
+	0b51  Qtek 8310 mobile phone [Tornado Noble]
+	0bce  Vario MDA
+	0c01  Dream / ADP1 / G1 / Magic / Tattoo / FP1
+	0c02  Dream / ADP1 / G1 / Magic / Tattoo (Debug)
+	0c03  Android Phone [Fairphone First Edition (FP1)]
+	0c13  Diamond
+	0c1f  Sony Ericsson XPERIA X1
+	0c5f  Snap
+	0c86  Sensation
+	0c87  Desire (debug)
+	0c8d  EVO 4G (debug)
+	0c91  Vision
+	0c94  Vision
+	0c97  Legend
+	0c99  Desire (debug)
+	0c9e  Incredible
+	0ca2  Desire HD (debug mode)
+	0ca5  Android Phone [Evo Shift 4G]
+	0cab  Desire / Desire HD / Hero / Thunderbolt (HTC Sync Mode)
+	0cae  T-Mobile MyTouch 4G Slide [Doubleshot]
+	0de5  One (M7)
+	0dea  M7_UL [HTC One]
+	0f25  One M8
+	0f63  Desire 610 Via MTP
+	0f64  Desire 601
+	0fb4  Remote NDIS based Device
+	0ff0  One Mini (M4)
+	0ff8  Desire HD (Tethering Mode)
+	0ff9  Desire / Desire HD / Hero / Thunderbolt (Charge Mode)
+	0ffe  Desire HD (modem mode)
+	0fff  Android Fastboot Bootloader
+	2008  Android Phone via MTP [MT65xx]
+	200b  Android Phone via PTP [Wiko Cink Peax 2]
+	2134  Vive Hub (SMSC USB2137B)
+	2744  Vive Hub (HTC CB USB2)
+	2c87  Vive
 0bb5  Murata Manufacturing Co., Ltd
 0bb6  Network Alchemy
 0bb7  Joytech Computer Co., Ltd
@@ -3489,12 +13396,81 @@
 0bc0  Knilink Technology, Inc.
 0bc1  Fuw Yng Electronics Co., Ltd
 0bc2  Seagate RSS LLC
+	0502  ST3300601CB-RK 300 GB External Hard Drive
+	0503  ST3250824A [Barracuda 7200.9]
+	2000  Storage Adapter V3 (TPP)
+	2100  FreeAgent Go
+	2200  FreeAgent Go FW
+	2300  Expansion Portable
+	231a  Expansion Portable
+	231c  Expansion Portable
+	2320  USB 3.0 bridge [Portable Expansion Drive]
+	2321  Expansion Portable
+	2322  SRD0NF1 Expansion Portable (STEA)
+	2340  FreeAgent External Hard Drive
+	3000  FreeAgent Desktop
+	3008  FreeAgent Desk 1TB
+	3101  FreeAgent XTreme 640GB
+	3312  SRD00F2 Expansion Desktop Drive (STBV)
+	331a  Desktop HDD 5TB (ST5000DM000)
+	3320  SRD00F2 [Expansion Desktop Drive]
+	3322  SRD0NF2 [Expansion Desktop Drive]
+	3323  Seagate RSS LLC
+	3332  Expansion
+	3343  desktop drive stgy8000400
+	5020  FreeAgent GoFlex
+	5021  FreeAgent GoFlex USB 2.0
+	5030  FreeAgent GoFlex Upgrade Cable STAE104
+	5031  FreeAgent GoFlex USB 3.0
+	5032  SATA cable
+	5070  FreeAgent GoFlex Desk
+	5071  FreeAgent GoFlex Desk
+	50a1  FreeAgent GoFlex Desk
+	50a5  FreeAgent GoFlex Desk USB 3.0
+	5121  FreeAgent GoFlex
+	5161  FreeAgent GoFlex dock
+	6126  Maxtor D3 Station 5TB
+	61b5  Maxtor HX-M201TCB [M3 Portable 2TB]
+	61b6  Maxtor HX-M101TCB/GM [M3 Portable 1TB]
+	61b7  Maxtor M3 Portable
+	a003  Backup Plus
+	a0a1  Backup Plus Desktop
+	a0a4  Backup Plus Desktop Drive
+	aa14  STJ4000400 [Seagate Basic Portable Drive 4TB]
+	ab00  Slim Portable Drive
+	ab1e  Backup Plus Portable Drive
+	ab20  Backup Plus Portable Drive
+	ab21  Backup Plus Slim
+	ab24  Backup Plus Portable Drive
+	ab26  Backup Plus Slim Portable Drive 1 TB
+	ab28  Seagate Backup Plus Portable 5TB SRD00F1
+	ab2d  SRD00F1 [Backup Plus Ultra Slim]
+	ab31  Backup Plus Desktop Drive (5TB)
+	ab34  Backup Plus
+	ab38  Backup Plus Hub (Mass Storage)
+	ab44  Backup Plus Hub
+	ac20  Backup Plus Slim 2TB
 0bc3  IPWireless, Inc.
+	0001  UMTS-TDD (TD-CDMA) modem
 0bc4  Microcube Corp.
 0bc5  JCN Co., Ltd
 0bc6  ExWAY, Inc.
 0bc7  X10 Wireless Technology, Inc.
+	0001  ActiveHome (ACPI-compliant)
+	0002  Firecracker Interface (ACPI-compliant)
+	0003  VGA Video Sender (ACPI-compliant)
 	0004  X10 Receiver
+	0005  Wireless Transceiver (ACPI-compliant)
+	0006  Wireless Transceiver (ACPI-compliant)
+	0007  Wireless Transceiver (ACPI-compliant)
+	0008  Wireless Transceiver (ACPI-compliant)
+	0009  Wireless Transceiver (ACPI-compliant)
+	000a  Wireless Transceiver (ACPI-compliant)
+	000b  Transceiver (ACPI-compliant)
+	000c  Transceiver (ACPI-compliant)
+	000d  Transceiver (ACPI-compliant)
+	000e  Transceiver (ACPI-compliant)
+	000f  Transceiver (ACPI-compliant)
 0bc8  Telmax Communications
 0bc9  ECI Telecom, Ltd
 0bca  Startek Engineering, Inc.
@@ -3502,9 +13478,114 @@
 0bd7  Andrew Pargeter & Associates
 	a021  Amptek DP4 multichannel signal analyzer
 0bda  Realtek Semiconductor Corp.
+	0103  USB 2.0 Card Reader
+	0104  Mass Storage Device
+	0106  Mass Storage Device
+	0107  Mass Storage Device
+	0108  Mass Storage Device
+	0109  microSDXC Card Reader [Hama 00091047]
+	0111  RTS5111 Card Reader Controller
+	0113  Mass Storage Device
+	0115  Mass Storage Device (Multicard Reader)
+	0116  RTS5116 Card Reader Controller
+	0117  Mass Storage Device
+	0118  Mass Storage Device
+	0119  Storage Device (SD card reader)
+	0129  RTS5129 Card Reader Controller
+	0138  RTS5138 Card Reader Controller
+	0139  RTS5139 Card Reader Controller
+	0151  Mass Storage Device (Multicard Reader)
+	0152  Mass Storage Device
+	0153  3-in-1 (SD/SDHC/SDXC) Card Reader
+	0156  Mass Storage Device
+	0157  Mass Storage Device
+	0158  USB 2.0 multicard reader
+	0159  RTS5159 Card Reader Controller
+	0161  Mass Storage Device
+	0168  Mass Storage Device
+	0169  Mass Storage Device
+	0171  Mass Storage Device
+	0176  Mass Storage Device
+	0178  Mass Storage Device
+	0179  RTL8188ETV Wireless LAN 802.11n Network Adapter
+	0184  RTS5182 Card Reader
+	0186  Card Reader
+	0301  multicard reader
+	0307  Card Reader
+	0316  Card Reader
+	0326  Card reader
+	0411  Hub
+	0811  Realtek 8812AU/8821AU 802.11ac WLAN Adapter [USB Wireless Dual-Band Adapter 2.4/5Ghz]
+	0821  RTL8821A Bluetooth
+	1724  RTL8723AU 802.11n WLAN Adapter
+	1a2b  RTL8188GU 802.11n WLAN Adapter (Driver CDROM Mode)
+	2831  RTL2831U DVB-T
+	2832  RTL2832U DVB-T
+	2838  RTL2838 DVB-T
+	5401  RTL 8153 USB 3.0 hub with gigabit ethernet
+	5411  RTS5411 Hub
+	568c  Integrated Webcam HD
+	570c  Asus laptop camera
+	5730  HP 2.0MP High Definition Webcam
+	5751  Integrated Webcam
+	5775  HP "Truevision HD" laptop camera
+	5776  HP Truevision HD integrated webcam
+	57b3  Acer 640 × 480 laptop camera
+	57cc  HD Webcam - Realtek Semiconductor
+	57cf  HD WebCam
+	57da  Built-In Video Camera
+	58c2  Integrated Webcam HD
+	58c8  Integrated Webcam HD
 	8150  RTL8150 Fast Ethernet Adapter
 	8151  RTL8151 Adapteon Business Mobile Networks BV
+	8152  RTL8152 Fast Ethernet Adapter
+	8153  RTL8153 Gigabit Ethernet Adapter
+	8171  RTL8188SU 802.11n WLAN Adapter
+	8172  RTL8191SU 802.11n WLAN Adapter
+	8174  RTL8192SU 802.11n WLAN Adapter
+	8176  RTL8188CUS 802.11n WLAN Adapter
+	8178  RTL8192CU 802.11n WLAN Adapter
+	8179  RTL8188EUS 802.11n Wireless Network Adapter
+	817f  RTL8188RU 802.11n WLAN Adapter
+	8187  RTL8187 Wireless Adapter
+	8189  RTL8187B Wireless 802.11g 54Mbps Network Adapter
+	818b  RTL8192EU 802.11b/g/n WLAN Adapter
+	8192  RTL8191SU 802.11n Wireless Adapter
+	8193  RTL8192DU 802.11an WLAN Adapter
+	8197  RTL8187B Wireless Adapter
+	8198  RTL8187B Wireless Adapter
+	8199  RTL8187SU 802.11g WLAN Adapter
+	8723  RTL8723A Bluetooth
+	8812  RTL8812AU 802.11a/b/g/n/ac 2T2R DB WLAN Adapter
+	8813  RTL8814AU 802.11a/b/g/n/ac Wireless Adapter
+	881a  RTL8812AU-VS 802.11a/b/g/n/ac 2T2R DB WLAN Adapter
+	8821  RTL8821A Bluetooth
+	9210  RTL9210 M.2 NVME Adapter
+	a811  RTL8811AU 802.11a/b/g/n/ac WLAN Adapter
+	b009  Realtek Bluetooth 4.2 Adapter
+	b00a  Realtek Bluetooth 4.2 Adapter
+	b00b  Realtek Bluetooth 4.2 Adapter
+	b023  RTL8822BE Bluetooth 4.2 Adapter
+	b711  RTL8188GU 802.11n WLAN Adapter (After Modeswitch)
+	b720  RTL8723BU 802.11b/g/n WLAN Adapter
+	b723  RTL8723B Bluetooth
+	b728  RTL8723B Bluetooth
+	b72a  RTL8723B Bluetooth
+	b812  RTL88x2bu [AC1200 Techkey]
+	f179  RTL8188FTV 802.11b/g/n 1T1R 2.4G WLAN Adapter
 0bdb  Ericsson Business Mobile Networks BV
+	1000  BV Bluetooth Device
+	1002  Bluetooth Device 1.2
+	1049  C3607w Mobile Broadband Module
+	1900  F3507g Mobile Broadband Module
+	1902  F3507g v2 Mobile Broadband Module
+	1904  F3607gw Mobile Broadband Module
+	1905  F3607gw v2 Mobile Broadband Module
+	1906  F3607gw v3 Mobile Broadband Module
+	1909  F3307 v2 Mobile Broadband Module
+	190a  F3307 Mobile Broadband Module
+	190b  C3607w v2 Mobile Broadband Module
+	1926  H5321 gw Mobile Broadband Module
 0bdc  Y Media Corp.
 0bdd  Orange PCS
 0be2  Kanda Tsushin Kogyo Co., Ltd
@@ -3512,16 +13593,42 @@
 0be4  Elka International, Ltd
 0be5  DOME imaging systems, Inc.
 0be6  Dong Guan Humen Wonderful Wire Cable Factory
+0bed  MEI
+	1100  CASHFLOW SC
+	1101  Series 2000 Combo Acceptor
 0bee  LTK Industries, Ltd
 0bef  Way2Call Communications
 0bf0  Pace Micro Technology PLC
+	c010  EHD100SD
 0bf1  Intracom S.A.
+	0001  netMod Driver Ver 2.4.17 (CAPI)
+	0002  netMod Driver Ver 2.4 (CAPI)
+	0003  netMod Driver Ver 2.4 (CAPI)
 0bf2  Konexx
 0bf6  Addonics Technologies, Inc.
+	0103  Storage Device
+	1234  Storage Device
+	a000  Cable 205 (TPP)
+	a001  Cable 205
 	a002  IDE Bridge
 0bf7  Sunny Giken, Inc.
 0bf8  Fujitsu Siemens Computers
 	1001  Fujitsu Pocket Loox 600 PDA
+	1006  SmartCard Reader 2A
+	1007  Connect2Air E-5400 802.11g Wireless Adapter
+	1009  Connect2Air E-5400 D1700 802.11g Wireless Adapter [Intersil ISL3887]
+	100c  Keyboard FSC KBPC PX
+	100f  miniCard D2301 802.11bg Wireless Module [SiS 163U]
+	1017  Keyboard KB SCR
+	101f  Fujitsu Full HD Pro Webcam
+0bfb  Grass Valley Group
+	0200  TURBO iDDR Front Panel
+0bfd  Kvaser AB
+	0004  USBcan II
+	000b  Leaf Light HS
+	000e  Leaf SemiPro HS
+0c00  FireFly Mouse Mat
+	1607  Apex M500
 0c04  MOTO Development Group, Inc.
 0c05  Appian Graphics
 0c06  Hasbro Games, Inc.
@@ -3529,31 +13636,87 @@
 0c08  Agate
 	0378  Q 16MB Storage Device
 0c09  Comjet Information System
+	a5a5  Litto Version USB2.0
 0c0a  Highpoint Technologies, Inc.
+	6124  RocketStor 6124V
 0c0b  Dura Micro, Inc. (Acomdata)
 	27cb  6-in-1 Flash Reader and Writer
+	27d7  Multi Memory reader/writer MD-005
+	27da  Multi Memory reader/writer MD-005
+	27dc  Multi Memory reader/writer MD-005
+	27e7  3,5'' HDD case MD-231
+	27ee  3,5'' HDD case MD-231
+	2814  3,5'' HDD case MD-231
+	2815  3,5'' HDD case MD-231
+	281d  3,5'' HDD case MD-231
+	5fab  Storage Adaptor
 	a109  CF/SM Reader and Writer
 	a10c  SD/MS Reader and Writer
 	b001  USB 2.0 Mass Storage IDE adapter
 	b004  MMC/SD Reader and Writer
 0c12  Zeroplus
-	0005  PSX Vibration Feedback Converter
+	0005  PSX Vibration Feedback Converter / Intec Wireless Controller for Xbox
+	0030  PSX Vibration Feedback Converter
+	700e  Logic Analyzer (LAP-C-16032)
+	8801  Nyko Xbox Controller
+	8802  Xbox Controller
 	8809  Red Octane Ignition Xbox DDR Pad
+	880a  Pelican Eclipse PL-2023
+	8810  Xbox Controller
+	9902  VibraX
 0c15  Iris Graphics
 0c16  Gyration, Inc.
+	0002  RF Technology Receiver
+	0003  RF Technology Receiver
+	0008  RF Technology Receiver
+	0080  eHome Infrared Receiver
+	0081  eHome Infrared Receiver
 0c17  Cyberboard A/S
 0c18  SynerTek Korea, Inc.
 0c19  cyberPIXIE, Inc.
 0c1a  Silicon Motion, Inc.
 0c1b  MIPS Technologies
 0c1c  Hang Zhou Silan Electronics Co., Ltd
+0c1f  Magicard
+	1800  Tango 2E
 0c22  Tally Printer Corp.
 0c23  Lernout + Hauspie
 0c24  Taiyo Yuden
+	0001  Bluetooth Adaptor
+	0002  Bluetooth Device2
+	0005  Bluetooth Device(BC04-External)
+	000b  Bluetooth Device(BC04-External)
+	000c  Bluetooth Adaptor
+	000e  Bluetooth Device(BC04-External)
+	000f  Bluetooth Device (V2.0+EDR)
+	0010  Bluetooth Device(BC04-External)
+	0012  Bluetooth Device(BC04-External)
+	0018  Bluetooth Device(BC04-External)
+	0019  Bluetooth Device
+	0021  Bluetooth Device (V2.1+EDR)
+	0c24  Bluetooth Device(SAMPLE)
+	ffff  Bluetooth module with BlueCore in DFU mode
 0c25  Sampo Corp.
 	0310  Scream Cam
-0c2e  Metro
-	0200  Metrologic Scanner
+0c26  Prolific Technology Inc.
+	0018  USB-Serial Controller [Icom Inc. OPC-478UC]
+	002b  Icom Inc. IC-R30
+0c27  RFIDeas, Inc
+	232a  pcProx Plus RFID Reader (CDC serial)
+	3bfa  pcProx Card Reader
+0c2e  Metrologic Instruments
+	0007  Metrologic MS7120 Barcode Scanner (IBM SurePOS mode)
+	0200  MS7120 Barcode Scanner
+	0204  Metrologic MS7120 Barcode Scanner (keyboard mode)
+	0206  Metrologic MS4980 Barcode Scanner
+	0700  Metrologic MS7120 Barcode Scanner (uni-directional serial mode)
+	0720  Metrologic MS7120 Barcode Scanner (bi-directional serial mode)
+	0a64  [Stratos 2700]
+	0b61  Vuquest 3310g
+	0b6a  Vuquest 3310 Area-Imaging Scanner
+	0b81  Barcode scanner Voyager 1400g Series
+0c30  Mutoh Industries Ltd
+	6010  Kona 1400 Cutting Plotter
 0c35  Eagletron, Inc.
 0c36  E Ink Corp.
 0c37  e.Digital
@@ -3564,46 +13727,297 @@
 0c3c  Radius Co., Ltd
 0c3d  Innocom, Inc.
 0c3e  Nextcell, Inc.
+0c40  ELMCU
+	8000  2.4GHz receiver
 0c44  Motorola iDEN
+	0021  iDEN P2k0 Device
+	0022  iDEN P2k1 Device
+	03a2  iDEN Smartphone
+	41d9  i1 phone
 0c45  Microdia
+	0011  EBUDDY
+	0520  MaxTrack Wireless Mouse
+	1018  Compact Flash storage memory card reader
+	1020  Mass Storage Reader
+	1028  Mass Storage Reader
+	1030  Mass Storage Reader
+	1031  Sonix Mass Storage Device
+	1032  Mass Storage Reader
+	1033  Sonix Mass Storage Device
+	1034  Mass Storage Reader
+	1035  Mass Storage Reader
+	1036  Mass Storage Reader
+	1037  Sonix Mass Storage Device
+	1050  CF Card Reader
+	1058  HDD Reader
 	1060  iFlash SM-Direct Card Reader
+	1061  Mass Storage Reader
+	1062  Mass Storage Reader
+	1063  Sonix Mass Storage Device
+	1064  Mass Storage Reader
+	1065  Mass Storage Reader
+	1066  Mass Storage Reader
+	1067  Mass Storage Reader
+	1158  A56AK
+	184c  VoIP Phone
+	1a90  2M pixel Microscope Camera (with capture button) [Andonstar V160]
+	5004  Redragon Mitra RGB Keyboard
+	5101  2.4G Wireless Device [Rii MX3]
 	6001  Genius VideoCAM NB
-	6005  Sweex Mini WebCam
+	6005  Sweex Mini Webcam
+	6007  VideoCAM Eye
+	6009  VideoCAM ExpressII
+	600d  TwinkleCam USB camera
+	6011  PC Camera (SN9C102)
+	6019  PC Camera (SN9C102)
+	6024  VideoCAM ExpressII
+	6025  VideoCAM ExpressII
+	6028  Typhoon Easycam USB 330K (older)
 	6029  Triplex i-mini PC Camera
 	602a  Meade ETX-105EC Camera
-	602c  Clas Ohlson TWC-30XOP WebCam
-	6270  U-CAM PC Camera NE878
+	602b  VideoCAM NB 300
+	602c  Clas Ohlson TWC-30XOP Webcam
+	602d  VideoCAM ExpressII
+	602e  VideoCAM Messenger
+	6030  VideoCAM ExpressII
+	603f  VideoCAM ExpressII
+	6040  CCD PC Camera (PC390A)
+	606a  CCD PC Camera (PC390A)
+	607a  CCD PC Camera (PC390A)
+	607b  Win2 PC Camera
+	607c  CCD PC Camera (PC390A)
+	607e  CCD PC Camera (PC390A)
+	6080  Audio (Microphone)
+	6082  VideoCAM Look
+	6083  VideoCAM Look
+	608c  VideoCAM Look
+	608e  VideoCAM Look
+	608f  PC Camera (SN9C103 + OV7630)
+	60a8  VideoCAM Look
+	60aa  VideoCAM Look
+	60ab  PC Camera
+	60af  VideoCAM Look
+	60b0  Genius VideoCam Look
+	60c0  PC Camera with Mic (SN9C105)
+	60c8  Win2 PC Camera
+	60cc  PC Camera with Mic (SN9C105)
+	60ec  PC Camera with Mic (SN9C105)
+	60ef  Win2 PC Camera
+	60fa  PC Camera with Mic (SN9C105)
+	60fb  Composite Device
+	60fc  PC Camera with Mic (SN9C105)
+	60fe  Audio (Microphone)
+	6108  Win2 PC Camera
+	6122  PC Camera (SN9C110)
+	6123  PC Camera (SN9C110)
+	6128  PC Camera (SN9C325 + OM6802)
+	612a  PC Camera (SN9C325)
+	612c  PC Camera (SN9C110)
+	612e  PC Camera (SN9C110)
+	612f  PC Camera (SN9C110)
+	6130  PC Camera (SN9C120)
+	6138  Win2 PC Camera
+	613a  PC Camera (SN9C120)
+	613b  Win2 PC Camera
+	613c  PC Camera (SN9C120)
+	613e  PC Camera (SN9C120)
+	6143  PC Camera (SN9C120 + SP80708)
+	6240  PC Camera (SN9C201 + MI1300)
+	6242  PC Camera (SN9C201 + MI1310)
+	6243  PC Camera (SN9C201 + S5K4AAFX)
+	6248  PC Camera (SN9C201 + OV9655)
+	624b  PC Camera (SN9C201 + CX1332)
+	624c  PC Camera (SN9C201 + MI1320)
+	624e  PC Camera (SN9C201 + SOI968)
+	624f  PC Camera (SN9C201 + OV9650)
+	6251  PC Camera (SN9C201 + OV9650)
+	6253  PC Camera (SN9C201 + OV9650)
+	6260  PC Camera (SN9C201 + OV7670ISP)
+	6262  PC Camera (SN9C201 + OM6802)
+	6270  PC Camera (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111) U-CAM PC Camera NE878, Whitcom WHC017, ...
+	627a  PC Camera (SN9C201 + S5K53BEB)
+	627b  PC Camera (SN9C201 + OV7660)
+	627c  PC Camera (SN9C201 + HV7131R)
+	627f  PC Camera (SN9C201 + OV965x + EEPROM)
+	6280  PC Camera with Microphone (SN9C202 + MI1300)
+	6282  PC Camera with Microphone (SN9C202 + MI1310)
+	6283  PC Camera with Microphone (SN9C202 + S5K4AAFX)
+	6288  PC Camera with Microphone (SN9C202 + OV9655)
+	628a  PC Camera with Microphone (SN9C202 + ICM107)
+	628b  PC Camera with Microphone (SN9C202 + CX1332)
+	628c  PC Camera with Microphone (SN9C202 + MI1320)
+	628e  PC Camera with Microphone (SN9C202 + SOI968)
+	628f  PC Camera with Microphone (SN9C202 + OV9650)
+	62a0  PC Camera with Microphone (SN9C202 + OV7670ISP)
+	62a2  PC Camera with Microphone (SN9C202 + OM6802)
+	62b0  PC Camera with Microphone (SN9C202 + MI0360/MT9V011 or MI0360SOC/MT9V111)
+	62b3  PC Camera with Microphone (SN9C202 + OV9655)
+	62ba  PC Camera with Microphone (SN9C202 + S5K53BEB)
+	62bb  PC Camera with Microphone (SN9C202 + OV7660)
+	62bc  PC Camera with Microphone (SN9C202 + HV7131R)
+	62be  PC Camera with Microphone (SN9C202 + OV7663)
+	62c0  Sonix USB 2.0 Camera
+	62e0  MSI Starcam Racer
+	6300  PC Microscope camera
+	6310  Sonix USB 2.0 Camera
+	6321  HP Integrated Webcam
+	6340  Camera
+	6341  Defender G-Lens 2577 HD720p Camera
+	6366  Webcam Vitade AF
+	63e0  Sonix Integrated Webcam
+	63f1  Integrated Webcam
+	63f8  Sonix Integrated Webcam
+	6409  Webcam
+	6413  Integrated Webcam
+	6417  Integrated Webcam
+	6419  Integrated Webcam
+	641d  1.3 MPixel Integrated Webcam
+	6433  Laptop Integrated Webcam HD (Composite Device)
+	643f  Dell Integrated HD Webcam
+	644d  1.3 MPixel Integrated Webcam
+	6480  Sonix 1.3 MP Laptop Integrated Webcam
+	648b  Integrated Webcam
+	64ad  Dell Laptop Integrated Webcam HD
+	64bd  Sony Visual Communication Camera
+	64d0  Integrated Webcam
+	64d2  Integrated Webcam
+	651b  HP Webcam
+	652f  Backlit Gaming Keyboard
+	6705  Integrated HD Webcam
+	670c  Integrated Webcam HD
+	6710  Integrated Webcam
+	6712  Integrated Webcam HD
+	671d  Integrated_Webcam_HD
+	7401  TEMPer Temperature Sensor
+	7402  TEMPerHUM Temperature & Humidity Sensor
+	7403  Foot Switch
+	7404  Foot switch FS1-P
 	8000  DC31VC
+	8006  Dual Mode Camera (8006 VGA)
 	800a  Vivitar Vivicam3350B
 0c46  WaveRider Communications, Inc.
+0c4a  ALGE-TIMING GmbH
+	0889  Timy
+	088a  Timy 2
 0c4b  Reiner SCT Kartensysteme GmbH
 	0100  cyberJack e-com/pinpad
 	0300  cyberJack pinpad(a)
+	0400  cyberJack e-com(a)
+	0401  cyberJack pinpad(a2)
+	0500  cyberJack RFID standard dual interface smartcard reader
+	0501  cyberJack RFID comfort dual interface smartcard reader
+	0502  cyberJack compact
+	0504  cyberJack go / go plus
+	0505  cyberJack wave
+	9102  cyberJack RFID basis contactless smartcard reader
+0c4c  Needham's Electronics
+	0021  EMP-21 Universal Programmer
 0c52  Sealevel Systems, Inc.
+	2101  SeaLINK+232
+	2102  SeaLINK+485
+	2103  SeaLINK+232I
+	2104  SeaLINK+485I
+	2211  SeaPORT+2/232 (Port 1)
+	2212  SeaPORT+2/485 (Port 1)
+	2213  SeaPORT+2 (Port 1)
+	2221  SeaPORT+2/232 (Port 2)
+	2222  SeaPORT+2/485 (Port 2)
+	2223  SeaPORT+2 (Port 2)
+	2411  SeaPORT+4/232 (Port 1)
+	2412  SeaPORT+4/485 (Port 1)
+	2413  SeaPORT+4 (Port 1)
+	2421  SeaPORT+4/232 (Port 2)
+	2422  SeaPORT+4/485 (Port 2)
+	2423  SeaPORT+4 (Port 2)
+	2431  SeaPORT+4/232 (Port 3)
+	2432  SeaPORT+4/485 (Port 3)
+	2433  SeaPORT+4 (Port 3)
+	2441  SeaPORT+4/232 (Port 4)
+	2442  SeaPORT+4/485 (Port 4)
+	2443  SeaPORT+4 (Port 4)
+	2811  SeaLINK+8/232 (Port 1)
+	2812  SeaLINK+8/485 (Port 1)
+	2813  SeaLINK+8 (Port 1)
+	2821  SeaLINK+8/232 (Port 2)
+	2822  SeaLINK+8/485 (Port 2)
+	2823  SeaLINK+8 (Port 2)
+	2831  SeaLINK+8/232 (Port 3)
+	2832  SeaLINK+8/485 (Port 3)
+	2833  SeaLINK+8 (Port 3)
+	2841  SeaLINK+8/232 (Port 4)
+	2842  SeaLINK+8/485 (Port 4)
+	2843  SeaLINK+8 (Port 4)
+	2851  SeaLINK+8/232 (Port 5)
+	2852  SeaLINK+8/485 (Port 5)
+	2853  SeaLINK+8 (Port 5)
+	2861  SeaLINK+8/232 (Port 6)
+	2862  SeaLINK+8/485 (Port 6)
+	2863  SeaLINK+8 (Port 6)
+	2871  SeaLINK+8/232 (Port 7)
+	2872  SeaLINK+8/485 (Port 7)
+	2873  SeaLINK+8 (Port 7)
+	2881  SeaLINK+8/232 (Port 8)
+	2882  SeaLINK+8/485 (Port 8)
+	2883  SeaLINK+8 (Port 8)
+	9020  SeaLINK+422
+	a02a  SeaLINK+8 (Port 1+2)
+	a02b  SeaLINK+8 (Port 3+4)
+	a02c  SeaLINK+8 (Port 5+6)
+	a02d  SeaLINK+8 (Port 7+8)
 0c53  ViewPLUS, Inc.
 0c54  Glory, Ltd
 0c55  Spectrum Digital, Inc.
-	0510 Spectrum Digital XDS510 JTAG Debugger
+	0510  Spectrum Digital XDS510 JTAG Debugger
+	0540  SPI540
+	5416  TMS320C5416 DSK
+	6416  TMS320C6416 DDB
 0c56  Billion Bright, Ltd
 0c57  Imaginative Design Operation Co., Ltd
 0c58  Vidar Systems Corp.
 0c59  Dong Guan Shinko Wire Co., Ltd
 0c5a  TRS International Mfg., Inc.
 0c5e  Xytronix Research & Design
+0c60  Apogee Electronics Corp.
+	0001  MiniMe
+	0002  MiniDAC
+	0003  ONE
+	0004  GiO
+	0007  Duet
+	0009  Jam
+	000a  Jam Bootloader
+	000b  MiC
+	000c  MiC Bootloader
+	8007  Duet DFU Mode
 0c62  Chant Sincere Co., Ltd
 0c63  Toko, Inc.
 0c64  Signality System Engineering Co., Ltd
 0c65  Eminence Enterprise Co., Ltd
 0c66  Rexon Electronics Corp.
 0c67  Concept Telecom, Ltd
+0c6a  ACS
+	0005  Color 320 x 240 LCD Display Terminal with Touchscreen
+0c6c  JETI Technische Instrumente GmbH
+	04b2  Specbos 1201
 0c70  MCT Elektronikladen
 	0000  USB08 Development board
+	0747  Eye Movement Recorder [Visagraph]/[ReadAlyzer]
+0c72  PEAK System
+	000c  PCAN-USB
+	000d  PCAN Pro
 0c74  Optronic Laboratories Inc.
 	0002  OL 700-30 Goniometer
 0c76  JMTek, LLC.
+	0001  Mass Storage Controller
+	0002  Mass Storage Controller
 	0003  USBdisk
-	0005  Transcend USB Flash disk
+	0004  Mass Storage Controller
+	0005  Transcend Flash disk
 	0006  Transcend JetFlash
+	0007  Mass Storage Device
+	1600  Ion Quick Play LP turntable
+	1605  SSS Headphone Set
+	1607  audio controller
+	5663  Audio Device
 0c77  Sipix Group, Ltd
 	1001  SiPix Web2
 	1002  SiPix SC2100
@@ -3615,16 +14029,28 @@
 0c7a  Wing-Span Enterprise Co., Ltd
 0c86  NDA Technologies, Inc.
 0c88  Kyocera Wireless Corp.
+	0021  Handheld
+	17da  Qualcomm Kyocera CDMA Technologies MSM
 0c89  Honda Tsushin Kogyo Co., Ltd
 0c8a  Pathway Connectivity, Inc.
 0c8b  Wavefly Corp.
 0c8c  Coactive Networks
 0c8d  Tempo
 0c8e  Cesscom Co., Ltd
+	6000  Luxian Series
 0c8f  Applied Microsystems
+0c94  Cryptera
+	a000  EPP 1217
+0c98  Berkshire Products, Inc.
+	1140  USB PC Watchdog
 0c99  Innochips Co., Ltd
 0c9a  Hanwool Robotics Corp.
 0c9b  Jobin Yvon, Inc.
+0c9c  Brand Innovators BV
+	1511  BI-1511 Laser Simulator
+	1512  BI-1512 Syncbus Monitor
+	1514  BI-1514 HPC
+	1532  BI-1532 GPC
 0c9d  SemTek
 	0170  3873 Manual Insert card reader
 0ca2  Zyfer
@@ -3632,14 +14058,32 @@
 0ca4  ST&T Instrument Corp.
 0ca5  BAE Systems Canada, Inc.
 0ca6  Castles Technology Co., Ltd
+	0010  EZUSB PC/SC Smart Card Reader
+	0050  EZ220PU Reader Controller
+	1077  Bludrive Family Smart Card Reader
+	107e  Reader Controller
+	2010  myPad110 PC/SC Smart Card Reader
+	3050  EZ710 Smart Card Reader
 0ca7  Information Systems Laboratories
+0caa  Allied Telesis KK.
+	3001  AT-VT-Kit3 Serial Adapter
 0cad  Motorola CGISS
+	1007  APX Series Consolette
+	1020  MOTOTRBO Series Radio (Portable)
+	1030  APX Series Radio (Portable)
+	1031  APX Series Radio (Mobile)
+	1602  IMPRES Battery Data Reader
+	9001  PowerPad Pocket PC Device
 0cae  Ascom Business Systems, Ltd
 0caf  Buslink
+	2507  Hi-Speed USB-to-IDE Bridge Controller
 	2515  Flash Disk Embedded Hub
 	2516  Flash Disk Security Device
 	2517  Flash Disk Mass Storage Device
+	25c7  Hi-Speed USB-to-IDE Bridge Controller
 	3a00  Hard Drive
+	3a20  Mass Storage Device
+	3acd  Mass Storage Device
 0cb0  Flying Pig Systems
 0cb1  Innovonics, Inc.
 0cb6  Celestix Networks, Pte., Ltd
@@ -3648,6 +14092,10 @@
 0cba  Trust Electronic (Shanghai) Co., Ltd
 0cbb  Shanghai Darong Electronics Co., Ltd
 0cbc  Palmax Technology Co., Ltd
+	0101  Pocket PC P6C
+	0201  Personal Digital Assistant
+	0301  Personal Digital Assistant P6M+
+	0401  Pocket PC
 0cbd  Pentel Co., Ltd (Electronics Equipment Div.)
 0cbe  Keryx Technologies, Inc.
 0cbf  Union Genius Computer Co., Ltd
@@ -3658,97 +14106,310 @@
 0cc4  emsys GmbH
 0cc5  Sendo
 0cc6  Intermagic Corp.
-0cc7  Kontron Medical AG
 0cc8  Technotools Corp.
 0cc9  BroadMAX Technologies, Inc.
 0cca  Amphenol
 0ccb  SKNet Co., Ltd
 0ccc  Domex Technology Corp.
 0ccd  TerraTec Electronic GmbH
-	0038  Cinergy T^2 DVB-T Receiver
+	0012  PHASE 26
+	0013  PHASE 26
+	0014  PHASE 26
+	0015  Flash Update for TerraTec PHASE 26
+	0021  Cameo Grabster 200
+	0023  Mystify Claw
+	0028  Aureon 5.1 MkII
+	0032  MIDI HUBBLE
+	0035  Miditech Play'n Roll
+	0036  Cinergy 250 Audio
+	0037  Cinergy 250 Audio
+	0038  Cinergy T² DVB-T Receiver
+	0039  Grabster AV 400
+	003b  Cinergy 400
+	003c  Grabster AV 250
+	0042  Cinergy Hybrid T XS
+	0043  Cinergy T XS
+	004e  Cinergy T XS
+	004f  Cinergy Analog XS
+	0055  Cinergy T XE (Version 1, AF9005)
+	005c  Cinergy T²
+	0069  Cinergy T XE (Version 2, AF9015)
+	006b  Cinergy HT PVR (EU)
+	0072  Cinergy Hybrid T
+	0077  Aureon Dual USB
+	0078  Cinergy T XXS
+	0086  Cinergy Hybrid XE
+	008e  Cinergy HTC XS
+	0096  Grabby
+	0097  Cinergy T RC MKII
+	0099  AfaTech 9015 [Cinergy T Stick Dual]
+	00a5  Cinergy Hybrid Stick
+	00a9  RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black]
+	00b3  NOXON DAB/DAB+ Stick
+	00b9  WDR DAB/DAB+ Stick
+	00e0  NOXON DAB/DAB+ Stick V2
+	0102  Cinergy S2 Stick
+	0105  Cinergy S2 Box
+	10a7  TerraTec G3
+	10ad   Cinergy H5 Rev. 2
 0cd4  Bang Olufsen
 	0101  BeolinkPC2
+0cd5  LabJack Corporation
+	0003  U3
+	0009  UE9
+0cd6  Scheidt & Bachmann
+	000c  S&B TPU
+	000e  S&B BKV
+	0011  Money Coin Unit
 0cd7  NewChip S.r.l.
 0cd8  JS Digitech, Inc.
+	2007  Smart Card Reader/JSTU-9700
 0cd9  Hitachi Shin Din Cable, Ltd
 0cde  Z-Com
+	0001  XI-750 802.11b Wireless Adapter [Atmel AT76C503A]
 	0002  XI-725/726 Prism2.5 802.11b Adapter
+	0003  Sagem 802.11b Dongle
+	0004  Sagem 802.11b Dongle
 	0005  XI-735 Prism3 802.11b Adapter
-	0006  Medion 40900 802.11b Adapter
+	0006  XG-300 802.11b Adapter
+	0008  XG-703A 802.11g Wireless Adapter [Intersil ISL3887]
+	0009  (ZD1211)IEEE 802.11b+g Adapter
+	0011  ZD1211
+	0012  AR5523
+	0013  AR5523 driver (no firmware)
+	0014  NB 802.11g Wireless LAN Adapter(3887A)
+	0015  XG-705A 802.11g Wireless Adapter [Intersil ISL3887]
+	0016  NB 802.11g Wireless LAN Adapter(3887A)
+	0018  NB 802.11a/b/g Wireless LAN Adapter(3887A)
+	001a  802.11bg
+	001c  802.11b/g Wireless Network Adapter
+	0020  AG-760A 802.11abg Wireless Adapter [ZyDAS ZD1211B]
+	0022  802.11b/g/n Wireless Network Adapter
+	0023  UB81 802.11bgn
+	0025  802.11b/g/n USB Wireless Network Adapter
+	0026  UB82 802.11abgn
+	0027  Sphairon Homelink 1202 802.11n Wireless Adapter [Atheros AR9170]
+0ce5  Validation Technologies International
+	0003  Matrix
+0ce9  Pico Technology
+	1001  PicoScope3000 series PC Oscilloscope
+	1007  PicoScope 2000 series PC Oscilloscope
+	1008  PicoScope 5000 series PC Oscilloscope
+	1009  PicoScope 4000 series PC Oscilloscope
+	100e  PicoScope 6000 series PC Oscilloscope
+	1012  PicoScope 3000A series PC Oscilloscope
+	1016  PicoScope 2000A series PC Oscilloscope
+	1018  PicoScope 4000A series PC Oscilloscope
+	1200  PicoScope 2000 series PC Oscilloscope
+	1201  PicoScope 3000 series PC Oscilloscope
+	1202  PicoScope 4000 series PC Oscilloscope
+	1203  PicoScope 5000 series PC Oscilloscope
+	1204  PicoScope 6000 series PC Oscilloscope
+	1211  PicoScope 3000 series PC Oscilloscope
+	1212  PicoScope 4000 series PC Oscilloscope
 0cf1  e-Conn Electronic Co., Ltd
 0cf2  ENE Technology, Inc.
-0cf3  Atheros Communications, Inc.
+	6220  SD Card Reader (SG361)
+	6225  SD card reader (UB6225)
+	6230  SD Card Reader (UB623X)
+	6250  SD card reader (UB6250)
+0cf3  Qualcomm Atheros Communications
+	0001  AR5523
+	0002  AR5523 (no firmware)
+	0003  AR5523
+	0004  AR5523 (no firmware)
+	0005  AR5523
+	0006  AR5523 (no firmware)
+	0036  AR9462 Bluetooth
+	1001  Thomson TG121N [Atheros AR9001U-(2)NG]
+	1002  TP-Link TL-WN821N v2 / TL-WN822N v1 802.11n [Atheros AR9170]
+	1006  TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271]
+	1010  3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170]
+	20ff  AR7010 (no firmware)
+	3000  AR3011 Bluetooth (no firmware)
+	3002  AR3011 Bluetooth
+	3004  AR3012 Bluetooth 4.0
+	3005  AR3011 Bluetooth
+	3007  AR3012 Bluetooth 4.0 (no firmware)
+	3008  Bluetooth (AR3011)
+	311d  Bluetooth
+	311f  AR3012 Bluetooth
+	7015  TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287]
+	9170  AR9170 802.11n
+	9271  AR9271 802.11n
+	9378  QCA9377-7
+	b002  Ubiquiti WiFiStation 802.11n [Atheros AR9271]
+	b003  Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271]
+	e006  Dell Wireless 1802 Bluetooth 4.0 LE
+	e300  QCA61x4 Bluetooth 4.0
 0cf4  Fomtex Corp.
 0cf5  Cellink Co., Ltd
 0cf6  Compucable Corp.
 0cf7  ishoni Networks
 0cf8  Clarisys, Inc.
+	0750  Claritel-i750 - vp
 0cf9  Central System Research Co., Ltd
 0cfa  Inviso, Inc.
 0cfc  Minolta-QMS, Inc.
+	2301  Magicolor 2300 DL
+	2350  Magicolor 2350EN/3300
+	3100  Magicolor 3100
+	7300  Magicolor 5450/5550
 0cff  SAFA MEDIA Co., Ltd.
 	0320  SR-380N
 0d06  telos EDV Systementwicklung GmbH
+0d08  UTStarcom
+	0602  DV007 [serial]
+	0603  DV007 [storage]
 0d0b  Contemporary Controls
 0d0c  Astron Electronics Co., Ltd
 0d0d  MKNet Corp.
 0d0e  Hybrid Networks, Inc.
 0d0f  Feng Shin Cable Co., Ltd
 0d10  Elastic Networks
+	0001  StormPort (WDM)
 0d11  Maspro Denkoh Corp.
 0d12  Hansol Electronics, Inc.
 0d13  BMF Corp.
 0d14  Array Comm, Inc.
 0d15  OnStream b.v.
 0d16  Hi-Touch Imaging Technologies Co., Ltd
+	0001  PhotoShuttle
+	0002  Photo Printer 730 series
+	0004  Photo Printer 63xPL/PS
+	0007  P510K
+	0009  P72x Series
+	000a  P728L
+	000b  P510L
+	000d  P518A
+	000e  P910L
+	0010  M610
+	0100  Photo Printer 63xPL/PS
+	0102  Photo Printer 64xPS
+	0103  Photo Printer 730 series
+	0104  Photo Printer 63xPL/PS
+	0105  Photo Printer 64xPS
+	010e  P510S
+	0110  P110S
+	0111  P510Si
+	0112  P518S
+	0200  Photo Printer 64xDL
+	0309  CS-200e
+	030a  CS-220e
+	0501  P75x Series
+	0502  P52x Series
+	0503  P310L
+	050a  P310W
+	050f  P530D
+	0800  X610
 0d17  NALTEC, Inc.
 0d18  coaXmedia
 0d19  Hank Connection Industrial Co., Ltd
+0d28  NXP
+	0204  ARM mbed
+0d2f  Andamiro
+	0002  Pump It Up Pad
 0d32  Leo Hui Electric Wire & Cable Co., Ltd
 0d33  AirSpeak, Inc.
 0d34  Rearden Steel Technologies
 0d35  Dah Kun Co., Ltd
+0d3a  Posiflex Technologies, Inc.
+	0206  Series 3xxx Cash Drawer
+	0207  Series 3xxx Cash Drawer
+	0500  Magnetic Stripe Reader
 0d3c  Sri Cable Technology, Ltd
 0d3d  Tangtop Technology Co., Ltd
+	0001  HID Keyboard
+	0040  PS/2 Adapter
 0d3e  Fitcom, inc.
 0d3f  MTS Systems Corp.
 0d40  Ascor, Inc.
 0d41  Ta Yun Terminals Industrial Co., Ltd
 0d42  Full Der Co., Ltd
 0d46  Kobil Systems GmbH
+	2012  KAAN Standard Plus (Smartcard reader)
 	3003  mIDentity Light / KAAN SIM III
+	3014  Smart Token
 	4000  mIDentity (mass storage)
 	4001  mIDentity Basic/Classic (composite device)
 	4081  mIDentity Basic/Classic (installationless)
+0d48  Promethean Limited
+	0001  ACTIVboard
+	0004  ACTIVboard
+	0100  Audio
 0d49  Maxtor
+	3000  Drive
+	3005  Personal Storage 3000LS
+	3010  3000LE Drive
+	3100  Hi-Speed USB-IDE Bridge Controller
+	3200  Personal Storage 3200
+	5000  5000XT Drive
+	5010  5000LE Drive
+	5020  Mobile Hard Disk Drive
+	7000  OneTouch
+	7010  OneTouch
+	7100  OneTouch II 300GB External Hard Disk
+	7310  OneTouch 4
+	7410  Mobile Hard Disk Drive (1TB)
+	7450  Basics Portable USB Device
 0d4a  NF Corp.
 0d4b  Grape Systems, Inc.
 0d4c  Tedas AG
 0d4d  Coherent, Inc.
 0d4e  Agere Systems Netherland BV
+	047a  WLAN Card
+	1000  Wireless Card Model 0801
+	1001  Wireless Card Model 0802
 0d4f  EADS Airbus France
 0d50  Cleware GmbH
 	0011  USB-Temp2 Thermometer
+	0030  Multiplexer
+	0040  F4 foot switch
 0d51  Volex (Asia) Pte., Ltd
 0d53  HMI Co., Ltd
 0d54  Holon Corp.
 0d55  ASKA Technologies, Inc.
 0d56  AVLAB Technology, Inc.
 0d57  Solomon Microtech, Ltd
-0d5c  Belkin
-	a002  F5D6050 802.11b Adapter
+0d59  TRC Simulators b.v.
+	02a8  Digital Clock
+0d5c  SMC Networks, Inc.
+	a001  SMC2662W (v1) EZ Connect 802.11b Wireless Adapter [Atmel AT76C503A]
+	a002  SMC2662W v2 / SMC2662W-AR / Belkin F5D6050 [Atmel at76c503a]
 0d5e  Myacom, Ltd
+	2346  BT Digital Access adapter
 0d5f  CSI, Inc.
 0d60  IVL Technologies, Ltd
 0d61  Meilu Electronics (Shenzhen) Co., Ltd
 0d62  Darfon Electronics Corp.
-	a100  Benq Mouse
+	0003  Smartcard Reader
+	0004  Keyboard
+	001b  Keyboard
+	001c  Benq X120 Internet Keyboard Pro
+	0306  M530 Mouse
+	0800  Magic Wheel
+	2021  AM805 Keyboard
+	2026  TECOM Bluetooth Device
+	2050  Mouse
+	2106  Dell L20U Multimedia Keyboard
+	910e  HP Business Slim Keyboard
+	a100  Optical Mouse
 0d63  Fritz Gegauf AG
 0d64  DXG Technology Corp.
+	0105  Dual Mode Digital Camera 1.3M
 	0107  Horus MT-409 Camera
+	0108  Dual Mode Digital Camera
+	0202  Dual Mode Video Camera Device
 	0303  DXG-305V Camera
 	1001  SiPix Stylecam/UMAX AstraPix 320s
+	1002  Fashion Cam 01 Dual-Mode DSC (Video Camera)
+	1003  Fashion Cam Dual-Mode DSC (Controller)
 	1021  D-Link DSC 350F
+	1208  Dual Mode Still Camera Device
+	2208  Mass Storage
+	3105  Dual Mode Digital Camera Disk
+	3108  Digicam Mass Storage Device
+	5566  Contour Roam Model 1600
 0d65  KMJP Co., Ltd
 0d66  TMT
 0d67  Advanet, Inc.
@@ -3764,36 +14425,108 @@
 0d77  Power Sentry/Newpoint
 0d78  Japan Distributor Corp.
 0d7a  MARX Datentechnik GmbH
+	0001  CrypToken
 0d7b  Wellco Technology Co., Ltd
 0d7c  Taiwan Line Tek Electronic Co., Ltd
 0d7d  Phison Electronics Corp.
 	0100  PS1001/1011/1006/1026 Flash Disk
 	0110  Gigabyte FlexDrive
+	0120  Disk Pro 64MB
+	0124  GIGABYTE Disk
 	0240  I/O-Magic/Transcend 6-in-1 Card Reader
-	110E  NEC uPD720121/130 USB-ATA/ATAPI Bridge
+	110e  NEC uPD720121/130 USB-ATA/ATAPI Bridge
 	1240  Apacer 6-in-1 Card Reader 2.0
 	1270  Wolverine SixPac 6000
 	1300  Flash Disk
 	1320  PS2031 Flash Disk
+	1400  Attache 256MB USB 2.0 Flash Drive
 	1420  PS2044 Pen Drive
 	1470  Vosonic X's-Drive II+ VP2160
+	1620  USB Disk Pro
 	1900  USB Thumb Drive
 0d7e  American Computer & Digital Components
+	2507  Hi-Speed USB-to-IDE Bridge Controller
+	2517  Hi-Speed Mass Storage Device
+	25c7  Hi-Speed USB-to-IDE Bridge Controller
 0d7f  Essential Reality LLC
+	0100  P5 Glove glove controller
 0d80  H.R. Silvine Electronics, Inc.
 0d81  TechnoVision
 0d83  Think Outside, Inc.
+0d87  Dolby Laboratories Inc.
 0d89  Oz Software
 0d8a  King Jim Co., Ltd
+	0101  TEPRA PRO
 0d8b  Ascom Telecommunications, Ltd
 0d8c  C-Media Electronics, Inc.
+	0001  Audio Device
+	0002  Composite Device
+	0003  Sound Device
+	0004  CM6631A Audio Processor
+	0005  Blue Snowball
+	0006  Storm HP-USB500 5.1 Headset
 	000c  Audio Adapter
-	000e  Audio Adapter (Planet UP-100 USB Phone)
-	0103  Turtle Beach Audio Advantage Micro
+	000d  Composite Device
+	000e  Audio Adapter (Planet UP-100, Genius G-Talk)
+	0014  Audio Adapter (Unitek Y-247A)
+	001f  CM108 Audio Controller
+	0102  CM106 Like Sound Device
+	0103  CM102-A+/102S+ Audio Controller
+	0104  CM103+ Audio Controller
+	0105  CM108 Audio Controller
+	0107  CM108 Audio Controller
+	010f  CM108 Audio Controller
+	0115  CM108 Audio Controller
+	0139  Multimedia Headset [Gigaware by Ignition L.P.]
+	013c  CM108 Audio Controller
+	0201  CM6501
+	5000  Mass Storage Controller
+	5200  Mass Storage Controller(0D8C,5200)
 	b213  USB Phone CM109 (aka CT2000,VPT1000)
 0d8d  Promotion & Display Technology, Ltd
+	0234  V-234 Composite Device
+	0550  V-550 Composite Device
+	0551  V-551 Composite Device
+	0552  V-552 Composite Device
+	0651  V-651 Composite Device
+	0652  V-652 Composite Device
+	0653  V-653 Composite Device
+	0654  V-654 Composite Device
+	0655  V-655 Composite Device
+	0656  V-656 Composite Device
+	0657  V-657 Composite Device
+	0658  V-658 Composite Device
+	0659  V-659 Composite Device
+	0660  V-660 Composite Device
+	0661  V-661 Composite Device
+	0662  V-662 Composite Device
+	0850  V-850 Composite Device
+	0851  V-851 Composite Device
+	0852  V-852 Composite Device
+	0901  V-901 Composite Device
+	0902  V-902 Composite Device
+	0903  V-903 Composite Device
+	4754  Voyager DMP Composite Device
+	bb00  Bloomberg Composite Device
+	bb01  Bloomberg Composite Device
+	bb02  Bloomberg Composite Device
+	bb03  Bloomberg Composite Device
+	bb04  Bloomberg Composite Device
+	bb05  Bloomberg Composite Device
+	fffe  Global Tuner Composite Device
+	ffff  Voyager DMP Composite Device
 0d8e  Global Sun Technology, Inc.
+	0163  802.11g 54 Mbps Wireless Dongle
+	1621  802.11b Wireless Adapter
+	3762  Cohiba 802.11g Wireless Mini adapter [Intersil ISL3887]
+	3763  802.11g Wireless dongle
 	7100  802.11b Adapter
+	7110  WL-210 / WU210P 802.11b Wireless Adapter [Atmel AT76C503A]
+	7605  TRENDnet TEW-224UB 802.11b Wireless Adapter [Atmel AT76C503A]
+	7801  AR5523
+	7802  AR5523 (no firmware)
+	7811  AR5523
+	7812  AR5523 (no firmware)
 	7a01  PRISM25 802.11b Adapter
 0d8f  Pitney Bowes
 0d90  Sure-Fire Electrical Corp.
@@ -3809,18 +14542,32 @@
 	0001  SBIG Astronomy Camera (without firmware)
 	0101  SBIG Astronomy Camera (with firmware)
 0d98  Mars Semiconductor Corp.
+	0300  Avaya Wireless Card
+	1007  Discovery Kids Digital Camera
 0d99  Trazer Technologies, Inc.
-0d9a  RTX Telecom AS
+0d9a  RTX AS
+	0001  Bluetooth Device
 0d9b  Tat Shing Electrical Co.
 0d9c  Chee Chen Hi-Technology Co., Ltd
 0d9d  Sanwa Supply, Inc.
 0d9e  Avaya
+	0300  Wireless Card
 0d9f  Powercom Co., Ltd
+	0001  Uninterruptible Power Supply
+	0002  Black Knight PRO / WOW Uninterruptible Power Supply (Cypress HID->COM RS232)
+	00a2  Imperial Uninterruptible Power Supply (HID PDC)
+	00a3  Smart King PRO Uninterruptible Power Supply (HID PDC)
+	00a4  WOW Uninterruptible Power Supply (HID PDC)
+	00a5  Vanguard Uninterruptible Power Supply (HID PDC)
+	00a6  Black Knight PRO Uninterruptible Power Supply (HID PDC)
 0da0  Danger Research
 0da1  Suzhou Peter's Precise Industrial Co., Ltd
 0da2  Land Instruments International, Ltd
 0da3  Nippon Electro-Sensory Devices Corp.
-0da4  Polar Electro OY
+0da4  Polar Electro Oy
+	0001  Interface
+	0003  FlowLink
+	0008  Loop
 0da7  IOGear, Inc.
 0da8  softDSP Co., Ltd
 	0001  SDS 200A Oscilloscope
@@ -3828,23 +14575,89 @@
 	0100  DVR/CVR-M140 MP3 Player
 0dad  Westover Scientific
 0db0  Micro Star International
+	1020  PC2PC WLAN Card
 	1967  Bluetooth Dongle
+	3713  Primo 73
+	3801  Motorola Bluetooth 2.1+EDR Device
+	3870  MS-3870 802.11bgn Wireless Module [Ralink RT3070]
+	3871  MS-3871 802.11bgn Wireless Module [Ralink RT8070]
 	4011  Medion Flash XL V2.0 Card Reader
+	4023  Lexar Mobile Card Reader
+	4600  802.11b/g Turbo Wireless Adapter
+	5501  Mass Storage Device
+	5502  Mass Storage Device
+	5513  MP3 Player
+	5515  MP3 Player
+	5516  MP3 Player
+	5580  Mega Sky 580 DVB-T Tuner [M902x]
+	5581  Mega Sky 580 DVB-T Tuner [GL861]
+	6823  UB11B/MS-6823 802.11b Wi-Fi adapter
+	6826  IEEE 802.11g Wireless Network Adapter
+	6855  Bluetooth Device
+	6861  MSI-6861 802.11g WiFi adapter
+	6865  RT2570
+	6869  RT2570
+	6874  RT2573
+	6877  RT2573
+	6881  Bluetooth Class I EDR Device
+	688a  Bluetooth Class I EDR Device
+	6899  802.11bgn 1T1R Mini Card Wireless Adapter
+	6970  MS-6970 BToes Bluetooth adapter
 	697a  Bluetooth Dongle
-	6982  Medion Flash XL V2.7A Card Reader
+	6982  Medion Flash XL Card Reader
+	a861  RT2573
+	a874  RT2573
 	a970  Bluetooth dongle
+	a97a  Bluetooth EDR Device
+	b970  Bluetooth EDR Device
+	b97a  Bluetooth EDR Device
+	ffff  Bluetooth Adapter in DFU mode
 0db1  Wen Te Electronics Co., Ltd
 0db2  Shian Hwi Plug Parts, Plastic Factory
 0db3  Tekram Technology Co., Ltd
 0db4  Chung Fu Chen Yeh Enterprise Corp.
+0db5  Access IS
+	0139  Barcode Module - CDC serial
+	013a  Barcode Module - Virtual Keyboard
+	013b  Barcode Module - HID
+	0160  NFC and Smartcard Module (NSM)
+	0164  NFC and Smartcard Module (NSM)with 4 SAM slots
+0db7  ELCON Systemtechnik
+	0002  Goldpfeil P-LAN
+0dba  Digidesign
+	1000  Mbox 1 [Mbox]
+	3000  Mbox 2
+	b011  Eleven Rack
+0dbc  A&D Medical
+	0003  AND Serial Cable [AND Smart Cable]
 0dbe  Jiuh Shiuh Precision Industry Co., Ltd
-0dbf  Quik Tech Solutions
-0dc0  Great Notions
+0dbf  Jess-Link International
+	0002  SmartDongle Security Key
+	0200  HDD Storage Solution
+	021b  USB-2.0 IDE Adapter
+	0300  Storage Adapter
+	0333  Storage Adapter
+	0502  FSC Storagebird XL hard disk
+	0707  ZIV Drive
+0dc0  G7 Solutions (formerly Great Notions)
 0dc1  Tamagawa Seiki Co., Ltd
 0dc3  Athena Smartcard Solutions, Inc.
-0dc4  Macpower Peripherals, Ltd
+	0801  ASEDrive III
+	0802  ASEDrive IIIe
+	1104  ASEDrive IIIe KB
+	1701  ASEKey
+	1702  ASEKey
+0dc4  inXtron, Inc.
+	0040  Mass Storage Device
+	0041  Mass Storage Device
+	0042  Mass Storage Device
+	0101  Hi-Speed Mass Storage Device
+	0209  SK-3500 S2
+	020a  Oyen Digital MiniPro 2.5" hard drive enclosure
+	0290  Mass Storage Device [NT2 U3.1]
 0dc5  SDK Co., Ltd
 0dc6  Precision Squared Technology Corp.
+	2301  Wireless Touchpad Keyboard
 0dc7  First Cable Line, Inc.
 0dcd  NetworkFab Corp.
 	0001  Remote Interface Adapter
@@ -3853,42 +14666,173 @@
 	1002  Triple Talk Speech Synthesizer
 0dd1  Contek Electronics Co., Ltd
 0dd2  Power Quotient International Co., Ltd
+	0003  Mass Storage (P)
 0dd3  MediaQ
 0dd4  Custom Engineering SPA
+	0237  K80 80mm Thermal Printer
 0dd5  California Micro Devices
 0dd7  Kocom Co., Ltd
 0dd8  Netac Technology Co., Ltd
+	0562  Netac Portable SSD Z6s
+	1060  USB-CF-Card
 	e007  OnlyDisk U222 Pendrive
+	f607  OnlyDisk U210 1G flash drive [U-SAFE]
 0dd9  HighSpeed Surfing
 0dda  Integrated Circuit Solution, Inc.
+	0001  Multi-Card Reader 6in1
+	0002  Multi-Card Reader 7in1
+	0003  Flash Disk
+	0005  Internal Multi-Card Reader 6in1
+	0008  SD single card reader
+	0009  MS single card reader
+	000a  MS+SD Dual Card Reader
+	000b  SM single card reader
+	0101  All-In-One Card Reader
+	0102  All-In-One Card Reader
+	0301  MP3 Player
+	0302  Multi-Card MP3 Player
+	1001  Multi-Flash Disk
+	2001  Multi-Card Reader
+	2002  Q018 default PID
+	2003  Multi-Card Reader
+	2005  Datalux DLX-1611 16in1 Card Reader
+	2006  All-In-One Card Reader
+	2007  USB to ATAPI bridge
+	2008  All-In-One Card Reader
+	2013  SD/MS Combo Card Reader
+	2014  SD/MS Single Card Reader
+	2023  card reader SD/MS DEMO board with ICSI brand name (MaskROM version)
+	2024  card reader SD/MS DEMO board with Generic brand name (MaskROM version)
 	2026  USB2.0 Card Reader
 	2027  USB 2.0 Card Reader
+	2315  UFD MP3 player (model 2)
+	2318  UFD MP3 player (model 1)
+	2321  UFD MP3 player
 0ddb  Tamarack, Inc.
 0ddd  Datelink Technology Co., Ltd
 0dde  Ubicom, Inc.
 0de0  BD Consumer Healthcare
+0de7  USBmicro
+	0191  U401 Interface card
+	01a5  U421 interface card
+	01c3  U451 relay interface card
+0dea  UTECH Electronic (D.G.) Co., Ltd.
 0ded  Novasonics
 0dee  Lifetime Memory Products
+	4010  Storage Adapter
 0def  Full Rise Electronic Co., Ltd
+0df4  NET&SYS
+	0201  MNG-2005
 0df6  Sitecom Europe B.V.
-	9071  zd1211 802.11g Adapter
+	0001  C-Media VOIP Device
+	0004  Bluetooth 2.0 Adapter 100m
+	0007  Bluetooth 2.0 Adapter 10m
+	000b  Bluetooth 2.0 Adapter DFU
+	000d  WL-168 Wireless Network Adapter 54g
+	0017  WL-182 Wireless-N Network USB Card
+	0019  Bluetooth 2.0 adapter 10m CN-512v2 001
+	001a  Bluetooth 2.0 adapter 100m CN-521v2 001 
+	002b  WL-188 Wireless Network 300N USB Adapter
+	002c  WL-301 Wireless Network 300N USB Adapter
+	002d  WL-302 Wireless Network 300N USB dongle 
+	0036  WL-603 Wireless Adapter
+	0039  WL-315 Wireless-N USB Adapter
+	003b  WL-321 Wireless USB Gaming Adapter 300N
+	003c  WL-323 Wireless-N USB Adapter
+	003d  WL-324 Wireless USB Adapter 300N
+	003e  WL-343 Wireless USB Adapter 150N X1
+	003f  WL-608 Wireless USB Adapter 54g
+	0040  WL-344 Wireless Adapter 300N X2 [Ralink RT3071]
+	0041  WL-329 Wireless Dualband USB adapter 300N
+	0042  WL-345 Wireless USB adapter 300N X3
+	0045  WL-353 Wireless USB Adapter 150N Nano
+	0047  WL-352v1 Wireless USB Adapter 300N 002
+	0048  WL-349v1 Wireless Adapter 150N 002 [Ralink RT3070]
+	0049  WL-356 Wireless Adapter 300N
+	004a  WL-358v1 Wireless Micro USB Adapter 300N X3 002
+	004b  WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU]
+	004c  WL-352 802.11n Adapter [Realtek RTL8191SU]
+	0050  WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370]
+	0056  LN-031 10/100/1000 Ethernet Adapter
+	005d  WLA-2000 v1.001 WLAN [RTL8191SU]
+	0060  WLA-4000 802.11bgn [Ralink RT3072]
+	0062  WLA-5000 802.11abgn [Ralink RT3572]
+	006f  WLA-5100
+	0072  AX88179 Gigabit Ethernet [Sitecom]
+	061c  LN-028 Network USB 2.0 Adapter
+	214a  IDE/SATA Combo Adapter [CN-330]
+	21f4  44 St Bluetooth Device
+	2200  Sitecom bluetooth2.0 class 2 dongle CN-512
+	2208  Sitecom bluetooth2.0 class 2 dongle CN-520
+	2209  Sitecom bluetooth2.0 class 1 dongle CN-521
+	3068  DC-104v2 ISDN Adapter [HFC-S]
+	9071  WL-113 rev 1 Wireless Network USB Adapter
+	9075  WL-117 Hi-Speed USB Adapter
+	90ac  WL-172 Wireless Network USB Adapter 54g Turbo
+	9712  WL-113 rev 2 Wireless Network USB Adapter
 0df7  Mobile Action Technology, Inc.
 	0620  MA-620 Infrared Adapter
 	0700  MA-700 Bluetooth Adapter
+	0720  MA-720 Bluetooth Adapter
+	0722  Bluetooth Dongle
+	0730  MA-730/MA-730G Bluetooth Adapter
+	0800  Data Cable
+	0820  Data Cable
+	0900  MA i-gotU Travel Logger GPS
+	1800  Generic Card Reader
+	1802  Card Reader
 0dfa  Toyo Communication Equipment Co., Ltd
 0dfc  GeneralTouch Technology Co., Ltd
 	0001  Touchscreen
+	0003  MultiTouch TouchScreen(Dualtouch)
+	0101  5-point Touch Screen
+	d107  MultiTouch TouchScreen
 0e03  Nippon Systemware Co., Ltd
 0e08  Winbest Technology Co., Ltd
+0e0b  Amigo Technology Inc.
+	9031  802.11n Wireless USB Card
+	9041  802.11n Wireless USB Card
 0e0c  Gesytec
 	0101  LonUSB LonTalk Network Adapter
+0e0d  PicoQuant GmbH
+	0003  PicoHarp 300
+0e0f  VMware, Inc.
+	0001  Device
+	0002  Virtual USB Hub
+	0003  Virtual Mouse
+	0004  Virtual CCID
+	0005  Virtual Mass Storage
+	0006  Virtual Keyboard
+	000a  Virtual Sensors
+	8001  Root Hub
+	8002  Root Hub
+	8003  Root Hub
+	f80a  Smoker FX2
 0e16  JMTek, LLC
 0e17  Walex Electronic, Ltd
+0e1a  Unisys
 0e1b  Crewave
+0e1e  Green Hills Software
+0e20  Pegasus Technologies Ltd.
+	0101  NoteTaker
+	0200  Seiko Instruments InkLink Handwriting System
 0e21  Cowon Systems, Inc.
 	0300  iAudio CW200
-	0510  iAudio X5
+	0400  MP3 Player
+	0500  iAudio M3
+	0510  iAudio X5, subpack USB port
+	0513  iAudio X5, side USB port
+	0520  iAudio M5, side USB port
+	0601  iAudio G3
+	0681  iAUDIO E2
 	0700  iAudio U3
+	0751  iAudio 7
+	0760  iAUDIO U5 / iAUDIO G2
+	0800  Cowon D2 (UMS mode)
+	0801  Cowon D2 (MTP mode)
+	0910  iAUDIO 9
+	0920  J3
+0e22  Symbian Ltd.
 0e23  Liou Yuane Enterprise Co., Ltd
 0e25  VinChip Systems, Inc.
 0e26  J-Phone East Co., Ltd
@@ -3896,23 +14840,29 @@
 0e34  Micro Computer Control Corp.
 0e35  3Pea Technologies, Inc.
 0e36  TiePie engineering
-	0008  Handyscope HS3
-	0009  Handyscope HS3 (br)
-	000a  Handyscope HS4
-	000b  Handyscope HS4 (br)
-	000e  Handyscope HS4 Diff
-	000f  Handyscope HS4 Diff (br)
+	0009  Handyscope HS3
+	000b  Handyscope HS4
+	000f  Handyscope HS4-DIFF (br)
 	0010  Handyscope HS2
+	0011  TiePieSCOPE HS805 (br)
+	0012  TiePieSCOPE HS805
+	0013  Handyprobe HP3
+	0014  Handyprobe HP3
 	0018  Handyprobe HP2
+	001b  Handyscope HS5
 	0042  TiePieSCOPE HS801
 	00fd  USB To Parallel adapter
 	00fe  USB To Parallel adapter
 0e38  Stratitec, Inc.
 0e39  Smart Modular Technologies, Inc.
+	0137  Bluetooth Device
 0e3a  Neostar Technology Co., Ltd
 	1100  CW-1100 Wireless Network Adapter
 0e3b  Mansella, Ltd
 0e41  Line6, Inc.
+	4147  TonePort GX
+	414d  Pod HD500
+	4156  POD HD Desktop
 	4250  BassPODxt
 	4252  BassPODxt Pro
 	4642  BassPODxt Live
@@ -3920,37 +14870,143 @@
 	4750  GuitarPort
 	5044  PODxt
 	5050  PODxt Pro
-	534D  SeaMonkey
+	534d  SeaMonkey
+0e44  Sun-Riseful Technology Co., Ltd.
 0e48  Julia Corp., Ltd
 	0100  CardPro SmartCard Reader
 0e4a  Shenzhen Bao Hing Electric Wire & Cable Mfr. Co.
 0e4c  Radica Games, Ltd
+	1097  Gamester Controller
+	1103  Gamester Reflex
+	2390  Jtech Controller
+	3510  Gamester for Xbox
+	7288  funkey reader
+0e50  TechnoData Interware
+	0001  Matrix USB-Key
+	0002  Matrixlock Dongle (HID)
 0e55  Speed Dragon Multimedia, Ltd
+	110a  Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter]
 	110b  MS3303H USB-to-Serial Bridge
+0e56  Kingston Technology Company, Inc.
+	6021  K-PEX 100
 0e5a  Active Co., Ltd
 0e5b  Union Power Information Industrial Co., Ltd
 0e5c  Bitland Information Technology Co., Ltd
+	6118  LCD Device
+	6119  remote receive and control device
+	6441  C-Media Sound Device
 0e5d  Neltron Industrial Co., Ltd
-0e66  Hawking
+0e5e  Conwise Technology Co., Ltd.
+	6622  CW6622
+0e66  Hawking Technologies
+	0001  HWUN1 Hi-Gain Wireless-300N Adapter w/ Upgradable Antenna [Ralink RT2870]
+	0003  HWDN1 Hi-Gain Wireless-300N Dish Adapter [Ralink RT2870]
+	0009  HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770]
+	000b  HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770]
+	0013  HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070]
+	0015  HWDN2 Rev. E Hi-Gain Wireless-150N Dish Adapter [Realtek RTL8191SU]
+	0017  HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070]
+	0018  Wireless-N Network Adapter [Ralink RT2870]
+	400b  UF100 10/100 Network Adapter
 	400c  UF100 Ethernet [pegasus2]
 0e67  Fossil, Inc.
 	0002  Wrist PDA
 0e6a  Megawin Technology Co., Ltd
+	0101  MA100 [USB-UART Bridge IC]
+	02c0  Defender Gaming Keyboard
+	030b  Truly Ergonomic Computer Keyboard (Device Firmware Update mode)
+	030c  Truly Ergonomic Computer Keyboard
+	6001  GEMBIRD Flexible keyboard KB-109F-B-DE
+	7f5c  BPF-015 Key Chain Photo Frame
+0e6f  Logic3
+	0003  Freebird wireless Controller
+	0005  Eclipse wireless Controller
+	0006  Edge wireless Controller
+	0008  After Glow Pro Controller
+	0105  Disney's High School Musical 3 Dance Pad for Xbox 360
+	0113  Afterglow AX.1 Gamepad
+	011f  Rock Candy Wired Controller for Xbox 360
+	0128  Wireless PS3 Controller
+	0131  PDP EA Sports Controller
+	0133  Wired Controller
+	0139  Afterglow Prismatic Wired Controller for Xbox One
+	013a  PDP Xbox One Controller
+	0146  Rock Candy Wired Controller for Xbox One
+	0147  PDP Marvel Controller for Xbox One
+	015c  PDP Arcade Stick for Xbox One
+	0161  Camo Wired Controller for Xbox One
+	0162  Xbox One Wired Controller
+	0163  Legendary Collection Deliverer of Truth
+	0164  Battlefield 1 Wired Controller for Xbox One
+	0165  Titanfall 2 Wired Controller for Xbox One
+	0201  Pelican PL-3601
+	0213  Afterglow Gamepad for Xbox 360
+	021f  Rock Candy Gamepad for Xbox 360
+	0246  Rock Candy Gamepad for Xbox One
+	0301  Controller
+	0346  Rock Candy Wired Controller for Xbox One
+	0401  Controller
+	0413  Afterglow AX.1 Gamepad for Xbox 360
+	0501  Wired Controller
+	f501  Hi-TEC Essentials Wired Gamepad
+	f900  Afterglow AX.1
 0e70  Tokyo Electronic Industry Co., Ltd
 0e72  Hsi-Chin Electronics Co., Ltd
 0e75  TVS Electronics, Ltd
+0e79  Archos, Inc.
+	1106  Pocket Media Assistant - PMA400
+	1204  Gmini XS 200
+	1306  504 Portable Multimedia Player
+	1330  5 Tablet
+	1332  5 IMT
+	1416  32 IT
+	1417  A43 IT
+	14ad  97 Titanium HD
+	150e  80 G9
+	3001  40 Titanium
 0e7b  On-Tech Industry Co., Ltd
 0e7e  Gmate, Inc.
 	0001  Yopy 3000 PDA
+	1001  YP3X00 PDA
 0e82  Ching Tai Electric Wire & Cable Co., Ltd
+0e83  Shin An Wire & Cable Co.
 0e8c  Well Force Electronic Co., Ltd
+0e8d  MediaTek Inc.
+	0002  phone (mass storage mode) [Doro Primo 413]
+	0003  MT6227 phone
+	0004  MT6227 phone
+	0023  S103 / Powertel M6200
+	00a5  GSM modem [Medion Surfstick Model:S4222]
+	1806  Samsung SE-208 Slim Portable DVD Writer
+	1836  Samsung SE-S084 Super WriteMaster Slim External DVD writer
+	1887  Slim Portable DVD Writer
+	1956  Samsung SE-506 Portable BluRay Disc Writer
+	2000  MT65xx Preloader
+	2008  Cyrus Technology CS 24
+	3329  Qstarz BT-Q1000XT
+	7612  MT7612U 802.11a/b/g/n/ac Wireless Adapter
+	763e  MT7630e Bluetooth Adapter
+	7668  MT7668 2x2 Dual Band Dual Concurrent 802.11a/b/g/n/ac WiFi with MU-MIMO and Bluetooth 5.0 Radios
+0e8f  GreenAsia Inc.
+	0003  MaxFire Blaze2
+	0012  Joystick/Gamepad
+	0016  4 port USB 1.1 hub UH-174
+	0020  USB to PS/2 Adapter
+	0021  Multimedia Keyboard Controller
+	0022  multimedia keyboard controller
+	0201  SmartJoy Frag Xpad/PS2 adaptor
+	3008  Xbox Controller
+	300a  steering Wheel
 0e90  WiebeTech, LLC
+	0100  Storage Adapter V1
 0e91  VTech Engineering Canada, Ltd
 0e92  C's Glory Enterprise Co., Ltd
 0e93  eM Technics Co., Ltd
 0e95  Future Technology Co., Ltd
 0e96  Aplux Communications, Ltd
+	c001  TRUST 380 USB2 SPACEC@M
 0e97  Fingerworks, Inc.
+	0908  Composite HID (Keyboard and Mouse)
 0e98  Advanced Analogic Technologies, Inc.
 0e99  Parallel Dice Co., Ltd
 0e9a  TA HSING Industries, Ltd
@@ -3960,18 +15016,32 @@
 0e9f  Tamura Corp.
 0ea0  Ours Technology, Inc.
 	2126  7-in-1 Card Reader
-	2168  Transcend JetFlash 2.0 / Astone USB Drive
+	2153  SD Card Reader Key
+	2168  Transcend JetFlash 2.0 / Astone USB Drive / Intellegent Stick 2.0
+	2213  WinDroid N287 AH7N2502.013317
 	6803  OTI-6803 Flash Disk
 	6808  OTI-6808 Flash Disk
 	6828  OTI-6828 Flash Disk
+	6858  OTi-6858 serial adapter
 0ea6  Nihon Computer Co., Ltd
 0ea7  MSL Enterprises Corp.
 0ea8  CenDyne, Inc.
 0ead  Humax Co., Ltd
+0eb0  NovaTech
+	9020  NovaTech NV-902W
+	9021  RT2573
 0eb1  WIS Technologies, Inc.
+	6666  WinFast WalkieTV TV Loader
+	6668  WinFast WalkieTV TV Loader
+	7007  WinFast WalkieTV WDM Capture
 0eb2  Y-S Electronic Co., Ltd
 0eb3  Saint Technology Corp.
 0eb7  Endor AG
+0eb8  Mettler Toledo
+	2200  Ariva Scale
+	f000  BC60 Scale
+0ebb  Thermo Fisher Scientific
+	0002  FT-IR Spectrometer
 0ebe  VWeb Corp.
 0ebf  Omega Technology of Taiwan, Inc.
 0ec0  LHI Technology (China) Co., Ltd
@@ -3984,24 +15054,40 @@
 0ec7  Theta Link Corp.
 	1008  So., Show 301 Digital Camera
 0ecd  Lite-On IT Corp.
+	1400  CD\RW 40X
+	a100  LDW-411SX DVD/CD Rewritable Drive
 0ece  TaiSol Electronics Co., Ltd
 0ecf  Phogenix Imaging, LLC
 0ed1  WinMaxGroup
-	6660  USB Flash Disk 64M-C
-	6680  USB Flash Disk 64M-B
+	6660  Flash Disk 64M-C
+	6680  Flash Disk 64M-B
+	7634  MP3 Player
 0ed2  Kyoto Micro Computer Co., Ltd
 0ed3  Wing-Tech Enterprise Co., Ltd
+0ed5  Fiberbyte
+	e000  USB-inSync Device
+	f000  Fiberbyte USB-inSync Device
+	f201  Fiberbyte USB-inSync DAQ-2500X
 0eda  Noriake Itron Corp.
 0edf  e-MDT Co., Ltd
+	2060  FID irock! 100 Series
 0ee0  Shima Seiki Mfg., Ltd
 0ee1  Sarotech Co., Ltd
 0ee2  AMI Semiconductor, Inc.
 0ee3  ComTrue Technology Corp.
 	1000  Image Tank 1.5
 0ee4  Sunrich Technology, Ltd
+	0690  SATA 3 Adapter
 0eee  Digital Stream Technology, Inc.
+	8810  Mass Storage Drive
 0eef  D-WAV Scientific Co., Ltd
-	0001  eGalax TouchScreen
+	0001  Titan6001 Surface Acoustic Wave Touchscreen Controller [eGalax]
+	0002  Touchscreen Controller(Professional)
+	7200  Touchscreen Controller
+	7904  Multitouch Capacitive Touchscreen eGalaxTouch EXC7904-21v00_T13 [IIyama Prolite T1932-MSC]
+	a802  eGalaxTouch EXC7920
+	b10e  eGalaxTouch EXC3000
+	c000  Multitouch Capacitive Touchscreen eGalaxTouch EXC3188-4643-08.00.00.00 Sirius_4643 PCAP3188UR Series [IIyama Prolite PLT1932MSC]
 0ef0  Hitachi Cable, Ltd
 0ef1  Aichi Micro Intelligent Corp.
 0ef2  I/O Magic Corp.
@@ -4009,17 +15095,60 @@
 0ef4  DSI Datotech
 0ef5  PointChips
 	2202  Flash Disk
+	2366  Flash Disk
 0ef6  Yield Microelectronics Corp.
 0ef7  SM Tech Co., Ltd (Tulip)
-0efe  Wem Technology, Inc.
 0efd  Oasis Semiconductor
+0efe  Wem Technology, Inc.
+0f03  Unitek UPS Systems
+	0001  Alpha 1200Sx
 0f06  Visual Frontier Enterprise Co., Ltd
 0f08  CSL Wire & Plug (Shen Zhen) Co.
 0f0c  CAS Corp.
 0f0d  Hori Co., Ltd
+	000a  Dead or Alive 4 FightStick for Xbox 360
+	000c  Horipad EX Turbo for Xbox 360
+	000d  Fighting Stick EX2 for Xbox 360
+	0011  Real Arcade Pro 3
+	0016  Real Arcade Pro.EX for Xbox 360
+	001b  Real Aracde Pro.VX
+	0063  Real Arcade Pro Hayabusa for Xbox One
+	0067  Horipad One
+	0078  Real Arcade Pro V Kai for Xbox One / Xbox 360
+	0090  Horipad Ultimate
+	00c1  HORIPAD for Nintendo Switch
 0f0e  Energy Full Corp.
+0f0f  Silego Technology Inc
+	0006  GreenPak Universal Dev Board (Active Mode)
+	8006  GreenPak Universal Dev Board (Reset Mode)
+0f11  LD Didactic GmbH
+	1000  CASSY-S
+	1010  Pocket-CASSY
+	1020  Mobile-CASSY
+	1080  Joule and Wattmeter
+	1081  Digital Multimeter P
+	1090  UMI P
+	1100  X-Ray Apparatus
+	1101  X-Ray Apparatus
+	1200  VideoCom
+	2000  COM3LAB
+	2010  Terminal Adapter
+	2020  Network Analyser
+	2030  Converter Control Unit
+	2040  Machine Test System
 0f12  Mars Engineering Corp.
 0f13  Acetek Technology Co., Ltd
+0f14  Ingenico
+	0012  Vital'Act 3S
+	0038  XIRING Smart Card Terminal LEO V2
+0f18  Finger Lakes Instrumentation
+	0002  CCD
+	0006  Focuser
+	0007  Filter Wheel
+	000a  ProLine CCD
+	000b  Color Filter Wheel 4
+	000c  PDF2
+	000d  Guider
 0f19  Oracom Co., Ltd
 0f1b  Onset Computer Corp.
 0f1c  Funai Electric Co., Ltd
@@ -4032,14 +15161,32 @@
 0f2e  Geniality Maple Technology Co., Ltd
 0f2f  Priva Design Services
 0f30  Jess Technology Co., Ltd
+	001c  PS3 Guitar Controller Dongle
+	010b  Philips Recoil
+	0110  Dual Analog Rumble Pad
+	0111  Colour Rumble Pad
+	0202  Joytech Advanced Controller
+	0208  Xbox & PC Gamepad
+	8888  BigBen XBMiniPad Controller
 0f31  Chrysalis Development
 0f32  YFC-BonEagle Electric Co., Ltd
 0f37  Kokuyo Co., Ltd
 0f38  Nien-Yi Industrial Corp.
+0f39  TG3 Electronics
+	0404  Recreated ZX Spectrum Keyboard
+	0876  Keyboard [87 Francium Pro]
+	1086  DK2108SZ Keyboard [Ducky Zero]
 0f3d  Airprime, Incorporated
 	0112  CDMA 1xEVDO PC Card, PC 5220
 0f41  RDC Semiconductor Co., Ltd
 0f42  Nital Consulting Services, Inc.
+0f44  Polhemus
+	ef11  Patriot (firmware not loaded)
+	ef12  Patriot
+	ff11  Liberty (firmware not loaded)
+	ff12  Liberty
+0f49  Evolis SA
+	0a00  Zenius
 0f4b  St. John Technology Co., Ltd
 0f4c  WorldWide Cable Opto Corp.
 0f4d  Microtune, Inc.
@@ -4048,31 +15195,57 @@
 0f52  Wing Key Electrical Co., Ltd
 0f53  Dongguan White Horse Cable Factory, Ltd
 0f54  Kawai Musical Instruments Mfg. Co., Ltd
+	0101  MP6 Stage Piano
 0f55  AmbiCom, Inc.
 0f5c  Prairiecomm, Inc.
 0f5d  NewAge International, LLC
+	9455  Compact Drive
 0f5f  Key Technology Corp.
 0f60  NTK, Ltd
 0f61  Varian, Inc.
 0f62  Acrox Technologies Co., Ltd
+	1001  Targus Mini Trackball Optical Mouse
+0f63  LeapFrog Enterprises
+	0010  Leapster Explorer
+	0022  Leap Reader
+	0500  Fly Fusion
+	0600  Leap Port Turbo
+	0700  POGO
+	0800  Didj
+	0900  TAGSchool
+	0a00  Leapster 2
+	0b00  Crammer
+	0c00  Tag Jr
+	0d00  My Pal Scout
+	0e00  Tag32
+	0f00  Tag64
+	1000  Kiwi16
+	1100  Leapster L2x
+	1111  Fly Fusion
+	1300  Didj UK/France (Leapster Advance)
 0f68  Kobe Steel, Ltd
 0f69  Dionex Corp.
 0f6a  Vibren Technologies, Inc.
 0f6e  INTELLIGENT SYSTEMS
-	0100  GameBoy Color Emulator
+	0100  IS-CGB-EMULATOR
 	0201  GameBoy Advance Flash Gang Writer
-	0202  GameBoy Advance Capture
-	0300  Gamecube DOL Viewer
-	0400  NDS Emulator
-	0401  NDS UIC
-	0402  NDS Writer
-	0403  NDS Capture
-	0404  NDS Emulator (Lite)
+	0202  IS-AGB-CAPTURE
+	0300  IS-DOL-VIEWER
+	0400  IS-NITRO-EMULATOR
+	0401  IS-NITRO-UIC
+	0402  IS-NITRO-WRITER
+	0403  IS-NITRO-CAPTURE
+	0404  IS-NITRO-EMULATOR (DS Lite)
+	0500  IS-TWL-DEBUGGER
+	0501  IS-TWL-CAPTURE
 0f73  DFI
+0f78  Guntermann & Drunck GmbH
 0f7c  DQ Technology, Inc.
 0f7d  NetBotz, Inc.
 0f7e  Fluke Corp.
 0f88  VTech Holdings, Ltd
+	3012  RT2570
+	3014  ZD1211B
 0f8b  Yazaki Corp.
 0f8c  Young Generation International Corp.
 0f8d  Uniwill Computer Corp.
@@ -4093,7 +15266,11 @@
 0fb0  Haurtian Wire & Cable Co., Ltd
 0fb1  Inclose Design, Inc.
 0fb2  Juan-Chern Industrial Co., Ltd
+0fb6  Heber Ltd
+	3fc3  Firefly X10i I/O Board (with firmware)
+	3fc4  Firefly X10i I/O Board (without firmware)
 0fb8  Wistron Corp.
+	0002  eHome Infrared Receiver
 0fb9  AACom Corp.
 0fba  San Shing Electronics Co., Ltd
 0fbb  Bitwise Systems, Inc.
@@ -4104,20 +15281,184 @@
 0fc6  Dataplus Supplies, Inc.
 0fca  Research In Motion, Ltd.
 	0001  Blackberry Handheld
+	0004  Blackberry Handheld
+	0006  Blackberry Pearl
+	0008  Blackberry Pearl
+	8001  Blackberry Handheld
+	8004  Blackberry
+	8007  Blackberry Handheld
+	8010  Blackberry Playbook (Connect to Windows mode)
+	8011  Blackberry Playbook (Connect to Mac mode)
+	8014  Blackberry Handheld Z30
+	8020  Blackberry Playbook (CD-Rom mode)
+	8037  Blackberry PRIV
 0fce  Sony Ericsson Mobile Communications AB
+	0076  W910i (Multimedia mode)
+	00af  V640i Phone [PTP Camera]
+	00d4  C902 [MTP]
+	00d9  C702 Phone
+	0112  W995 Walkman Phone
+	014e  J108i Cedar (MTP mode)
+	015a  Xperia Pro [Media Transfer Protocol]
+	0166  Xperia Mini Pro
+	0167  ST15i (Xperia mini)
+	0169  Xperia S
+	0172  Xperia P
+	0177  Xperia Ion [Mass Storage]
+	0188  ST26i
+	019c  C6833
+	019e  C6903
+	01a5  SO-04F
+	01a7  D5503
+	01ba  D6603 [Xperia Z3]
+	01bb  D5803 [Xperia Z3 Compact] (MTP mode)
+	01e0  F5122 [Xperia X dual] (MTP mode)
+	01e8  F5321 [Xperia X Compact] (MTP mode)
+	01f9  H8314 [Xperia XZ2 Compact]
+	1010  WMC Modem
+	10af  V640i Phone [PictBridge]
+	10d4  C902 Phone [PictBridge]
+	2105  W715 Phone
+	2137  Xperia X10 mini (USB debug)
+	2138  Xperia X10 mini pro (Debug)
+	2149  Xperia X8 (debug)
+	214e  J108i Cedar (Windows-driver mode)
+	3137  Xperia X10 mini
+	3138  Xperia X10 mini pro
+	3149  Xperia X8
+	514f  Xperia arc S [Adb-Enable Mode]
+	5169  Xperia S [Adb-Enable Mode]
+	5177  Xperia Ion [Debug Mode]
+	518c  C1605 [Xperia E dual] MTD mode
+	51a7  D5503 (Xperia Z1 Compact)
+	51e0  F5122 [Xperia X dual] (developer mode)
+	614f  Xperia X12 (debug mode)
+	6166  Xperia Mini Pro
+	618c  C1605 [Xperia E dual] MSC mode
+	715a  Xperia Pro [Tethering]
+	7166  Xperia Mini Pro (Tethering mode)
+	7177  Xperia Ion [Tethering]
+	71f4  G8441 (Xperia XZ1 Compact) [Tethering]
+	71f9  H8314 [Xperia XZ2 Compact] (Tethering)
+	8004  9000 Phone [Mass Storage]
+	81f4  G8441 (Xperia XZ1 Compact) [Tethering]
+	adde  C2005 (Xperia M dual) in service mode
+	c1e0  F5122 [Xperia X dual] (MIDI mode)
+	c1e8  F5321 [Xperia X Compact] (MIDI mode)
+	c1f9  H8314 [Xperia XZ2 Compact] (MIDI)
+	d008  V800-Vodafone 802SE Phone
+	d016  K750i Phone
 	d017  K608i Phone
+	d019  VDC EGPRS Modem
+	d025  520 WMC Data Modem
+	d028  W800i
+	d038  W850i Phone
+	d039  K800i (phone mode)
+	d041  K510i Phone
+	d042  W810i Phone
+	d043  V630i Phone
+	d046  K610i Phone
+	d065  W960i Phone (PC Suite)
+	d076  W910i (Phone mode)
+	d079  K530 Phone
+	d089  W580i Phone (mass storage)
+	d0a1  K810
+	d0af  V640i Phone
+	d0cf  MD300 Mobile Broadband Modem
+	d0d4  C902 Phone [Modem]
+	d0e1  MD400 Mobile Broadband Modem
+	d12a  U100i Yari Phone
+	d12e  Xperia X10
+	d14e  J108i Cedar (modem mode)
+	e000  K810 (PictBridge mode)
+	e039  K800i (msc mode)
+	e042  W810i Phone
+	e043  V630i Phone [Mass Storage]
+	e075  K850i
+	e076  W910i (Mass storage)
+	e089  W580i Phone
+	e090  W200 Phone (Mass Storage)
+	e0a1  K810 (Mass Storage mode)
+	e0a3  W660i
+	e0af  V640i Phone [Mass Storage]
+	e0d4  C902 Phone [Mass Storage] 
+	e0ef  C905 Phone [Mass Storage]
+	e0f3  W595
+	e105  W705
+	e112  W995 Phone (Mass Storage)
+	e12e  X10i Phone
+	e133  Vivaz
+	e14e  J108i Cedar (mass-storage mode)
+	e14f  Xperia Arc/X12
+	e15a  Xperia Pro [Mass Storage Class]
+	e161  Xperia Ray
+	e166  Xperia Mini Pro
+	e167  XPERIA mini
+	e19b  C2005 [Xperia M dual] (Mass Storage)
+	e1a9  D5303
+	e1aa  D2303
+	e1ad  D5103
+	e1b0  D6708
+	e1b5  D2004
+	e1ba  D6683
+	e1bb  SO-02G
+	e1bc  D2203
+	e1c0  SGP621
+	e1c2  D2533
+	e1c9  E6553
+	e1cf  SGP771
+	f0fa  MN800 / Smartwatch 2 (DFU mode)
 0fcf  Dynastream Innovations, Inc.
+	1003  ANT Development Board
+	1004  ANTUSB Stick
+	1006  ANT Development Board
+	1008  ANTUSB2 Stick
+	1009  ANTUSB-m Stick
 0fd0  Tulip Computers B.V.
+0fd1  Giant Electronics Ltd.
+0fd2  Seac Banche
+	0001  RDS 6000
 0fd4  Tenovis GmbH & Co., KG
 0fd5  Direct Access Technology, Inc.
+0fd9  Elgato Systems GmbH
+	0011  EyeTV Diversity
+	0018  EyeTV Hybrid
+	0020  EyeTV DTT Deluxe
+	0021  EyeTV DTT
+	002a  EyeTV Sat
+	002c  EyeTV DTT Deluxe v2
+	0033  Video Capture
+	0037  Video Capture v2
+	0060  Stream Deck
+	0063  Stream Deck Mini
+	006c  Stream Deck XL
+	006d  Stream Deck original V2
+0fda  Quantec Networks GmbH
+	0100  quanton flight control
 0fdc  Micro Plus
+0fde  Oregon Scientific
+	ca01  WMRS200 weather station
+	ca05  CM160
+	ca08  WMR300 Professional Weather System
+0fe0  Osterhout Design Group
+	0100  Bluetooth Mouse
+	0101  Bluetooth IMU
+	0200  Bluetooth Keypad
+0fe2  Air Techniques
 0fe4  IN-Tech Electronics, Ltd
 0fe5  Greenconn (U.S.A.), Inc.
+0fe6  ICS Advent
+	8101  DM9601 Fast Ethernet Adapter
+	811e  Parallel Adapter
+	9700  DM9601 Fast Ethernet Adapter
 0fe9  DVICO
+	4020  TViX M-6500
+	9010  FusionRemote IR receiver
 	db00  FusionHDTV DVB-T (MT352+LgZ201) (uninitialized)
 	db01  FusionHDTV DVB-T (MT352+LgZ201) (initialized)
 	db10  FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized)
 	db11  FusionHDTV DVB-T (MT352+Thomson7579) (initialized)
+	db78  FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized)
 0fea  United Computer Accessories
 0feb  CRS Electronic Co., Ltd
 0fec  UMC Electronics Co., Ltd
@@ -4126,42 +15467,103 @@
 0fef  MJ Research, Inc.
 0ff6  Core Valley Co., Ltd
 0ff7  CHI SHING Computer Accessories Co., Ltd
+0ffc  Clavia DMI AB
+	0021  Nord Stage 2
+	002a  Nord Piano 4
+0ffd  EarlySense
+	ff00  OEM
 0fff  Aopen, Inc.
 1000  Speed Tech Corp.
+	153b  TerraTec Electronic GmbH
 1001  Ritronics Components (S) Pte., Ltd
 1003  Sigma Corp.
-	0100  Sigma SD10
+	0003  SD14
+	0100  SD9/SD10
+	8781  Dock UD-01
 1004  LG Electronics, Inc.
 	1fae  U8120 3G Cellphone
-	6000  VX4400/VX6000 Cellphone
+	6000  Various Mobile Phones
 	6005  T5100
+	6018  GM360/GD510/GW520/KP501
+	618e  Ally/Optimus One/Vortex (debug mode)
+	618f  Ally/Optimus One
+	61c5  P880 / Charge only
+	61c6  Vortex (msc)
+	61cc  Optimus S
+	61da  G2 Android Phone [tethering mode]
+	61f1  Optimus Android Phone [LG Software mode]
+	61f9  Optimus (Various Models) MTP Mode
+	61fc  Optimus 3
+	61fe  Optimus Android Phone [USB tethering mode]
+	627f  G3 (VS985) Android Phone (MTP/Download mode)
+	6300  G2/Optimus Android Phone [Charge mode]
+	631c  LM-X420xxx/G2/Optimus Android Phone (charge mode)
+	631d  Optimus Android Phone (Camera/PTP Mode)
+	631e  LM-X420xxx/G2/Optimus Android Phone (PTP/camera mode)
+	631f  Optimus Android Phone (Charge Mode)
+	633a  Ultimate 2 Android Phone L41C
+	633e  LM-X420xxx/G2/G3 Android Phone (MTP/download mode)
+	6344  LM-X420xxx/G2 Android Phone (USB tethering mode)
+	6348  LM-X420xxx Android Phone (MIDI mode)
+	6356  Optimus Android Phone [Virtual CD mode]
 	6800  CDMA Modem
+	7000  LG LDP-7024D(LD)USB
+	91c8  P880 / USB tethering
+	a400  Renoir (KC910)
 1005  Apacer Technology, Inc.
-	b113  Handy Steno 2.0 (256MB)
+	1001  MP3 Player
+	1004  MP3 Player
+	1006  MP3 Player
+	b113  Handy Steno/AH123 / Handy Steno 2.0/HT203
+	b155  Disk Module
+	b223  CD-RW + 6in1 Card Reader Digital Storage / Converter
 1006  iRiver, Ltd.
-	3002  iHP-100/120/140 MP3 Player
+	3001  iHP-100
+	3002  iHP-120/140 MP3 Player
+	3003  H320/H340
+	3004  H340 (mtp)
 1009  Emuzed, Inc.
+	000e  eHome Infrared Receiver
+	0013  Angel MPEG Device
+	0015  Lumanate Wave PAL SECAM DVBT Device
+	0016  Lumanate Wave NTSC/ATSC Combo Device
 100a  AV Chaseway, Ltd
+	2402  MP3 Player
+	2404  MP3 Player
+	2405  MP3 Player
+	2406  MP3 Player
+	a0c0  MP3 Player
 100b  Chou Chin Industrial Co., Ltd
 100d  Netopia, Inc.
 	3342  Cayman 3352 DSL Modem
+	3382  3380 Series Network Interface
+	6072  DSL Modem
+	9031  Motorola 802.11n Dualband USB Wireless Adapter
+	9032  Motorola 802.11n 5G USB Wireless Adapter
 	cb01  Cayman 3341 Ethernet DSL Router
 1010  Fukuda Denshi Co., Ltd
 1011  Mobile Media Tech.
+	0001  AccFast Mp3
 1012  SDKM Fibres, Wires & Cables Berhad
 1013  TST-Touchless Sensor Technology AG
 1014  Densitron Technologies PLC
 1015  Softronics Pty., Ltd
 1016  Xiamen Hung's Enterprise Co., Ltd
 1017  Speedy Industrial Supplies, Pte., Ltd
+	9015  M625 [Vendor: DELUX]
 1019  Elitegroup Computer Systems (ECS)
-	0c55  USB Flash Reader, Desknote UCR-61S2B
+	0c55  Flash Reader, Desknote UCR-61S2B
+	0f38  Infrared Receiver
 1020  Labtec
+	0006  Wireless Keyboard
 	000a  Wireless Optical Mouse
+	0106  Wireless Optical Mouse/Keyboard
 1022  Shinko Shoji Co., Ltd
 1025  Hyper-Paltek
 	005e  USB DVB-T device
 	005f  USB DVB-T device
+	0300  MP3 Player
+	0350  MP3 Player
 1026  Newly Corp.
 1027  Time Domain
 1028  Inovys Corp.
@@ -4169,27 +15571,180 @@
 102a  Ramos Technology Co., Ltd
 102b  Infotronic America, Inc.
 102c  Etoms Electronics Corp.
+	6151  Q-Cam Sangha CIF
+	6251  Q-Cam VGA
+	ff0c  Joytech Wireless Advanced Controller
 102d  Winic Corp.
 1031  Comax Technology, Inc.
 1032  C-One Technology Corp.
 1033  Nucam Corp.
-1038  Ideazon, Inc.
-	0100  Zboard
+	0068  3,5'' HDD case MD-231
+1038  SteelSeries ApS
+	0100  Ideazon Zboard
+	1260  Arctis 7 wireless adapter
+	1361  Ideazon Sensei
+	1410  SRW-S1 [Simraceway Steering Wheel]
+	1720  Mouse
 1039  devolo AG
+	0824  1866 802.11bg [Texas Instruments TNETW1450]
 	2140  dsl+ 1100 duo
+103a  PSA
+	f000  Actia Evo XS
+103d  Stanton
+	0100  ScratchAmp
+	0101  ScratchAmp
 1043  iCreate Technologies Corp.
+	160f  Wireless Network Adapter
+	4901  AV-836 Video Capture Device
 	8006  Flash Disk 32-256 MB
+	8012  Flash Disk 256 MB
 1044  Chu Yuen Enterprise Co., Ltd
+	7001  Gigabyte U7000 DVB-T tuner
+	7002  Gigabyte U8000 DVB-T tuner
+	7004  Gigabyte U7100 DVB-T tuner
+	7005  Gigabyte U7200 DVB-T tuner [AF9035]
+	7006  Gigabyte U6000 DVB-T tuner [em2863]
+	8001  GN-54G
+	8002  GN-BR402W
+	8003  GN-WLBM101
+	8004  GN-WLBZ101 802.11b Adapter
+	8005  GN-WLBZ201 802.11b Adapter
+	8006  GN-WBZB-M 802.11b Adapter
+	8007  GN-WBKG
+	8008  GN-WB01GS
+	800a  GN-WI05GS
+	800b  GN-WB30N 802.11n WLAN Card
+	800c  GN-WB31N 802.11n USB WLAN Card
+	800d  GN-WB32L 802.11n USB WLAN Card
 1046  Winbond Electronics Corp. [hex]
-	9967  W9967CF/W9968CF WebCam IC
+	6694  Generic W6694 USB
+	8901  Bluetooth Device
+	9967  W9967CF/W9968CF Webcam IC
+1048  Targus Group International
+	2010  4-Port hub
+104b  Mylex / Buslogic
 104c  AMCO TEC International, Inc.
+104d  Newport Corporation
+	1003  Model-52 LED Light Source Power Supply and Driver
+	3001  ESP301 3 Axis Motion Controller
+104f  WB Electronics
+	0001  Infinity Phoenix
+	0002  Smartmouse
+	0003  FunProgrammer
+	0004  Infinity Unlimited
+	0006  Infinity Smart
+	0007  Infinity Smart module
+	0008  Infinity CryptoKey
+	0009  RE-BL PlayStation 3 IR-to-Bluetooth converter
+1050  Yubico.com
+	0010  Yubikey (v1 or v2)
+	0110  Yubikey NEO(-N) OTP
+	0111  Yubikey NEO(-N) OTP+CCID
+	0112  Yubikey NEO(-N) CCID
+	0113  Yubikey NEO(-N) U2F
+	0114  Yubikey NEO(-N) OTP+U2F
+	0115  Yubikey NEO(-N) U2F+CCID
+	0116  Yubikey NEO(-N) OTP+U2F+CCID
+	0120  Yubikey Touch U2F Security Key
+	0200  Gnubby U2F
+	0211  Gnubby
+	0401  Yubikey 4/5 OTP
+	0402  Yubikey 4/5 U2F
+	0403  Yubikey 4/5 OTP+U2F
+	0404  Yubikey 4/5 CCID
+	0405  Yubikey 4/5 OTP+CCID
+	0406  Yubikey 4/5 U2F+CCID
+	0407  Yubikey 4/5 OTP+U2F+CCID
+	0410  Yubikey plus OTP+U2F
 1053  Immanuel Electronics Co., Ltd
 1054  BMS International Beheer N.V.
+	5004  DSL 7420 Loader
+	5005  DSL 7420 LAN Modem
 1055  Complex Micro Interconnection Co., Ltd
 1056  Hsin Chen Ent Co., Ltd
 1057  ON Semiconductor
 1058  Western Digital Technologies, Inc.
+	0200  FireWire USB Combo
+	0400  External HDD
+	0500  hub
+	0701  WD Passport (WDXMS)
+	0702  WD Passport (WDXMS)
+	0704  My Passport Essential (WDME)
+	0705  My Passport Elite (WDML)
+	070a  My Passport Essential (WDBAAA), My Passport for Mac (WDBAAB), My Passport Essential SE (WDBABM), My Passport SE for Mac (WDBABW)
+	070b  My Passport Elite (WDBAAC)
+	070c  My Passport Studio (WDBAAE)
+	071a  My Passport Essential (WDBAAA)
+	071d  My Passport Studio (WDBALG)
+	0730  My Passport Essential (WDBACY)
+	0732  My Passport Essential SE (WDBGYS)
+	0740  My Passport Essential (WDBACY)
+	0741  My Passport Ultra
+	0742  My Passport Essential SE (WDBGYS)
+	0748  My Passport (WDBKXH, WDBY8L)
+	07a8  My Passport (WDBBEP), My Passport for Mac (WDBLUZ)
+	07ae  My Passport Edge for Mac (WDBJBH)
+	07ba  PiDrive (WDLB)
+	0810  My Passport Ultra (WDBZFP)
+	0816  My Passport Air (WDBBLW)
+	0820  My Passport Ultra (WDBMWV, WDBZFP)
+	0822  My Passport Ultra (WDBBUZ)
+	0824  My Passport Slim (WDBPDZ)
+	0830  My Passport Ultra (WDBZFP)
+	0837  My Passport Ultra (WDBBKD)
+	0900  MyBook Essential External HDD
+	0901  My Book Essential Edition (Green Ring) (WDG1U)
+	0902  My Book Pro Edition (WDG1T)
+	0903  My Book Premium Edition
+	0905  My Book Pro Edition II (WD10000C033-001)
+	0910  My Book Essential Edition (Green Ring) (WDG1U)
+	1001  Elements Desktop (WDE1U)
+	1003  WD Elements Desktop (WDE1UBK)
+	1010  Elements Portable (WDBAAR)
+	1021  Elements Desktop (WDBAAU)
+	1023  Elements SE Portable (WDBABV)
+	1042  Elements SE Portable (WDBPCK)
+	1048  Elements Portable (WDBU6Y)
+	1078  Elements Portable (WDBUZG)
+	107c  Elements Desktop (WDBWLG)
+	10a2  Elements SE Portable (WDBPCK)
+	10a8  Elements Portable (WDBUZG)
+	10b8  Elements Portable (WDBU6Y, WDBUZG)
+	1100  My Book Essential Edition 2.0 (WDH1U)
+	1102  My Book Home Edition (WDH1CS)
+	1103  My Book Studio
+	1104  My Book Mirror Edition (WDH2U)
+	1105  My Book Studio II
+	1110  My Book Essential (WDBAAF), My Book for Mac (WDBAAG)
+	1111  My Book Elite (WDBAAH)
+	1112  My Book Studio (WDBAAJ), My Book Studio LX (WDBACH)
+	1123  My Book 3.0 (WDBABP)
+	1130  My Book Essential (WDBACW)
+	1140  My Book Essential (WDBACW)
+	1170  My Book Essential 3TB (WDBACW0030HBK)
+	1230  My Book (WDBFJK)
+	1235  My Book (WDBFJK0040HBK)
+	2599  My Passport Ultra (WD40NMZW)
+	259d  My Passport Ultra (WDBBKD)
+	259f  My Passport Ultra (WD10JMVW)
+	25a1  Elements / My Passport
+	25a2  Elements 25A2
+	25a3  Elements Desktop (WDBWLG)
+	25da  My Book (WDBFJK)
+	25e1  My Passport (WD20NMVW)
+	25e2  My Passport (WD40NMZW)
+	25ee  My Book 25EE
+	25f3  My Passport SSD (WDBK3E)
+	25fa  easystore Portable 5TB (WDBKUZ0050)
+	25fb  easystore Desktop (WDBCKA)
+	2603  My Passport Game Storage for PS4 4TB (WDBZGE0040)
+	2624  easystore Portable 5TB (WDBKUZ0050)
+	2626  My Passport (WDBPKJ)
+	30a0  SATA adapter cable
 1059  Giesecke & Devrient GmbH
+	000b  StarSign Bio Token 3.0
+105b  Foxconn International, Inc.
+	e065  BCM43142A0 Bluetooth module
 105c  Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd
 105d  Delkin Devices, Inc.
 105e  Valence Semiconductor Design, Ltd
@@ -4197,95 +15752,440 @@
 1060  Easthome Industrial Co., Ltd
 1063  Motorola Electronics Taiwan, Ltd [hex]
 	1555  MC141555 Hub
+	4100  SB4100 USB Cable Modem
 1065  CCYU Technology
+	0020  USB-DVR2 Dev Board
 	2136  EasyDisk ED1064
+1068  Micropi Elettronica
+	0001  CPUSB - V 1.8 - software-rights management key
 106a  Loyal Legend, Ltd
 106c  Curitel Communications, Inc.
+	1101  CDMA 2000 1xRTT USB modem (HX-550C)
+	1102  Packet Service
+	1103  Packet Service Diagnostic Serial Port (WDM)
+	1104  Packet Service Diagnostic Serial Port (WDM)
+	1105  Composite Device
+	1106  Packet Service Diagnostic Serial Port (WDM)
+	1301  Composite Device
+	1302  Packet Service Diagnostic Serial Port (WDM)
+	1303  Packet Service
+	1304  Packet Service
+	1401  Composite Device
+	1402  Packet Service
+	1403  Packet Service Diagnostic Serial Port (WDM)
+	1501  Packet Service
+	1502  Packet Service Diagnostic Serial Port (WDM)
+	1503  Packet Service
+	1601  Packet Service
+	1602  Packet Service Diagnostic Serial Port (WDM)
+	1603  Packet Service
 	2101  AudioVox 8900 Cell Phone
+	2102  Packet Service
+	2103  Packet Service Diagnostic Serial Port (WDM)
+	2301  Packet Service
+	2302  Packet Service Diagnostic Serial Port (WDM)
+	2303  Packet Service
+	2401  Packet Service Diagnostic Serial Port (WDM)
+	2402  Packet Service
+	2403  Packet Service Diagnostic Serial Port (WDM)
+	2501  Packet Service
+	2502  Packet Service Diagnostic Serial Port (WDM)
+	2503  Packet Service
+	2601  Packet Service
+	2602  Packet Service Diagnostic Serial Port (WDM)
+	2603  Packet Service
+	3701  Broadband Wireless modem
+	3702  Pantech PX-500
+	3714  PANTECH USB MODEM [UM175]
+	3716  UMW190 Modem
+	3721  Option Beemo (GI0801) LTE surfstick
+	3b14  Option Beemo (GI0801) LTE surfstick
+	3eb4  Packet Service Diagnostic Serial Port (WDM)
+	4101  Packet Service Diagnostic Serial Port (WDM)
+	4102  Packet Service
+	4301  Composite Device
+	4302  Packet Service Diagnostic Serial Port (WDM)
+	4401  Composite Device
+	4402  Packet Service
+	4501  Packet Service
+	4502  Packet Service Diagnostic Serial Port (WDM)
+	4601  Composite Device
+	4602  Packet Service Diagnostic Serial Port (WDM)
+	5101  Packet Service
+	5102  Packet Service Diagnostic Serial Port (WDM)
+	5301  Packet Service Diagnostic Serial Port (WDM)
+	5302  Packet Service
+	5401  Packet Service
+	5402  Packet Service Diagnostic Serial Port (WDM)
+	5501  Packet Service Diagnostic Serial Port (WDM)
+	5502  Packet Service
+	5601  Packet Service Diagnostic Serial Port (WDM)
+	5602  Packet Service
+	7101  Composite Device
+	7102  Packet Service
+	a000  Packet Service
+	a001  Packet Service Diagnostic Serial Port (WDM)
+	c100  Packet Service
+	c200  Packet Service
+	c500  Packet Service Diagnostic Serial Port (WDM)
+	e200  Packet Service
 106d  San Chieh Manufacturing, Ltd
 106e  ConectL
 106f  Money Controls
+	0009  CT10x Coin Transaction
+	000a  CR10x Coin Recycler
+	000c  Xchange
 1076  GCT Semiconductor, Inc.
+	0031  Bluetooth Device
+	0032  Bluetooth Device
+	8002  LU150 LTE Modem [Yota LU150]
+107b  Gateway, Inc.
+	3009  eHome Infrared Transceiver
+	55b2  WBU-110 802.11b Wireless Adapter [Intersil PRISM 3]
+	55f2  WGU-210 802.11g Adapter [Intersil ISL3886]
 107d  Arlec Australia, Ltd
 107e  Midoriya Electric Co., Ltd
 107f  KidzMouse, Inc.
 1082  Shin-Etsukaken Co., Ltd
 1083  Canon Electronics, Inc.
+	160c  CR-55
+	160f  DR-1210C
+	1614  DR-4010C
+	1617  DR-2510C
+	1618  DR-X10C
+	161a  CR-25
+	161b  DR-2010C Scanner
+	161d  DR-3010C
+	1620  DR-7090C
+	1622  DR-9050C
+	1623  DR-7550C
+	1624  DR-6050C
+	1626  DR-6010C
+	162c  P-150 Scanner
+	1638  DR-6030C
+	1639  CR-135i
+	163e  DR-M160
+	163f  DR-M140
+	1640  DR-C125
+	1641  DR-P215
+	1648  FSU-201
+	164a  DR-C130
+	164b  DR-P208
+	164f  DR-G1130
+	1650  DR-G1100
+	1651  DR-C120
+	1654  DR-F120
+	1657  DR-M1060
+	1658  DR-C225
+	1659  DR-P215II
+	165d  DR-P208II
 1084  Pantech Co., Ltd
 108a  Chloride Power Protection
 108b  Grand-tek Technology Co., Ltd
+	0005  HID Keyboard/Mouse PS/2 Translator
 108c  Robert Bosch GmbH
+	017e  GTC 400 C
+108e  Lotes Co., Ltd.
+1091  Numerik Jena
+	8101  Absoflex
 1099  Surface Optics Corp.
 109a  DATASOFT Systems GmbH
+109b  Hisense
+	9109  CROSSCALL Trekker-M1 Core (MTP-Mode)
+	9118  Medion P4013 Mobile
+	9119  CROSSCALL Trekker-M1 Core (PTP-Mode)
+	f009  CROSSCALL Trekker-M1 Core (CD-ROM-Mode)
 109f  eSOL Co., Ltd
+	3163  Trigem Mobile SmartDisplay84
+	3164  Trigem Mobile SmartDisplay121
 10a0  Hirotech, Inc.
 10a3  Mitsubishi Materials Corp.
 10a9  SK Teletech Co., Ltd
+	1102  Sky Love Actually IM-U460K
+	1104  Sky Vega IM-A650S
+	1105  VEGA Android composite
+	1106  VEGA Android composite
+	1107  VEGA Android composite
+	1108  VEGA Android composite
+	1109  VEGA Android composite
+	6021  SIRIUS alpha
+	6031  Pantech Android composite
+	6032  Pantech Android composite
+	6033  Pantech Android composite
+	6034  Pantech Android composite
+	6035  Pantech Android composite
+	6036  Pantech Android composite
+	6037  Pantech Android composite
+	6050  Pantech Android composite
+	6051  Pantech Android composite
+	6052  Pantech Android composite
+	6053  Pantech Android composite
+	6054  Pantech Android composite
+	6055  Pantech Android composite
+	6056  Pantech Android composite
+	6057  Pantech Android composite
+	6058  Pantech Android composite
+	6059  Pantech Android composite
+	6080  MHS291LVW LTE Modem [Verizon Jetpack 4G LTE Mobile Hotspot MHS291L] (Zero CD Mode)
+	6085  MHS291LVW LTE Modem [Verizon Jetpack 4G LTE Mobile Hotspot MHS291L] (Modem Mode)
+	7031  Pantech Android composite
+	7032  Pantech Android composite
+	7033  Pantech Android composite
+	7034  Pantech Android composite
+	7035  Pantech Android composite
+	7036  Pantech Android composite
+	7037  Pantech Android composite
 10aa  Cables To Go
 10ab  USI Co., Ltd
+	1002  Bluetooth Device
+	1003  BC02-EXT in DFU
+	1005  Bluetooth Adptr
+	1006  BC04-EXT in DFU
 	10c5  Sony-Ericsson / Samsung DataCable
 10ac  Honeywell, Inc.
 10ae  Princeton Technology Corp.
+10af  Liebert Corp.
+	0000  UPS
+	0001  PowerSure PSA UPS
+	0002  PowerSure PST UPS
+	0003  PowerSure PSP UPS
+	0004  PowerSure PSI UPS
+	0005  UPStation GXT 2U UPS
+	0006  UPStation GXT UPS
+	0007  Nfinity Power Systems UPS
+	0008  PowerSure Interactive UPS
 10b5  Comodo (PLX?)
 	9060  Test Board
 10b8  DiBcom
-	0bb8  DiBcom USB DVB-T reference design (MOD300) (cold)
-	0bb9  DiBcom USB DVB-T reference design (MOD300) (warm)
-	0bc6  DiBcom USB2.0 DVB-T reference design (MOD3000P) (cold)
-	0bc7  DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm)
+	0bb8  DVB-T reference design (MOD300) (cold)
+	0bb9  DVB-T reference design (MOD300) (warm)
+	0bc6  DVB-T reference design (MOD3000P) (cold)
+	0bc7  DVB-T reference design (MOD3000P) (warm)
 10bb  TM Technology, Inc.
 10bc  Dinging Technology Co., Ltd
 10bd  TMT Technology, Inc.
+	1427  Ethernet
 10bf  SmartHome
 	0001  SmartHome PowerLinc
-10c4  Cygnal Integrated Products, Inc.
+10c3  Universal Laser Systems, Inc.
+	00a4  ULS PLS Series Laser Engraver Firmware Loader
+	00a5  ULS Print Support
+10c4  Silicon Labs
+	0002  F32x USBXpress Device
+	0003  CommandIR
+	800a  SPORTident
+	800b  AES
+	8030  K4JRG Ham Radio devices
+	8044  USB Debug Adapter
+	804e  Software Bisque Paramount ME
+	80a9  CP210x to UART Bridge Controller
+	80c4  Infrared Thermometer Adapter
+	80ca  ATM2400 Sensor Device
+	813f  tams EasyControl
+	8149  West Mountain Radio Computerized Battery Analyzer
+	814a  West Mountain Radio RIGblaster P&P
+	814b  West Mountain Radio RIGtalk
+	818a  Silicon Labs FM Radio Reference Design
+	81e8  Zephyr BioHarness
+	834b  Infrared Online Sensor Adapter
+	834e  Infrared Sensor Adapter
+	8460  Sangoma Wanpipe VoiceTime
+	8461  Sangoma U100
+	8470  Juniper Networks BX Series System Console
+	8477  Balluff RFID Reader
+	8496  SiLabs Cypress FW downloader
+	8497  SiLabs Cypress EVB
+	84fb  Infrared Blackbody Adapter
+	8508  RS485 Adapter
+	8605  dilitronics ESoLUX solar lighting controller
+	8660  Netronics CANdoISO
+	86bc  C8051F34x AudioDelay [AD-340]
+	8789  C8051F34x Extender & EDID MGR [EMX-DVI]
+	87be  C8051F34x HDMI Audio Extractor [EMX-HD-AUD]
+	8863  C8051F34x Bootloader
+	8897  C8051F38x HDMI Splitter [UHBX]
+	88c9  AES HID device
+	8918  C8051F38x HDMI Audio Extractor [VSA-HA-DP]
+	8973  C8051F38x HDMI Extender [UHBX-8X]
+	89c6  SPORTident HID device
+	89e1  C8051F38x HDMI Extender [UHBX-SW3-WP]
+	89fb  Qivicon ZigBee Stick
+	8a3c  C8051F38x HDBaseT Receiver [UHBX-R-XT]
+	8a6c  C8051F38x 4K HDMI Audio Extractor [EMX-AMP]
+	8acb  C8051F38x HDBaseT Wall Plate Receiver with IR, RS-232, and PoH [UHBX-R-WP]
+	8af8  C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [VSA-X21]
+	8b8c  C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [SC-3H]
+	8db5  C8051F38x CATx HDMI Receiver with USB [EX-HDU-R]
+	8db6  C8051F38x CATx HDMI Receiver
+	ea60  CP210x UART Bridge
+	ea61  CP210x UART Bridge
+	ea63  CP210x UART Bridge
+	ea70  CP2105 Dual UART Bridge
+	ea71  CP2108 Quad UART Bridge
+	ea80  CP2110 HID UART Bridge
+	ea90  CP2112 HID I2C Bridge
+	ea91  CP2112 HID SMBus/I2C Bridge for CP2614 Evaluation Kit
+	ea93  CP2112 HID SMBus/I2C Bridge for CP2615 Evaluation Kit
+	eab0  CP2114 I2S Audio Bridge
+	eac0  CP2614 MFi Accessory Digital Audio Bridge
+	eac1  CP2615 I2S Audio Bridge
+	eac9  EFM8UB1 Bootloader
+	eaca  EFM8UB2 Bootloader
+	eacb  EFM8UB3 Bootloader
 10c5  Sanei Electric, Inc.
+	819a  FM Radio
 10c6  Intec, Inc.
 10cb  Eratech
 10cc  GBM Connector Co., Ltd
+	1101  MP3 Player
 10cd  Kycon, Inc.
+10ce  Silicon Labs
+	0007  Shinko/Sinfonia CHC-S1245
+	000e  Shinko/Sinfonia CHC-S2145
+	0019  Shinko/Sinfonia CHC-S6145
+	001d  Shinko/Sinfonia CHC-S6245
+	001e  Ciaat Brava 21
+	0039  Sinfonia CHC-S2245
+	10ce  Sinfonia CHC-S2245
+	ea6a  MobiData EDGE USB Modem
 10cf  Velleman Components, Inc.
-	5500 8055 Experiment Interface Board (address=0)
-	5501 8055 Experiment Interface Board (address=1)
-	5502 8055 Experiment Interface Board (address=2)
-	5503 8055 Experiment Interface Board (address=3)
+	2011  R-Engine MPEG2 encoder/decoder
+	5500  8055 Experiment Interface Board (address=0)
+	5501  8055 Experiment Interface Board (address=1)
+	5502  8055 Experiment Interface Board (address=2)
+	5503  8055 Experiment Interface Board (address=3)
 10d1  Hottinger Baldwin Measurement
-	0101 USB-Module for Spider8, CP32
-	0202 CP22 - Communication Processor
-	0301 CP42 - Communication Processor
+	0101  USB-Module for Spider8, CP32
+	0202  CP22 - Communication Processor
+	0301  CP42 - Communication Processor
+10d2  RayComposer - R. Adams
+	5243  RayComposer
 10d4  Man Boon Manufactory, Ltd
 10d5  Uni Class Technology Co., Ltd
+	0004  PS/2 Converter
+	5552  KVM Human Interface Composite Device (Keyboard/Mouse ports)
+	55a2  2Port KVMSwitcher
+	5a08  Dual Bay Docking Station
 10d6  Actions Semiconductor Co., Ltd
+	0c02  BioniQ 1001 Tablet
 	1000  MP3 Player
 	1100  MPMan MP-Ki 128 MP3 Player/Recorder
+	1101  D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player
+	2200  Acer MP-120 MP3 player
+	8888  ADFU Device
+	ff51  ADFU Device
+	ff61  MP4 Player
+	ff66  Craig 2GB MP3/Video Player
 10de  Authenex, Inc.
 10df  In-Win Development, Inc.
+	0500  iAPP CR-e500 Card reader
 10e0  Post-Op Video, Inc.
 10e1  CablePlus, Ltd
 10e2  Nada Electronics, Ltd
 10ec  Vast Technologies, Inc.
+10f0  Nexio Co., Ltd
+	2002  iNexio Touchscreen controller
+10f1  Importek
+	1a08  Internal Webcam
+	1a1e  Laptop Integrated Webcam 1.3M
+	1a2a  Laptop Integrated Webcam
+	1a2e  HP Truevision HD Integrated Webcam
+10f5  Turtle Beach
+	0200  Audio Advantage Roadie
+	0231  Ear Force P11 Headset
+	10f5  EarForce PX21 Gaming Headset
+10f8  Cesys GmbH
+	3201  CeboLC
+	3202  CeboStick
+	3203  CeboMSA64
+	3204  CeboDFN
+	3205  PSAA2304W_CASC
+	c401  USBV4F unconfigured
+	c402  EFM01 unconfigured
+	c403  MISS2 unconfigured
+	c404  CID unconfigured
+	c405  USBS6 unconfigured
+	c406  OP_MISS2 unconfigured
+	c407  NanoUsb uncofigured
+	c481  USBV4F
+	c482  EFM01
+	c483  MISS2
+	c484  CID
+	c485  USBS6
+	c486  OP_MISS2
+	c487  NanoUsb
+	c501  EFM02 unconfigured
+	c502  EFM02/B unconfigured
+	c503  EFM03 unconfigured
+	c581  EFM02
+	c582  EFM02/B
+	c583  EFM03
 10fb  Pictos Technologies, Inc.
 10fd  Anubis Electronics, Ltd
+	7e50  FlyCam Usb 100
 	804d  Typhoon Webshot II Webcam [zc0301]
-1a0a  ...
-	badd  USB OTG Compliance test device
+	8050  FlyCAM-USB 300 XP2
+	de00  WinFast WalkieTV WDM Capture Driver.
+10fe  Thrane & Thrane
+	000c  TT-3750 BGAN-XL Radio Module
 1100  VirTouch, Ltd
 	0001  VTPlayer VTP-1 Braille Mouse
 1101  EasyPass Industrial Co., Ltd
 	0001  FSK Electronics Super GSM Reader
 1108  Brightcom Technologies, Ltd
+110a  Moxa Technologies Co., Ltd.
+	1110  UPort 1110
+	1150  UPort 1150 1-Port RS-232/422/485
+	1250  UPort 1250 2-Port RS-232/422/485
+	1251  UPort 1250I 2-Port RS-232/422/485 with Isolation
+	1410  UPort 1410 4-Port RS-232
+	1450  UPort 1450 4-Port RS-232/422/485
+	1451  UPort 1450I 4-Port RS-232/422/485 with Isolation
+	1613  UPort 1610-16 16-Port RS-232
+	1618  UPort 1610-8 8-Port RS-232
+	1653  UPort 1650-16 16-Port RS-232/422/485
+	1658  UPort 1650-8 8-Port RS-232/422/485
 1110  Analog Devices Canada, Ltd (Allied Telesyn)
+	5c01  Huawei MT-882 Remote NDIS Network Device
+	6489  ADSL ETH/USB RTR
+	9000  ADSL LAN Adapter
+	9001  ADSL Loader
 	900f  AT-AR215 DSL Modem
+	9010  AT-AR215 DSL Modem
+	9021  ADSL WAN Adapter
+	9022  ADSL Loader
+	9023  ADSL WAN Adapter
+	9024  ADSL Loader
+	9031  ADSL LAN Adapter
+	9032  ADSL Loader
 1111  Pandora International Ltd.
 	8888  Evolution Device
 1112  YM ELECTRIC CO., Ltd
 1113  Medion AG
+	a0a2  Active Sync device
 111e  VSO Electric Co., Ltd
+112a  RedRat
+	0001  RedRat3 IR Transceiver
+	0005  RedRat3II IR Transceiver
 112e  Master Hill Electric Wire and Cable Co., Ltd
 112f  Cellon International, Inc.
 1130  Tenx Technology, Inc.
+	0001  BlyncLight
+	0002  iBuddy
+	0004  iBuddy Twins
+	0202  Rocket Launcher
+	6604  MCE IR-Receiver
+	6606  U+P Mouse
+	660c  Foot Pedal/Thermometer
+	6626  Key
+	6806  Keychain photo frame
+	c301  Digital Photo viewer [Wallet Pix]
+	f211  TP6911 Audio Headset
 1131  Integrated System Solution Corp.
 	1001  KY-BT100 Bluetooth Adapter
+	1002  Bluetooth Device
+	1003  Bluetooth Device
+	1004  Bluetooth Device
 1132  Toshiba Corp., Digital Media Equipment [hex]
 	4331  PDR-M4/M5/M70 Digital Camera
 	4332  PDR-M60 Digital Camera
@@ -4294,24 +16194,49 @@
 	4335  PDR-M61
 	4337  PDR-M11
 	4338  PDR-M25
+1136  CTS Electronincs
+	3131  CTS LS515
 113c  Arin Tech Co., Ltd
 113d  Mapower Electronics Co., Ltd
+113f  Integrated Biometrics, LLC
+	1020  Watson Two-Finger Roll Scanner
+	1100  Columbo Single-Finger Scanner
 1141  V One Multimedia, Pte., Ltd
 1142  CyberScan Technologies, Inc.
+	0709  Cyberview High Speed Scanner
+1145  Japan Radio Company
+	0001  AirH PHONE AH-J3001V/J3002V
+1146  Shimane SANYO Electric Co., Ltd.
 1147  Ever Great Electric Wire and Cable Co., Ltd
 114b  Sphairon Access Systems GmbH
-	0110  Turbolink UB801R WLAN USB Adapter
+	0110  Turbolink UB801R WLAN Adapter
+	0150  Turbolink UB801RE Wireless 802.11g 54Mbps Network Adapter [RTL8187]
 114c  Tinius Olsen Testing Machine Co., Inc.
 114d  Alpha Imaging Technology Corp.
+114f  Wavecom
+	1234  Fastrack Xtend FXT001 Modem
+115b  Salix Technology Co., Ltd.
 1162  Secugen Corp.
 1163  DeLorme Publishing, Inc.
+	0100  Earthmate GPS (orig)
+	0200  Earthmate GPS (LT-20, LT-40)
+	2020  Earthmate GPS (PN-40)
 1164  YUAN High-Tech Development Co., Ltd
+	0300  ELSAVISION 460D
+	0601  Analog TV Tuner
+	0900  TigerBird BMP837 USB2.0 WDM Encoder
+	0bc7  Digital TV Tuner
+	521b  MC521A mini Card ATSC Tuner
+	6601  Digital TV Tuner Card [RTL2832U]
 1165  Telson Electronics Co., Ltd
 1166  Bantam Interactive Technologies
 1167  Salient Systems Corp.
 1168  BizConn International Corp.
 116e  Gigastorage Corp.
 116f  Silicon 10 Technology Corp.
+	0005  Flash Card Reader
+	c108  Flash Card Reader
+	c109  Flash Card Reader
 1175  Shengyih Steel Mold Co., Ltd
 117d  Santa Electronic, Inc.
 117e  JNC, Inc.
@@ -4322,76 +16247,769 @@
 	4008  56k FaxModem
 	504a  PJB-100 Personal Jukebox
 1184  Kyocera Elco Corp.
+1188  Bloomberg L.P.
+1189  Acer Communications & Multimedia
+	0893  EP-1427X-2 Ethernet Adapter [Acer]
 118f  You Yang Technology Co., Ltd
 1190  Tripace
 1191  Loyalty Founder Enterprise Co., Ltd
 1196  Yankee Robotics, LLC
-	0010 Trifid Camera without code
-	0011 Trifid Camera
+	0010  Trifid Camera without code
+	0011  Trifid Camera
 1197  Technoimagia Co., Ltd
 1198  StarShine Technology Corp.
 1199  Sierra Wireless, Inc.
+	0019  AC595U
+	0021  AC597E
+	0024  MC5727 CDMA modem
+	0110  Composite Device
 	0112  CDMA 1xEVDO PC Card, AirCard 580
+	0120  AC595U
+	0218  MC5720 Wireless Modem
+	6467  MP Series Network Adapter
+	6468  MP Series Network Adapter
+	6469  MP Series Network Adapter
+	6802  MC8755 Device
+	6803  MC8765 Device
+	6804  MC8755 Device
+	6805  MC8765 Device
+	6812  MC8775 Device
+	6820  AC875 Device
+	6832  MC8780 Device
+	6833  MC8781 Device
+	683a  MC8785 Device
+	683c  Mobile Broadband 3G/UMTS (MC8790 Device)
+	6850  AirCard 880 Device
+	6851  AirCard 881 Device
+	6852  AirCard 880E Device
+	6853  AirCard 881E Device
+	6854  AirCard 885 Device
+	6856  ATT "USB Connect 881"
+	6870  MC8780 Device
+	6871  MC8781 Device
+	6893  MC8777 Device
+	68a3  MC8700 Modem
+	68aa  4G LTE adapter
+	9000  Gobi 2000 Wireless Modem (QDL mode)
+	9001  Gobi 2000 Wireless Modem
+	9002  Gobi 2000 Wireless Modem
+	9003  Gobi 2000 Wireless Modem
+	9004  Gobi 2000 Wireless Modem
+	9005  Gobi 2000 Wireless Modem
+	9006  Gobi 2000 Wireless Modem
+	9007  Gobi 2000 Wireless Modem
+	9008  Gobi 2000 Wireless Modem
+	9009  Gobi 2000 Wireless Modem
+	900a  Gobi 2000 Wireless Modem
+	9011  MC8305 Modem
+	9013  Sierra Wireless Gobi 3000 Modem device (MC8355)
+	9041  EM7305 Modem
+	9055  Gobi 9x15 Multimode 3G/4G LTE Modem (NAT mode)
+	9057  Gobi 9x15 Multimode 3G/4G LTE Modem (IP passthrough mode)
+	9071  AirPrime MC7455 3G/4G LTE Modem
+	9079  EM7455
 119a  ZHAN QI Technology Co., Ltd
 119b  ruwido austria GmbH
 	0400  Infrared Keyboard V2.01
 11a0  Chipcon AS
-	eb11 CC2400EB 2.0 ZigBee Sniffer
+	eb11  CC2400EB 2.0 ZigBee Sniffer
 11a3  Technovas Co., Ltd
+	8031  MP3 Player
+	8032  MP3 Player
 11aa  GlobalMedia Group, LLC
+	1518  iREZ K2
 11ab  Exito Electronics Co., Ltd
+11ac  Nike
+	6565  FuelBand
+11b0  ATECH FLASH TECHNOLOGY
+	6208  PRO-28U
+	6298  Kingston SNA-DC/U
+11be  R&D International NV
+	f0a0  Martin Maxxyz DMX
+11c0  Betop
+	5506  Gamepad
+11c5  Inmax
+	0521  IMT-0521 Smartcard Reader
+11c9  Nacon
+	55f0  GC-100XF
+11ca  VeriFone Inc
+	0201  MX870/MX880
+	0207  PIN Pad VX 810
+	0220  PIN Pad VX 805
 11db  Topfield Co., Ltd.
 	1000  PVR
 	1100  PVR
-11f5  Siemens AG (?)
+11e6  K.I. Technology Co. Ltd.
+11f5  Siemens AG
+	0001  SX1
 	0003  Mobile phone USB cable
+	0004  X75
+	0005  SXG75/EF81
+	0008  UMTS/HSDPA Data Card
+	0101  RCU Connect
+11f6  Prolific
+	2001  Willcom WSIM
 11f7  Alcatel (?)
-	02df  TD10 Mobile phone USB cable
-1209  InterBiometrics
-	1001  USB Hub
-	1002  USB Relais
-	1003  IBSecureCam-P
-	1004  IBSecureCam-O
-	1005  IBSecureCam-N
+	02df  Serial cable (v2) for TD-10 Mobile Phone
+1203  TSC Auto ID Technology Co., Ltd
+	0140  TTP-245C
+1209  Generic
+	0001  pid.codes Test PID
+	0002  pid.codes Test PID
+	0003  pid.codes Test PID
+	0004  pid.codes Test PID
+	0005  pid.codes Test PID
+	0006  pid.codes Test PID
+	0007  pid.codes Test PID
+	0008  pid.codes Test PID
+	0009  pid.codes Test PID
+	000a  pid.codes Test PID
+	000b  pid.codes Test PID
+	000c  pid.codes Test PID
+	000d  pid.codes Test PID
+	000e  pid.codes Test PID
+	000f  pid.codes Test PID
+	0010  pid.codes Test PID
+	01c0  Input Club Kiibohd Device
+	01cb  Input Club Kiibohd Device Bootloader
+	0256  Schwalm & Tate LLC pISO Raspberry Pi Hat
+	053a  Hackerspace San Salvador HSSV SAMR21-Mote
+	0cbd  Andrzej Szombierski kuku.eu.org keyboard
+	0d32  ODrive Robotics ODrive v3
+	1001  InterBiometrics Hub
+	1002  InterBiometrics Relais
+	1003  InterBiometrics IBSecureCam-P
+	1004  InterBiometrics IBSecureCam-O
+	1005  InterBiometrics IBSecureCam-N
+	1006  InterBiometrics Mini IO-Board
+	1007  e-radionica.com Croduino SAMD
+	1986  dgrubb Jaguar Tap
+	1ab5  Arachnid Labs Tsunami
+	1ab6  Arachnid Labs Tsunami Bootloader
+	2000  Zygmunt Krynicki Lantern Brightness Sensor
+	2001  OSHEC Pi-pilot opensource and openhardware autopilot system
+	2002  Peter Lawrence PIC16F1-USB-DFU-Bootloader
+	2003  Peter Lawrence SAMDx1-USB-DFU-Bootloader
+	2004  GCBASIC Serial CDC Stack
+	2005  GCBASIC OakTree Stack
+	2006  GCBASIC Simulation Stack
+	2016  Cupkee
+	2017  Benjamin Shockley Mini SAM
+	2020  Captain Credible Gate Crystal
+	2048  Housedillon.com MRF49XA Transceiver
+	2100  TinyFPGA B1 and B2 Boards
+	2101  TinyFPGA A-Series Programmer
+	2200  Dygma Shortcut Bootloader
+	2201  Dygma Shortcut Keyboard
+	2222  LabConnect Signalgenerator
+	2300  Keyboardio Model 01 Bootloader
+	2301  Keyboardio Model 01
+	2323  bytewerk.org candleLight
+	2327  K.T.E.C. Bootloader Device
+	2328  K.T.E.C. Keyboard Device
+	2333  Kai Ryu Kimera
+	2334  Kai Ryu Staryu
+	2335  Portwell Sense8
+	2336  Portwell Sense8
+	2337  /Dev /Net
+	2342  Andreas Bogk Big Red Button
+	2345  VV-Soft Simple Generic HID IO
+	2357  KarolKucza TinyPassword
+	2400  phooky Snap-Pad
+	2488  Peter Lawrence CMSIS-DAP Dapper Miser
+	2552  ProjectIota Electrolink
+	2600  Majenko Technologies chipKIT Lenny
+	2635  Sevinz GameBot
+	2800  Entropic Engineering Triangulation
+	2801  Entropic Engineering Object Manipulation
+	2a00  mooware Wii adapter
+	2a01  mooware SNES adapter
+	3000  lloyd3000
+	3100  OpenSimHardware Pedals & Buttons Controller
+	317e  Codecrete Wirekite
+	3210  OSH Lab, LLC Magic Keys
+	3333  LabConnect Digitalnetzteil
+	345b  kinX Hub
+	345c  kinX Keyboard Controller
+	3690  Kigakudoh TouchMIDI32
+	4096  CynaraKrewe Cynara
+	414c  Adi Linden
+	414d  Adi Linden
+	4242  Komakallio Astrophotography Community KomaHub Remote Power Switch
+	4256  CuVoodoo BusVoodoo multi-protocol debugging adapter
+	4321  mooltipass Offline Password Keeper Bootloader
+	4322  mooltipass Arduino Sketch
+	4356  CuVoodoo firmware
+	4443  j1rie IRMP_STM32 Bootloader
+	4444  j1rie IRMP_STM32
+	4545  SlothCo Enterprises Teletype Adapter
+	4646  SmartPID SPC1000
+	4748  Kate Gray GHETT-iO Bootloader
+	4750  Chris Pavlina (c4757p) C4-x computer (development interface)
+	4757  Chris Pavlina (c4757p) WCP52 Gain/Phase Analyzer
+	4801  Wojciech Krutnik NVMemProg
+	4c60  MightyPork GEX module
+	4c61  MightyPork GEX wireless dongle
+	4d53  mindsensors.com NXTCam5
+	5038  frotz.net mdebug rswd protocol
+	5039  frotz.net lpcboot protocol
+	5050  trebb ISO50
+	5070  SoloHacker security key [SoloKey]
+	50b0  boot for security key [SoloKey]
+	5222  telavivmakers attami
+	53c0  SatoshiLabs TREZOR Bootloader
+	53c1  SatoshiLabs TREZOR
+	5432  Open Programmer
+	5457  Openlab.Taipei Taiwanduino
+	571c  StreetoArcade PancadariaStick
+	5a22  ikari_01 sd2snes
+	6000  Pulsar Heavy Industries Cenx4
+	600d  Makdaam N93 Interface
+	6464  Electric Exploits Shinewave
+	6502  jj1bdx avrhwrng v2rev1
+	6570  Iowa Scaled Engineering, LLC CKT-AVRPROGRAMMER
+	6666  Talpa Chen VSFLogic
+	6667  SensePost Universal Serial aBUSe - Generic HID
+	6742  NPK Cubitel Atomic Force Microscope
+	6809  Tach Radio Doppelganger
+	6948  MySensors Sensebender Gateway BootLoader
+	6949  MySensors Sensebender Gateway
+	6bcf  blaste Gameboy Cart Flasher
+	7000  Secalot Dongle
+	7001  Secalot Bootloader
+	70b1  Sutajio Ko-Usagi (Kosagi) Tomu
+	7331  Dangerous Prototypes Bus Pirate Next Gen CDC
+	7332  Dangerous Prototypes Bus Pirate Next Gen Logic Analyzer
+	7401  Beststream-jp Tool_CDC
+	7530  PotentialLabs Refflion - IoT Development Board - Bootloader
+	7531  PotentialLabs Refflion - IoT Development Board - Sketch
+	7551  The Tessel Project Tessel 2
+	7777  circuitvalley IO Board V3
+	7778  circuitvalley IO Board V3 Bootloader
+	7950  PIC18F87J94 Bootloader [GenII]
+	7951  PIC18F87J94 Application [GenII]
+	7952  PIC18F87J94 Bootloader [GenIII/IV]
+	7953  PIC18F87J94 Application [GenIII/IV]
+	7954  PIC18F87J94 Application [GenIII/IV]
+	7bd0  pokey9000 Tiny Bit Dingus
+	8000  Autonomii NODii 2
+	8086  MisfitTech Nano Zero Bootloader
+	8087  MisfitTech Nano Zero
+	8123  Danyboard M0 bootloader
+	812a  Danyboard M0
+	813a  MickMad HACK Bootloader
+	813b  MickMad HACK Sketch
+	8242  Tom Wimmenhove Electronics NBS-DAC 192/24 UAC1
+	8243  Tom Wimmenhove Electronics NBS-DAC 192/24 UAC2
+	8472  Shantea Controls OpenDeck
+	8661  ProgHQ TL866 programmer
+	8844  munia.io MUNIA
+	8888  Blinkinlabs POV Pendant
+	8889  Blinkinlabs POV Pendant (bootloader)
+	8b00  ReSwitched Libtransistor Serial Console
+	9021  Connected Community Hackerspace ESPlant
+	9317  Sutajio Ko-Usagi (Kosagi) Palawan-Tx
+	9999  Sandeepan Sengupta CodeBridge Infineo
+	9db5  PD Buddy Sink
+	a033  area0x33 Memtype
+	a100  KB LES Narsil analog breakout
+	a10c  KB LES Aminoacid Synthesizer
+	a1e5  Atreus Keyboards Atreus Keyboard
+	a3a4  MK::Box MK::Kbd
+	a3a5  MK::Box MK::Kbd Bootloader
+	a55a  Forever Young Software ATTINY2313
+	a602  Robotips RTBoard
+	a7ea  area3001 Knixx SW04
+	a800  sowbug.com WebLight
+	a8b0  Intelectron BootWare
+	a8b1  Intelectron FrameWare
+	aa00  Serg Oskin LinuxCNC HID Extender
+	aa0b  Open Bionics
+	ab3d  3DArtists Alligator board
+	abba  CoinWISE SafeWISE
+	abc0  Omzlo controller
+	abcd  Sandeepan Sengupta CodeBridge
+	abd1  OpenMV Cam
+	acdc  Gediminas Zukaitis midi-grid
+	ace5  SimAces Panel Ace
+	aced  Open Lighting Project Ja Rule Device
+	acee  Open Lighting Project Ja Rule Bootloader
+	adb0  tibounise ADB converter
+	adda  MicroPython Boards
+	b007  Konsgn Global_Boot
+	b00b  CrapLab Random Device
+	b010  IObitZ CodeBridge
+	b01d  WyoLum VeloKey
+	b058  Model B, LLC Holoseat
+	b0b0  Monero Hardware Monero Bootloader
+	b100  ptrandem iBizi
+	b101  IObitZ Infineo
+	b195  flehrad Big Switch PCB
+	bab1  ElectronicCats Meow Meow
+	babe  brunofreitas.com STM32 HID Bootloader
+	bad1  Gregory POTEAU CommLinkUSB
+	bad2  Gregory POTEAU XLinkUSB
+	bade  Semarme SemarmeHID
+	bb00  keyplus split keyboard firmware
+	bb01  keyplus xusb bootloader
+	bb02  keyplus nRF24 wireless keyboard dongle
+	bb03  keyplus nrf24lu1p-512 bootloader
+	bb05  keyplus kp_boot_32u4 bootloader
+	beba  serasidis.gr STM32 HID Bootloader
+	beef  Modal MC-USB
+	c001  Cynteract Alpha
+	c0c0  Geppetto_Electronics Orthrus
+	c0c1  Michael Bemmerl cookie-mouse
+	c0ca  Jean THOMAS DirtyJTAG
+	c0d3  Samy Kamkar USBdriveby
+	c0da  Monero Hardware Monero Firmware
+	c0de  KMRH Labs SBL Brain
+	c0f5  unethi PERswitch
+	c1aa  Proyecto CIAA Computadora Industrial Abierta Argentina
+	c1b1  Chibitronics Love-to-Code
+	c311  bg nerilex GB-USB-Link
+	ca1c  KnightOS Generic Hub
+	ca1d  KnightOS MTP Device
+	caea  Open Music Kontrollers Chimaera
+	cafe  ii iigadget
+	cc14  trebb NaN-15
+	cc86  Manfred's Technologies Anastasia Bootloader
+	ceb0  KG4LNE GE-FlashUSB
+	cf20  Smart Citizen SCK 2.0
+	d00d  Monero Hardware Monero Developer
+	d017  empiriKit empiriKit Controller
+	d11d  Koi Science DI-Lambda AVR
+	d3d8  Duet3d Duet 0.8.5
+	d706  SkyBean SkyDrop
+	da42  Devan Lai dap42 debug access probe
+	daa0  darknao btClubSportWheel
+	dada  Rebel Technology OWL
+	db42  Devan Lai dapboot DFU bootloader
+	dc21  FPGA-Computer Dual Charger
+	dddd  Stephan Electronics OpenCVMeter
+	dead  chaosfield.at AVR-Ruler
+	deaf  CrapLab 4chord MIDI
+	ded1  ManCave Made Quark One
+	deed  Kroneum Time Tracker
+	df00  D.F.Mac. @TripArts Music mi:muz:tuch
+	df01  D.F.Mac. @TripArts Music mi:muz:can
+	df02  D.F.Mac. @TripArts Music mi:muz:can-lite
+	e116  Elijah Motornyy open-oscilloscope-stm32f3
+	e1ec  FreeSRP
+	e4ee  trebb keytee
+	e500  GitleMikkelsen Helios Laser DAC
+	eaea  Pinscape Controller
+	eb01  RobotMaker.club EB1
+	eba7  VictorGrigoryev USBscope
+	ee00  Explore Embedded SODA(SWD OpenSource Debug Adapter)
+	ee02  Explore Embedded Explore M3 VCOM
+	ee03  Explore Embedded Explore M3 DFU
+	ee2c  jaka USB2RS485
+	effa  EffigyLabs atmega32u4-USB-LUFA-Bootloader
+	effe  EffigyLabs Control Pedal
+	f000  Uniti ARC
+	f00d  RomanStepanov Shifter/Pedals Adapter
+	f12e  Michael Bemmerl Feuermelder
+	f16a  uri_ba Cougar TQS adapter
+	f16c  uri_ba adapter for Vipercore's FCC3 Force Sensing Module
+	f380  Windsor Schmidt MD-380 Open Radio Firmware
+	f3fc  dRonin Flight controller-Lumenier Lux
+	f49a  TimVideos.us & HDMI2USB.tv Projects FPGA Programmer & UART Bridge (PIC based Firmware)
+	fa11  moonglow OpenXHC
+	fa57  3DRacers Pilot Board
+	fa58  3DRacers Pilot Board (Bootloader)
+	fab1  PAP Mechatronic Technology LamDiNao
+	face  Protean Synth Craft
+	fade  Open Collector dude
+	feed  ProgramGyar AVR-IR Sender
+	ffff  Life2Device Smart House
 120e  Hudson Soft Co., Ltd
+120f  Magellan
+	524e  RoadMate 1475T
+	5260  Triton Handheld GPS Receiver (300/400/500/1500/2000)
+1210  DigiTech
+	000d  RP250 Guitar Multi-Effects Processor
+	0016  RP500 Guitar Multi-Effects Processor
+	001b  RP155 Guitar Multi-Effects Processor
+	001c  RP255 Guitar Multi-Effects Processor
 121e  Jungsoft Co., Ltd
 	3403  Muzio JM250 Audio Player
+121f  Panini S.p.A.
+	0001  VisionX without Firmware
+	0002  VisionX with Firmware
+	0010  I-Deal
+	0020  wI-Deal
+	0021  VisionX Page Scanner Extension
+	0030  VisionNext
+	0040  mI:Deal Check Scanner
+	0041  EverNext Check Scanner
+1220  TC Electronic
+	000a  Hall of Fame Reverb
+	002a  Polytune
+	0032  Ditto X2 Looper
+	0039  Alter Ego X4 Vintage Echo
+1221  Unknown manufacturer
+	3234  Disk (Thumb drive)
+1222  TiPro
+	faca  programmable keyboard
+1223  SKYCABLE ENTERPRISE. CO., LTD.
+1228  Datapaq Limited
+	0012  Q18 Data Logger
+	0015  TPaq21/MPaq21 Datalogger
+	584c  XL2 Logger
+1230  Chipidea-Microelectronica, S.A.
+1233  Denver Electronics
+	5677  FUSB200 mp3 player
+1234  Brain Actuated Technologies
+	0000  Neural Impulse Actuator Prototype 1.0 [NIA]
+	4321  Human Interface Device
+	ed02  Emotiv EPOC Developer Headset Wireless Dongle
+1235  Focusrite-Novation
+	0001  ReMOTE Audio/XStation First Edition
+	0002  Speedio
+	0003  RemoteSL + ZeroSL
+	0004  ReMOTE LE
+	0005  XIOSynth [First Edition]
+	0006  XStation
+	0007  XIOSynth
+	0008  ReMOTE SL Compact
+	0009  nIO
+	000a  Nocturn
+	000b  ReMOTE SL MkII
+	000c  ZeRO MkII
+	000e  Launchpad
+	0010  Saffire 6
+	0011  Ultranova
+	0012  Nocturn Keyboard
+	0013  VRM Box
+	0014  VRM Box Audio Class (2-out)
+	0015  Dicer
+	0016  Ultranova
+	0018  Twitch
+	0019  Impulse 25
+	001a  Impulse 49
+	001b  Impulse 61
+	0032  Launchkey 61
+	0069  Launchpad MK2
+	0102  LaunchKey Mini MK3
+	4661  ReMOTE25
+	8000  Scarlett 18i6
+	8002  Scarlett 8i6
+	8006  Focusrite Scarlett 2i2
+	8008  Saffire 6
+	800a  Scarlett 2i4
+	800c  Scarlett 18i20
+	800e  iTrack Solo
+	8010  Forte
+	8012  Scarlett 6i6
+	8014  Scarlett 18i8
+	8016  Focusrite Scarlett 2i2
+	8202  Focusrite Scarlett 2i2 2nd Gen
+	8203  Focusrite Scarlett 6i6
+	8204  Scarlett 18i8 2nd Gen
+	8210  Scarlett 2i2 Camera
+	8211  Scarlett Solo (3rd Gen.)
+	8214  Scarlett 18i8 3rd Gen
+	8215  Scarlett 18i20 3rd Gen
 1241  Belkin
+	0504  Wireless Trackball Keyboard
 	1111  Mouse
-	1166  optical mouse w/ scrollwheel
-	1177  F8E842-DL Mouse
+	1122  Typhoon Stream Optical Mouse USB+PS/2
+	1155  Memorex Optical ScrollPro Mouse SE MX4600
+	1166  MI-2150 Trust Mouse
+	1177  Mouse [HT82M21A]
+	1503  Keyboard
+	1603  Keyboard
+	f767  Keyboard
+1243  Holtek Semiconductor, Inc.
+	e000  Unique NFC/RFID reader (keyboard emulation)
 124a  AirVast
+	168b  PRISM3 WLAN Adapter
 	4017  PC-Chips 802.11b Adapter
+	4023  WM168g 802.11bg Wireless Adapter [Intersil ISL3886]
+	4025  IOGear GWU513 v2 802.11bg Wireless Adapter [Intersil ISL3887]
 124b  Nyko (Honey Bee)
 	4d01  Airflo EX Joystick
+124c  MXI - Memory Experts International, Inc.
+	3200  Stealth MXP 1GB
+125c  Apogee Inc.
+	0010  Alta series CCD
+125d  JMicron
+	0580  JM580
+125f  A-DATA Technology Co., Ltd.
+	312a  Superior S102
+	312b  Superior S102 Pro
+	a15a  DashDrive Durable HD710 portable HDD various size
+	a22a  DashDrive Elite HE720 500GB
+	a31a  HV620 Portable HDD
+	a91a  Portable HDD CH91
+	c08a  C008 Flash Drive
+	c81a  Flash drive
+	c93a  4GB Pen Drive
+	c96a  C906 Flash Drive
+	cb10  Dash Drive UV100
+	cb20  DashDrive UV110
+1260  Standard Microsystems Corp.
+	ee22  SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887]
+1264  Covidien Energy-based Devices
+1266  Pirelli Broadband Solutions
+	6302  Fastweb DRG A226M ADSL Router
 1267  Logic3 / SpectraVideo plc
-	0201  A4Tech SWOP-3 Mouse
+	0103  G-720 Keyboard
+	0201  Mouse
+	0210  LG Optical Mouse 3D-310
 	a001  JP260 PC Game Pad
+	c002  Wireless Optical Mouse
+126c  Aristocrat Technologies
+126d  Bel Stewart
 126e  Strobe Data, Inc.
 126f  TwinMOS
+	0163  Storage device (2gB thumb drive)
 	1325  Mobile Disk
 	2168  Mobile Disk III
+	a006  G240 802.11bg
+1274  Ensoniq
 1275  Xaxero Marine Software Engineering, Ltd.
 	0002  WeatherFax 2000 Demodulator
 	0080  SkyEye Weather Satellite Receiver
+	0090  WeatherFax 2000 Demodulator
+1278  Starlight Xpress
+	0105  SXV-M5
+	0107  SXV-M7
+	0109  SXV-M9
+	0110  SXVF-H16
+	0115  SXVF-H5
+	0119  SXV-H9
+	0135  SXVF-H35
+	0136  SXVF-H36
+	0200  SXV interface for paraller MX cameras
+	0305  SXV-M5C
+	0307  SXV-M7C
+	0319  SXV-H9C
+	0325  SXV-M25C
+	0326  SXVR-M26C
+	0507  Lodestar autoguider
+	0517  CoStar
+1283  zebris Medical GmbH
+	0100  USB-RS232 Adaptor
+	0110  CMS20
+	0111  CMS 10
+	0112  CMS 05
+	0114  ARCUS digma PC-Interface
+	0115  SAM Axioquick recorder
+	0116  SAM Axioquick recorder
+	0120  emed-X
+	0121  emed-AT
+	0130  PDM
+	0150  CMS10GI (Golf)
 1286  Marvell Semiconductor, Inc.
+	00bc  Marvell JTAG Probe
+	1fab  88W8338 [Libertas] 802.11g
+	2001  88W8388 802.11a/b/g WLAN
+	2006  88W8362 802.11n WLAN
+	203c  K30326 802.11bgn Wireless Module [Marvell 88W8786U]
+	204c  Bluetooth and Wireless LAN Composite
 	8001  BLOB boot loader firmware
+1291  Qualcomm Flarion Technologies, Inc. / Leadtek Research, Inc.
+	0010  FDM 2xxx Flash-OFDM modem
+	0011  LR7F06/LR7F14 Flash-OFDM modem
 1292  Innomedia
 	0258  Creative Labs VoIP Blaster
+	4154  Retro Link Atari cable
 1293  Belkin Components [hex]
 	0002  F5U002 Parallel Port [uss720]
 	2101  104-key keyboard
+1294  RISO KAGAKU CORP.
+	1320  Webmail Notifier
+1297  DekTec
+	020f  DTU-215 Multi-Standard Modulator
+129b  CyberTAN Technology
+	160b  Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523]
+	160c  Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523]
+	1666  TG54USB 802.11bg
+	1667  802.11bg
+	1828  Gigaset USB Adapter 300
+12a7  Trendchip Technologies Corp.
+12ab  Honey Bee Electronic International Ltd.
+	0004  Dance Pad for Xbox 360
+	0301  Afterglow Wired Controller for Xbox 360
+	0303  Mortal Kombat Klassic FightStick for Xbox 360
+	8809  Dance Dance Revolution Dance Pad
+12b8  Zhejiang Xinya Electronic Technology Co., Ltd.
+12b9  E28
+12ba  Licensed by Sony Computer Entertainment America
+	0032  Wireless Stereo Headset
+	0042  Wireless Stereo Headset
+	00ff  Rocksmith Guitar Adapter
+	0100  RedOctane Guitar for PlayStation(R)3
+	0120  RedOctane Drum Kit for PlayStation(R)3
+	0200  Harmonix Guitar for PlayStation(R)3
+	0210  Harmonix Drum Kit for PlayStation(R)3
+12bd  Gembird
+	d012  JPD Shockforce gamepad
+	d015  Generic 4-button NES USB Controller
+12c4  Autocue Group Ltd
+	0006  Teleprompter Two-button Hand Control (v1)
+	0008  Teleprompter Foot Control (v1)
+12cf  DEXIN
+	0170  Tt eSPORTS BLACK Gaming mouse
+	600b  Cougar 600M Gaming Mouse
+12d1  Huawei Technologies Co., Ltd.
+	1001  E161/E169/E620/E800 HSDPA Modem
+	1003  E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem
+	1004  E220 (bis)
+	1009  U120
+	1010  ETS2252+ CDMA Fixed Wireless Terminal
+	1021  U8520
+	1035  U8120
+	1037  Ideos
+	1038  Ideos (debug mode)
+	1039  Ideos (tethering mode)
+	1052  MT7-L09 / P7-L10 / Y330-U01
+	1053  P7-L10 (PTP)
+	1054  P7-L10 (PTP + debug)
+	1079  GEM-703LT [Honor/MediaPad X2]
+	107e  P10 smartphone
+	1404  EM770W miniPCI WCDMA Modem
+	1406  E1750
+	140b  EC1260 Wireless Data Modem HSD USB Card
+	140c  E180v
+	1412  EC168c
+	1436  Broadband stick
+	1446  HSPA modem
+	1465  K3765 HSPA
+	14ac  E815
+	14c3  K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard
+	14c8  K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard
+	14c9  K3770 3G Modem
+	14cf  K3772
+	14d1  K3770 3G Modem (Mass Storage Mode)
+	14db  E353/E3131
+	14dc  E3372 LTE/UMTS/GSM HiLink Modem/Networkcard
+	14f1  Gobi 3000 HSPA+ Modem
+	14fe  Modem (Mass Storage Mode)
+	1501  Pulse
+	1505  E398 LTE/UMTS/GSM Modem/Networkcard
+	1506  Modem/Networkcard
+	150a  E398 LTE/UMTS/GSM Modem/Networkcard
+	1520  K3765 HSPA
+	1521  K4505 HSPA+
+	155a  R205 Mobile WiFi (CD-ROM mode)
+	1573  ME909u-521 mPCIe LTE/GPS card
+	1575  K5150 LTE modem
+	15bb  ME936 LTE/HSDPA+ 4G modem
+	15c1  ME906s LTE M.2 Module
+	15ca  E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode)
+	1805  AT&T Go Phone U2800A phone
+	1c05  Broadband stick (modem on)
+	1c0b  E173s 3G broadband stick (modem off)
+	1c20  R205 Mobile WiFi (Charging)
+	1d50  ET302s TD-SCDMA/TD-HSDPA Mobile Broadband
+	1f01  E353/E3131 (Mass storage mode)
+	1f16  K5150 LTE modem (Mass Storage Mode)
+	360e  Y330-U01 (MTP Mode)
+	380b  WiMAX USB modem(s)
+12d2  LINE TECH INDUSTRIAL CO., LTD.
+12d3  LINAK
+	0002  DeskLine CBD Control Box
+12d6  EMS Dr. Thomas Wuensche
+	0444  CPC-USB/ARM7
+	0888  CPC-USB/M16C
+12d7  BETTER WIRE FACTORY CO., LTD.
+12d8  Araneus Information Systems Oy
+	0001  Alea I True Random Number Generator
+12e6  Waldorf Music GmbH
+	0013  Blofeld
 12ef  Tapwave, Inc.
 	0100  Tapwave Handheld [Tapwave Zodiac]
+12f2  ViewPlus Technologies, Inc.
+	000a  Braille embosser [SpotDot Emprint]
+12f5  Dynamic System Electronics Corp.
+12f7  Memorex Products, Inc.
+	1a00  TD Classic 003B
+	1e23  TravelDrive 2007 Flash Drive
 12fd  AIN Comm. Technology Co., Ltd
 	1001  AWU2000b 802.11b Stick
+12ff  Fascinating Electronics, Inc.
+	0101  Advanced RC Servo Controller
+1306  FM20 Barcode Scanner
 1307  Transcend Information, Inc.
+	0163  256MB/512MB/1GB Flash Drive
+	0165  2GB/4GB/8GB Flash Drive
+	0190  Ut190 8 GB Flash Drive with MicroSD reader
+	0310  SD/MicroSD CardReader [hama]/IT1327E [Basic Line flash drive]
+	0330  63-in-1 Multi-Card Reader/Writer
+	0361  CR-75: 51-in-1 Card Reader/Writer [Sakar]
 	1169  TS2GJF210 JetFlash 210 2GB
+	1171  Fingerprint Reader
+1308  Shuttle, Inc.
+	0003  VFD Module
+	c001  eHome Infrared Transceiver
 1310  Roper
 	0001  Class 1 Bluetooth Dongle
 1312  ICS Electronics
+1313  ThorLabs
+	0010  LC1 Linear Camera (Jungo)
+	0011  SP1 Spectrometer (Jungo)
+	0012  SP2 Spectrometer (Jungo)
+	0110  LC1 Linear Camera (VISA)
+	0111  SP1 Spectrometer (VISA)
+	0112  SP2 Spectrometer (VISA)
+	8001  TXP-Series Slot (TXP5001, TXP5004)
+	8011  BP1 Slit Beam Profiler
+	8012  BC106 Camera Beam Profiler
+	8013  WFS10 Wavefront Sensor
+	8016  DMP40 Deformable Mirror
+	8017  BC206 Camera Beam Profiler
+	8019  BP2 Multi Slit Beam Profiler
+	8020  PM300 Optical Power Meter
+	8021  PM300E Optical Power and Energy Meter
+	8022  PM320E Optical Power and Energy Meter
+	8025  WFS20 Wavefront Sensor
+	8030  ER100 Extinction Ratio Meter
+	8039  PAX1000 Rotating Waveplate Polarimeter
+	8047  CLD1000
+	8048  TED4000
+	8049  LDC4000
+	804a  ITC4000
+	8058  LC-100
+	8060  DC3100
+	8061  DC4100
+	8062  DC2100
+	8065  CS2010
+	8066  DC4104
+	8070  PM100D
+	8072  PM100USB Power and Energy Meter Interface
+	8073  PM106 Wireless Powermeter Photodiode Sensor
+	8074  PM160T Wireless Powermeter Thermal Sensor
+	8075  PM400 Handheld Optical Power/Energy Meter
+	8076  PM101 Serial PD Power Meter
+	8078  PM100D Compact Power and Energy Meter Console
+	8080  CCS100 - Compact Spectrometer
+	8081  CCS100 Compact Spectrometer
+	8083  CCS125 Spectrometer
+	8085  CCS150 UV Spectrometer
+	8087  CCS175 NIR Spectrometer
+	8089  CCS200 Wide Range Spectrometer
+	8090  SPCM Single Photon Counter
+	80a0  LC100 series smart line camera
+	80b0  PM200 Handheld Power and Energy Meter
+	80c0  DC2200
+	80c9  MTD Series
+	80f0  TSP01
+	80f1  M2SET Dongle
+	8180  OCT Probe Controller (OCTH-1300)
+	8181  OCT Device
 131d  Natural Point
 	0155  TrackIR 3 Pro Head Tracker
+	0156  TrackIR 4 Pro Head Tracker
+	0158  TrackIR 5 Pro Head Tracker
+1325  ams AG
+	00d6  I2C/SPI InterfaceBoard
+	0c08  Embedded Linux Sensor Bridge
+	4002  I2C Dongle
+132a  Envara Inc.
+	1502  WiND 802.11abg / 802.11bg WLAN
 132b  Konica Minolta
 	0000  Dimage A2 Camera
 	0001  Minolta DiMAGE A2 (ptp)
@@ -4399,12 +17017,12 @@
 	0006  Dimage Z2 Camera
 	0007  Minolta DiMAGE Z2 (PictBridge mode)
 	0008  Dimage X21 Camera
-	000a  Dimage Scan Dual IV
+	000a  Dimage Scan Dual IV AF-3200 (2891)
 	000b  Dimage Z10 Camera
 	000d  Dimage X50 Camera [storage?]
 	000f  Dimage X50 Camera [p2p?]
 	0010  Dimage G600 Camera
-	0012  Dimage Scan Elite5400 2
+	0012  Dimage Scan Elite 5400 II (2892)
 	0013  Dimage X31 Camera
 	0015  Dimage G530 Camera
 	0017  Dimage Z3 Camera
@@ -4412,92 +17030,1307 @@
 	0019  Dimage A200 Camera
 	0021  Dimage Z5 Camera
 	0022  Minolta DiMAGE Z5 (PictBridge mode)
+	002c  Dynax 5D camera
+	2001  Magicolor 2400w
+	2004  Magicolor 5430DL
+	2005  Magicolor 2430 DL
+	2029  Magicolor 5440DL
+	2030  PagePro 1350E(N)
+	2033  PagePro 1400W
+	2043  Magicolor 2530DL
+	2045  Magicolor 2500W
+	2049  Magicolor 2490MF
+133e  Kemper Digital GmbH
+	0815  Virus TI Desktop
 1342  Mobility
 	0200  EasiDock 200 Hub
 	0201  EasiDock 200 Keyboard and Mouse Port
 	0202  EasiDock 200 Serial Port
 	0203  EasiDock 200 Printer Port
+	0204  Ethernet
+	0304  EasiDock Ethernet
+1343  Citizen Systems
+	0002  CW-01
+	0003  CX / DNP DS40
+	0004  CX-W / DNP DS80 / Mitsubishi CP3800
+	0005  CY / DNP DSRX1
+	0006  CW-02 / OP900ii
+	0007  DNP DS80DX
+	0008  DNP DS620 (old)
+	000a  CX-02
+	000b  CX-02W
+1345  Sino Lite Technology Corp.
+	001c  Xbox Controller Hub
+	6006  Defender Wireless Controller
+1347  Moravian Instruments
+	0400  G2CCD USB 1.1 obsolete
+	0401  G2CCD-S with Sony ICX285 CCD
+	0402  G2CCD2
+	0403  G2/G3CCD-I KAI CCD
+	0404  G2/G3/G4 CCD-F KAF CCD
+	0405  Gx CCD-I CCD
+	0406  Gx CCD-F CCD
+	0410  G1-0400 CCD
+	0411  G1-0800 CCD
+	0412  G1-0300 CCD
+	0413  G1-2000 CCD
+	0414  G1-1400 CCD
+	0415  G1-1200 CCD
+	04b0  Gx CCD-B CCD
+	04b1  Gx CCD-BI CCD
+1348  Katsuragawa Electric Co., Ltd.
+134c  PanJit International Inc.
+	0001  Touch Panel Controller
+	0002  Touch Panel Controller
+	0003  Touch Panel Controller
+	0004  Touch Panel Controller
 134e  Digby's Bitpile, Inc. DBA D Bit
+1357  P&E Microcomputer Systems
+	0089  OpenSDA - CDC Serial Port
+	0503  USB-ML-12 HCS08/HCS12 Multilink
+	0504  DEMOJM
+	1000  Smart Control Touchpad
+135e  Insta GmbH
+	0021  Berker KNX Data Interface
+	0022  Gira KNX Data Interface
+	0023  JUNG KNX Data Interface
+	0024  Merten/Schneider Electric KNX Data Interface
+	0025  Hager KNX Data Interface
+	0026  Feller KNX Data Interface
+135f  Control Development Inc.
+	0110  Linear Spectrograph
+	0111  Spectrograph - Renumerated
+	0200  Linear Spectrograph
+	0201  Spectrograph - Renumerated
+	0240  MPP Spectrograph
+1366  SEGGER
+	0101  J-Link PLUS
+	1015  J-Link
+136b  STEC
+136e  Andor Technology Ltd.
+	0012  iXon Ultra CCD
+	0014  Zyla 5.5 sCMOS camera
 1370  Swissbit
+	0323  Swissmemory cirrusWHITE
 	6828  Victorinox Flash Drive
+1371  CNet Technology Inc.
+	0001  CNUSB-611AR Wireless Adapter-G [AT76C503]
+	0002  CNUSB-611AR Wireless Adapter-G [AT76C503] (FiberLine WL-240U)
+	0013  CNUSB-611 Wireless Adapter [AT76C505]
+	0014  CNUSB-611 Wireless Adapter [AT76C505] (FiberLine WL-240U)
+	5743  CNUSB-611 (D) Wireless Adapter [AT76C503]
+	9022  CWD-854 [RT2573]
+	9032  CWD-854 rev F
+	9401  CWD-854 Wireless 802.11g 54Mbps Network Adapter [RTL8187]
+1376  Vimtron Electronics Co., Ltd.
+1377  Sennheiser electronic GmbH & Co. KG
+	4000  HDVD800
+137b  SCAPS GmbH
+	0002  SCAPS USC-2 Scanner Controller
+137c  YASKAWA ELECTRIC CORP.
+	0220  MP Series
+	0250  SIGMA Series
+	0401  AC Drive
+1385  Netgear, Inc
+	4250  WG111T
+	4251  WG111T (no firmware)
+	5f00  WPN111 RangeMax(TM) Wireless USB 2.0 Adapter
+	5f01  WPN111 (no firmware)
+	5f02  WPN111 (no firmware)
+	6e00  WPNT121 802.11g 240Mbps Wireless Adapter [Airgo AGN300]
+138a  Validity Sensors, Inc.
+	0001  VFS101 Fingerprint Reader
+	0005  VFS301 Fingerprint Reader
+	0007  VFS451 Fingerprint Reader
+	0008  VFS300 Fingerprint Reader
+	0010  VFS Fingerprint sensor
+	0011  VFS5011 Fingerprint Reader
+	0015  VFS 5011 fingerprint sensor
+	0017  VFS 5011 fingerprint sensor
+	0018  Fingerprint scanner
+	003c  VFS471 Fingerprint Reader
+	003d  VFS491
+	003f  VFS495 Fingerprint Reader
+	0050  Swipe Fingerprint Sensor
+	0090  VFS7500 Touch Fingerprint Sensor
+	0091  VFS7552 Touch Fingerprint Sensor
+138e  Jungo LTD
+	9000  Raisonance S.A. STM32 ARM evaluation board / RLink dongle
+1390  TOMTOM B.V.
+	0001  GO 520 T / GO 630 / ONE / ONE XL
+	5454  Blue & Me 2
+	7474  GPS Sport Watch [Runner, Multi-Sport]
+	a001  Bandit Action Camera Batt-Stick
+1391  IdealTEK, Inc.
+	1000  URTC-1000
+1395  Sennheiser Communications
+	0025  Headset [PC 8]
+	0026  SC230
+	0027  SC260
+	0028  SC230 CTRL
+	0029  SC260 CTRL
+	002a  SC230 for Lync
+	002b  SC260 for Lync
+	002d  BTD-800
+	002e  Presence
+	0030  CEHS-CI 02
+	0031  U320 Gaming
+	0032  SC30 for Lync
+	0033  SC60 for Lync
+	0034  SC30 Control
+	0035  SC60 Control
+	0036  SC630 for Lync
+	0037  SC660 for Lync
+	0038  SC630 CTRL
+	0039  SC660 CTRL
+	003f  SP 20
+	0040  MB Pro 1/2
+	0041  SP 20 for Lync
+	0042  SP 10
+	0043  SP 10 for Lync
+	0046  PXC 550
+	004a  MOMENTUM M2 OEBT
+	004b  MOMENTUM M2 AEBT
+	004f  SC230 for MS II
+	0050  SC260 for MS II
+	0051  USB-ED CC 01
+	0058  USB-ED CC 01 for MS
+	0059  SC40 for MS
+	005a  SC70 for MS
+	005b  SC40 CTRL
+	005c  SC70 CTRL
+	0060  SCx5 MS
+	0061  SCx5 CTRL
+	0064  MB 660 MS
+	0065  MB 660
+	0066  SP 20 D UC
+	0067  SP 20 D MS
+	006b  SC5x5 MS
+	0072  Headset
+	3556  USB Headset
+1397  BEHRINGER International GmbH
+	0004  FCA1616
+	00bc  BCF2000
 1398  Q-tec
 	2103  USB 2.0 Storage Device
-13b0  Alesis
-	000a  Photon X25 MIDI Controller
+13ad  Baltech
+	9999  Card reader
+13b0  PerkinElmer Optoelectronics
+	000a  Alesis Photon X25 MIDI Controller
 13b1  Linksys
-	000b  WUSB11 v4.0 802.11b Adapter
-	0011  WUSB54GP v4.0 802.11g Adapter
+	000a  WUSB54G v2 802.11g Adapter [Intersil ISL3887]
+	000b  WUSB11 v4.0 802.11b Adapter [ALi M4301]
+	000c  WUSB54AG 802.11a/g Adapter [Intersil ISL3887]
+	000d  WUSB54G v4 802.11g Adapter [Ralink RT2500USB]
+	000e  WUSB54GS v1 802.11g Adapter [Broadcom 4320 USB]
+	0011  WUSB54GP v4.0 802.11g Adapter [Ralink RT2500USB]
+	0014  WUSB54GS v2 802.11g Adapter [Broadcom 4320 USB]
 	0018  USB200M 10/100 Ethernet Adapter
+	001a  HU200TS Wireless Adapter
+	001e  WUSBF54G 802.11bg
+	0020  WUSB54GC v1 802.11g Adapter [Ralink RT73]
+	0022  WUSB54GX4 802.11g 240Mbps Wireless Adapter [Airgo AGN300]
+	0023  WUSB54GR
+	0024  WUSBF54G v1.1 802.11bg
+	0026  WUSB54GSC v1 802.11g Adapter [Broadcom 4320 USB]
+	0028  WUSB200 802.11g Adapter [Ralink RT2671]
+	0029  WUSB300N 802.11bgn Wireless Adapter [Marvell 88W8362+88W8060]
+	002f  AE1000 v1 802.11n [Ralink RT3572]
+	0031  AM10 v1 802.11n [Ralink RT3072]
+	0039  AE1200 802.11bgn Wireless Adapter [Broadcom BCM43235]
+	003a  AE2500 802.11abgn Wireless Adapter [Broadcom BCM43236]
+	003b  AE3000 802.11abgn (3x3) Wireless Adapter [Ralink RT3573]
+	003e  AE6000 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U]
+	003f  WUSB6300 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]
+	0041  Gigabit Ethernet Adapter
+	0042  WUSB6100M 802.11a/b/g/n/ac Wireless Adapter
+	13b1  WUSB200: Wireless-G Business Network Adapter with Rangebooster
+13b2  Alesis
+	0030  Multimix 8
+13b3  Nippon Dics Co., Ltd.
+13ba  PCPlay
+	0001  Konig Electronic CMP-KEYPAD12 Numeric Keypad
+	0017  PS/2 Keyboard+Mouse Adapter
+	0018  Barcode PCP-BCG4209
+13be  Ricoh Printing Systems, Ltd.
+13ca  JyeTai Precision Industrial Co., Ltd.
+13cf  Wisair Ltd.
+	1200  Olidata Wireless Multimedia Adapter
+13d0  Techsan Electronics Co., Ltd.
+	2282  TechniSat DVB-PC TV Star 2
+13d1  A-Max Technology Macao Commercial Offshore Co. Ltd.
+	7019  MD 82288
+	abe6  Wireless 802.11g 54Mbps Network Adapter [RTL8187]
 13d2  Shark Multimedia
 	0400  Pocket Ethernet [klsi]
 13d3  IMC Networks
 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
 	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
+	3203  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
+	3204  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
+	3205  DNTV Live! Tiny USB2 BDA (No Remote)
+	3206  DNTV Live! Tiny USB2 BDA (No Remote)
+	3207  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
+	3208  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
+	3209  DTV-DVB UDST7022BDA DVB-S Box(Without HID)
+	3211  DTV-DVB Hybrid Analog/Capture / Pinnacle PCTV 310e
+	3212  DTV-DVB UDTT704C - DVBT/NTSC/PAL Driver(PCM4)
+	3213  DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver (PCM4)
+	3214  DTV-DVB UDTT704F -(MiniCard) DVBT/NTSC/PAL Driver(Without HID)
+	3215  DTV-DVB UDAT7240 - ATSC/NTSC/PAL Driver(PCM4)
+	3216  DTV-DVB UDTT 7047-USB 2.0 DVB-T Driver
+	3217  Digital-TV Receiver.
+	3219  DTV-DVB UDTT7049 - DVB-T Driver(Without HID)
+	3220  DTV-DVB UDTT 7047M-USB 2.0 DVB-T Driver
+	3223  DNTV Live! Tiny USB2 BDA (No Remote)
+	3224  DNTV Live! Tiny USB2 BDA (No Remote)
+	3226  DigitalNow TinyTwin DVB-T Receiver
+	3234  DVB-T FTA Half Minicard [RTL2832U]
+	3236  DTV-DVB UDTT 7047A-USB 2.0 DVB-T Driver
+	3237  DTV-DVB UDTT 704J - dual DVB-T Driver
+	3239  DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver(Without HID)
+	3240  DTV-DVB UDXTTM6010 - A/D Driver(Without HID)
+	3241  DTV-DVB UDXTTM6010 - A/D Driver(Without HID)
+	3242  DTV-DVB UDAT7240LP - ATSC/NTSC/PAL Driver(Without HID)
+	3243  DTV-DVB UDXTTM6010 - A/D Driver(Without HID)
+	3244  DTV-DVB UDTT 7047Z-USB 2.0 DVB-T Driver
+	3247  AW-NU222 802.11bgn Wireless Module [Ralink RT2770+RT2720]
+	3249  Internal Bluetooth
+	3250  Broadcom Bluetooth 2.1
+	3262  802.11 n/g/b Wireless LAN USB Adapter
+	3273  802.11 n/g/b Wireless LAN USB Mini-Card
+	3274  DVB-T Dongle [RTL2832U]
+	3282  DVB-T + GPS Minicard [RTL2832U]
+	3284  Wireless LAN USB Mini-Card
+	3304  Asus Integrated Bluetooth module [AR3011]
+	3306  Mediao 802.11n WLAN [Realtek RTL8191SU]
+	3315  Bluetooth module
+	3327  AW-NU137 802.11bgn Wireless Module [Atheros AR9271]
+	3362  Atheros AR3012 Bluetooth 4.0 Adapter
+	3375  Atheros AR3012 Bluetooth 4.0 Adapter
+	3392  Azurewave 43228+20702
+	3394  Bluetooth
+	3474  Atheros AR3012 Bluetooth
+	3526  Bluetooth Radio
+	5070  Webcam
+	5111  Integrated Webcam
+	5115  Integrated Webcam
+	5116  Integrated Webcam
+	5122  2M Integrated Webcam
+	5126  PC Cam
+	5130  Integrated Webcam
+	5134  Integrated Webcam
+	5615  Lenovo EasyCamera
+	5670  HP TrueVision HD
+	5682  SunplusIT Integrated Camera
+	5702  UVC VGA Webcam
+	5710  UVC VGA Webcam
+	5716  UVC VGA Webcam
+	5a07  VGA UVC WebCam
+	7020  DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005)
+	7022  DTV-DVB UDST7022BDA DVB-S Box(Without HID)
+	784b  XHC Camera
+13d7  Guidance Software, Inc.
+	0001  T5 PATA forensic bridge
+	000c  T8-R2 forensic bridge
+13dc  ALEREON, INC.
+13dd  i.Tech Dynamic Limited
+13e1  Kaibo Wire & Cable (Shenzhen) Co., Ltd.
+13e5  Rane
+	0001  SL-1
+	0003  TTM 57SL
+13e6  TechnoScope Co., Ltd.
+13ea  Hengstler
+	0001  C-56 Thermal Printer
+13ec  Zydacron
+	0006  HID Remote Control
+13ee  MosArt
+	0001  Optical Mouse
+	0003  Optical Mouse
+13fd  Initio Corporation
+	0550  INIC-1530 PATA Bridge
+	0840  INIC-1618L SATA
+	0841  Samsung SE-T084M DVD-RW
+	0940  ASUS SBW-06D2X-U
+	1040  INIC-1511L PATA Bridge
+	1340  Hi-Speed USB to SATA Bridge
+	160f  RocketFish SATA Bridge [INIC-1611]
+	1640  INIC-1610L SATA Bridge
+	1669  INIC-1609PN
+	1840  INIC-1608 SATA bridge
+	1e40  INIC-1610P SATA bridge
+	2040  Samsung Writemaster external DVD writer
+	3920  INIC-3619PN SATA Bridge
+	3940  external DVD burner ECD819-SU3
+	3960  INIC-3639
+	3e40  ZALMAN ZM-VE350
 13fe  Kingston Technology Company Inc.
-	1d00  DataTraveler 2.0 1GB Flash Drive
+	1a00  512MB/1GB Flash Drive
+	1a23  512MB Flash Drive
+	1d00  DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive
+	1e00  Flash Drive 2 GB [ICIDU 2 GB]
+	1e50  U3 Smart Drive
+	1f00  Kingston DataTraveler / Patriot Xporter
+	1f23  PS2232 flash drive controller
+	2240  microSD card reader
+	3100  2/4 GB stick
+	3123  Verbatim STORE N GO 4GB
+	3200  flash drive (2GB, EMTEC)
+	3600  flash drive (4GB, EMTEC)
+	3800  Rage XT Flash Drive
+	3d00  Flash Drive
+	3e00  Flash Drive
+	4100  Flash drive
+	4200  Platinum USB drive mini
+	5000  USB flash drive (32 GB SHARKOON Accelerate)
+	5100  Flash Drive
+	5200  DataTraveler R3.0
+	5500  Flash drive
+	6300  SP Mobile C31 (64GB)
+1400  Axxion Group Corp.
+1402  Bowe Bell & Howell
+1403  Sitronix
+	0001  Digital Photo Frame
+	0003  Digital Photo Frame (DPF-1104)
+1404  Fundamental Software, Inc.
+	cddc  Dongle
+1409  IDS Imaging Development Systems GmbH
+	1000  generic (firmware not loaded yet)
+	1485  uEye UI1485
+	3240  uEye UI3240
+140e  Telechips, Inc.
+	b011  TCC780X-based player (USB Boot mode)
+	b021  TCC77X-based players (USB Boot mode)
+1410  Novatel Wireless
+	1110  Merlin S620
+	1120  Merlin EX720
+	1130  Merlin S720
+	1400  Merlin U730/U740 (Vodafone)
+	1410  Merlin U740 (non-Vodafone)
+	1430  Merlin XU870
+	1450  Merlin X950D
+	2110  Ovation U720/MCD3000
+	2410  Expedite EU740
+	2420  Expedite EU850D/EU860D/EU870D
+	4100  U727
+	4400  Ovation MC930D/MC950D
+	9010  Expedite E362
+	a001  Gobi Wireless Modem
+	a008  Gobi Wireless Modem (QDL mode)
+	b001  Ovation MC551
+1415  Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc.
+	0000  Sony SingStar USBMIC
+	0020  Sony Wireless SingStar
+	2000  Sony Playstation Eye
+1419  ABILITY ENTERPRISE CO., LTD.
+1421  Sensor Technology
+	0605  Sentech Camera
+1424  Posnet Polska S.A.
+	1001  Temo
+	1002  Thermal
+	1003  Neo
+	1004  Combo DF
+	1005  Thermal-A
+	1006  Thermal FV
+	1007  Bingo HS
+	1008  Thermal HS FV
+	1009  Thermal FV EJ
+	100a  Thermal HD
+	100b  Thermal
+	100c  Neo
+	100d  Ergo
+	100e  Trio
+	1010  Thermal HS FV EJ
+	1011  Neo EJ
+	1012  Thermal-A
+	1013  Thermal-A EJ
+	1014  Mobile
+	1015  Temo HS
+	1016  Mobile HS
+	1017  TH230+ FV EJ
+	1018  4610-1NR FV EJ
+1429  Vega Technologies Industrial (Austria) Co.
+142a  Thales E-Transactions
+	0003  Artema Hybrid
+	0005  Artema Modular
+	0043  medCompact
+142b  Arbiter Systems, Inc.
+	03a5  933A Portable Power Sentinel
+1430  RedOctane
+	0150  wireless receiver for skylanders wii
+	4734  Guitar Hero4 hub
+	4748  Guitar Hero X-plorer
+	474b  Guitar Hero MIDI interface
+	8888  TX6500+ Dance Pad
+	f801  Controller
+1431  Pertech Resources, Inc.
+1435  Wistron NeWeb
+	0427  UR054g 802.11g Wireless Adapter [Intersil ISL3887]
+	0711  UR055G 802.11bg
+	0804  AR9170+AR9104 802.11abgn Wireless Adapter
+	0826  AR5523
+	0827  AR5523 (no firmware)
+	0828  AR5523
+	0829  AR5523 (no firmware)
+1436  Denali Software, Inc.
+143c  Altek Corporation
+1443  Digilent
+	0007  Development board JTAG
+1446  X.J.GROUP
+	6a73  Stamps.com Model 510 5LB Scale
+	6a78  DYMO Endicia 75lb Digital Scale
+1451  Force Dimension
+	0301  haptic device
+	0302  haptic device
+	0400  haptic device
+	0401  delta.x haptic device
+	0402  omega.x haptic device
+	0403  sigma.x haptic device
+	0404  haptic controller
+	0405  dedicated haptic device
+	0406  dedicated haptic device
+	0407  dedicated haptic device
+	0408  dedicated haptic device
+1452  Dai Nippon Printing, Inc
+	8b01  DS620
+	9001  DS820
 1453  Radio Shack
 	4026  26-183 Serial Cable
+1456  Extending Wire & Cable Co., Ltd.
+1457  First International Computer, Inc.
+	5117  OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode
+	5118  OpenMoko Neo1973 Debug board (V2+)
+	5119  OpenMoko Neo1973 u-boot cdc_acm serial port
+	511a  HXD8 u-boot usbtty CDC ACM Mode
+	511b  SMDK2440 u-boot usbtty CDC ACM mode
+	511c  SMDK2443 u-boot usbtty CDC ACM mode
+	511d  QT2410 u-boot usbtty CDC ACM mode
+	5120  OpenMoko Neo1973 u-boot usbtty generic serial
+	5121  OpenMoko Neo1973 kernel mass storage (g_storage) mode
+	5122  OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network
+	5123  OpenMoko Neo1973 internal USB CSR4 module
+	5124  OpenMoko Neo1973 Bluetooth Device ID service
+145f  Trust
+	0106  K56 V92 Modem
+	013d  PC Camera (SN9C201 + OV7660)
+	013f  Megapixel Auto Focus Webcam
+	0142  WB-6250X Webcam
+	015a  WB-8300X 2MP Webcam
+	0161  15901 802.11bg Wireless Adapter [Realtek RTL8187L]
+	0167  Widescreen 3MP Webcam
+	0176  Isla Keyboard
+	019f  17676 Webcam
+	01e5  Keyboard [GXT 830]
+	0212  Panora Widescreen Graphic Tablet
+	023f  Mouse [GXT 168]
+1460  Tatung Co.
+	9150  eHome Infrared Transceiver
+1461  Staccato Communications
 1462  Micro Star International
 	5512  MegaStick-1 Flash Stick
+	8807  DIGIVOX mini III [af9015]
+146b  BigBen Interactive
+	0601  Controller for Xbox 360
+	0902  Wired Mini PS3 Game Controller
+1472  Huawei-3Com
+	0007  Aolynk WUB300g [ZyDAS ZD1211]
+	0009  Aolynk WUB320g
 147a  Formosa Industrial Computing, Inc.
+	e015  eHome Infrared Receiver
+	e016  eHome Infrared Receiver
+	e017  eHome Infrared Receiver
+	e018  eHome Infrared Receiver
+	e02c  Infrared Receiver
+	e03a  eHome Infrared Receiver
+	e03c  eHome Infrared Receiver
+	e03d  2 Channel Audio
+	e03e  Infrared Receiver [IR605A/Q]
+147e  Upek
+	1000  Biometric Touchchip/Touchstrip Fingerprint Sensor
+	1001  TCS5B Fingerprint sensor
+	1002  Biometric Touchchip/Touchstrip Fingerprint Sensor
+	2016  Biometric Touchchip/Touchstrip Fingerprint Sensor
+	2020  TouchChip Fingerprint Coprocessor (WBF advanced mode)
+	3000  TCS1C EIM/Cypress Fingerprint sensor
+	3001  TCS1C EIM/STM32 Fingerprint sensor
+147f  Hama GmbH & Co., KG
+1482  Vaillant
+	1005  VRD PC-Interface
 1484  Elsa AG [hex]
 	1746  Ecomo 19H99 Monitor
 	7616  Elsa Hub
+1485  Silicom
+	0001  U2E
+	0002  Psion Gold Port Ethernet
+1487  DSP Group, Ltd.
+148e  EVATRONIX SA
 148f  Ralink Technology, Corp.
-	2570  802.11g WiFi
-14aa  AVerMedia (again) or C&E
+	1000  Motorola BC4 Bluetooth 3.0+HS Adapter
+	1706  RT2500USB Wireless Adapter
+	2070  RT2070 Wireless Adapter
+	2570  RT2570 Wireless Adapter
+	2573  RT2501/RT2573 Wireless Adapter
+	2671  RT2601/RT2671 Wireless Adapter
+	2770  RT2770 Wireless Adapter
+	2870  RT2870 Wireless Adapter
+	3070  RT2870/RT3070 Wireless Adapter
+	3071  RT3071 Wireless Adapter
+	3072  RT3072 Wireless Adapter
+	3370  RT3370 Wireless Adapter
+	3572  RT3572 Wireless Adapter
+	3573  RT3573 Wireless Adapter
+	5370  RT5370 Wireless Adapter
+	5372  RT5372 Wireless Adapter
+	5572  RT5572 Wireless Adapter
+	7601  MT7601U Wireless Adapter
+	760b  MT7601U Wireless Adapter
+	761a  MT7610U ("Archer T2U" 2.4G+5G WLAN Adapter
+	9020  RT2500USB Wireless Adapter
+	9021  RT2501USB Wireless Adapter
+1491  Futronic Technology Co. Ltd.
+	0020  FS81 Fingerprint Scanner Module
+	0088  Fingerprint Scanner Model FS88
+1493  Suunto
+	0010  Bluebird [Ambit]
+	0019  Duck [Ambit2]
+	001a  Colibri [Ambit2 S]
+	001b  Emu [Ambit3 Peak]
+	001c  Finch [Ambit3 Sport]
+	001d  Greentit [Ambit2 R]
+	001e  Ibisbill [Ambit3 Run]
+1497  Panstrong Company Ltd.
+1498  Microtek International Inc.
+	a090  DVB-T Tuner
+149a  Imagination Technologies
+	069b  PURE Digital Evoke-1XT Tri-band
+	2107  DBX1 DSP core
+14aa  WideView Technology Inc.
 	0001  Avermedia AverTV DVBT USB1.1 (cold)
 	0002  Avermedia AverTV DVBT USB1.1 (warm)
 	0201  AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (cold)
-	0221  AVermedia DVBT Tuner Dongle
+	0221  WT-220U DVB-T dongle
+	022b  WT-220U DVB-T dongle
 	0301  AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (warm)
-14b2  Atheros Communications Inc
-	3a93  USB WLAN Device
+14ad  CTK Corporation
+14ae  Printronix Inc.
+14af  ATP Electronics Inc.
+14b0  StarTech.com Ltd.
+	3410  Serial Adapter ICUSB2321X [TUSB3410I]
+14b2  Ralink Technology, Corp.
+	3a93  Topcom 802.11bg Wireless Adapter [Atheros AR5523]
+	3a95  Toshiba WUS-G06G-JT 802.11bg Wireless Adapter [Atheros AR5523]
+	3a98  Airlink101 AWLL4130 802.11bg Wireless Adapter [Atheros AR5523]
+	3c02  Conceptronic C54RU v2 802.11bg Wireless Adapter [Ralink RT2571]
+	3c05  rt2570 802.11g WLAN
+	3c06  Conceptronic C300RU v1 802.11bgn Wireless Adapter [Ralink RT2870]
+	3c07  802.11n adapter
+	3c09  802.11n adapter
+	3c22  Conceptronic C54RU v3 802.11bg Wireless Adapter [Ralink RT2571W]
+	3c23  Airlink101 AWLL6080 802.11bgn Wireless Adapter [Ralink RT2870]
+	3c24  NEC NP01LM 802.11abg Wireless Adapter [Ralink RT2571W]
+	3c25  DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870]
+	3c27  Airlink101 AWLL6070 802.11bgn Wireless Adapter [Ralink RT2770]
+	3c28  Conceptronic C300RU v2 802.11bgn Wireless Adapter [Ralink RT2770]
+	3c2b  NEC NP02LM 802.11bgn Wireless Adapter [Ralink RT3072]
+	3c2c  Keebox W150NU 802.11bgn Wireless Adapter [Ralink RT3070]
+14c0  Rockwell Automation, Inc.
 14c2  Gemlight Computer, Ltd
+	0250  Storage Adapter V2
+	0350  Storage Adapter V2
+14c8  Zytronic
+	0005  Touchscreen Controller
+14cd  Super Top
+	1212  microSD card reader (SY-T18)
+	121c  microSD card reader
+	121f  microSD CardReader SY-T18
+	123a  SD/MMC/RS-MMC Card Reader
+	125c  SD card reader
+	127b  SDXC Reader
+	168a  Elecom Co., Ltd MR-K013 Multicard Reader
+	6116  M6116 SATA Bridge
+	6600  M110E PATA bridge
+	6700  Card Reader
+	6900  Card Reader
+	8123  SD MMC Reader
+	8125  SD MMC Reader
+	8601  4-Port hub
+	8608  Hub [Super Top]
+14d8  JAMER INDUSTRIES CO., LTD.
+14dd  Raritan Computer, Inc.
+	1007  D2CIM-VUSB KVM connector
+14e0  WiNRADiO Communications
+	0501  WR-G528e 'CHEETAH'
+14e1  Dialogue Technology Corp.
+	5000  PenMount 5000 Touch Controller
+14e5  SAIN Information & Communications Co., Ltd.
+14ea  Planex Communications
+	ab10  GW-US54GZ
+	ab11  GU-1000T
+	ab13  GW-US54Mini 802.11bg
+14ed  Shure Inc.
+	1000  MV5
+	1002  MV51
+	1003  MVi
+	1004  SHA900
+	1005  KSE1500
+	1011  MV88+
+	1100  ANIUSB-MATRIX
+	1101  P300
+	29b6  X2u Adapter
+	3000  RMCE-USB
+14f7  TechniSat Digital GmbH
+	0001  SkyStar 2 HD CI
+	0002  SkyStar 2 HD CI
+	0003  CableStar Combo HD CI
+	0004  AirStar TeleStick 2
+	0500  DVB-PC TV Star HD
+1500  Ellisys
+1501  Pine-Tum Enterprise Co., Ltd.
+1504  Bixolon CO LTD
+	001f  SRP-350II Thermal Receipt Printer
+1508  Fibocom
+1509  First International Computer, Inc.
+	0a01  LI-3100 Area Meter
+	0a02  LI-7000 CO2/H2O Gas Analyzer
+	0a03  C-DiGit Blot Scanner
+	9242  eHome Infrared Transceiver
+1513  medMobile
+	0444  medMobile
+1514  Actel
+	2003  FlashPro3 Programmer
+	2004  FlashPro3 Programmer
+	2005  FlashPro3 Programmer
+1516  CompUSA
+	1603  Flash Drive
+	8628  Pen Drive
 1518  Cheshire Engineering Corp.
 	0001  HDReye High Dynamic Range Camera
 	0002  HDReye (before firmware loads)
+1519  Comneon
+	0020  HSIC Device
+151f  Opal Kelly Incorporated
+	0020  XEM3001v1
+	0021  XEM3001v2
+	0022  XEM3010
+	0023  XEM3005
+	0028  XEM3050
+	002b  XEM5010
+	002c  XEM6001
+	002d  XEM6010-LX45
+	002e  XEM6010-LX150
+	0030  XEM6006-LX16
+	0033  XEM6002-LX9
+	0034  XEM7001-A15
+	0036  XEM7010-A50
+	0037  XEM7010-A200
+	0120  ZEM4310
+	0121  XEM6310-LX45
+	0122  XEM6310-LX150
+	0123  XEM6310MT-LX45T
+	0125  XEM7350-K70T
+	0126  XEM7350-K160T
+	0127  XEM7350-K410T
+	0128  XEM6310MT-LX150T
+	0129  ZEM5305-A2
+	012b  XEM7360-K160T
+	012c  XEM7360-K410T
+	012d  ZEM5310-A4
+	0130  XEM7310-A75
+	0131  XEM7310-A200
 1520  Bitwire Corp.
-152d  ???
-	2338  USB to (S)ATA/ATAPI Bridge
+1524  ENE Technology Inc
+	6680  UTS 6680
+1527  Silicon Portals
+	0200  YAP Phone (no firmware)
+	0201  YAP Phone
+1529  UBIQUAM Co., Ltd.
+	3100  CDMA 1xRTT USB Modem (U-100/105/200/300/520)
+152a  Thesycon Systemsoftware & Consulting GmbH
+	8350  NET Gmbh iCube Camera
+	8400  INI DVS128
+	840d  INI DAViS
+	841a  INI DAViS FX3
+152b  MIR Srl
+	0001  spirobank II
+	0002  spirolab III
+	0003  MiniSpir
+	0004  Oxi
+	0005  spiros II
+	0006  smiths spirobank II
+	0007  smiths spirobank G-USB
+	0008  smiths MiniSpir
+	0009  spirobank G-USB
+	000a  smiths Oxi
+	000b  smiths spirolab III
+	000c  chorus III
+	000d  spirolab III Bw
+	000e  spirolab III
+	000f  easySpiro
+	0010  Spirotel converter
+	0011  spirobank
+	0012  spiro3 Zimmer
+	0013  spirotel serial
+	0014  spirotel II
+	0015  spirodoc
+152d  JMicron Technology Corp. / JMicron USA Technology Corp.
+	0539  JMS539/567 SuperSpeed SATA II/III 3.0G/6.0G Bridge
+	0551  JMS551 SuperSpeed two ports SATA 3Gb/s bridge
+	0561  JMS551 - Sharkoon SATA QuickPort Duo
+	0562  JMS567 SATA 6Gb/s bridge
+	0567  JMS567 SATA 6Gb/s bridge
+	0576  Gen1 SATA 6Gb/s Bridge
+	0578  JMS578 SATA 6Gb/s
+	0583  JMS583Gen 2 to PCIe Gen3x2 Bridge
+	0770  Alienware Integrated Webcam
+	1561  JMS561U two ports SATA 6Gb/s bridge
+	1576  External Disk 3.0
+	2329  JM20329 SATA Bridge
+	2335  ATA/ATAPI Bridge
+	2336  Hard Disk Drive
+	2337  ATA/ATAPI Bridge
+	2338  JM20337 Hi-Speed USB to SATA & PATA Combo Bridge
+	2339  JM20339 SATA Bridge
+	2352  ATA/ATAPI Bridge
+	2509  JMS539, JMS551 SATA 3Gb/s bridge
+	2551  JMS551 SATA 3Gb/s bridge
+	2561  CEB-2235S-U3 external RAID box
+	2566  JMS566 SATA 3Gb/s bridge
+	2590  JMS567 SATA 6Gb/s bridge
+	3562  JMS567 SATA 6Gb/s bridge
+	3569  JMS566 SATA 3Gb/s bridge
+	578e  JMS578 SATA 6Gb/s bridge
+	8561  salcar docking station two disks
 152e  LG (HLDS)
+	1640  INIC-1605 SATA Bridge
+	2507  PL-2507 IDE Controller
+	2571  GP08NU6W DVD-RW
 	e001  GSA-5120D DVD-RW
+1532  Razer USA, Ltd
+	0001  RZ01-020300 Optical Mouse [Diamondback]
+	0002  Diamondback Optical Mouse
+	0003  Krait Mouse
+	0005  Boomslang CE
+	0007  DeathAdder Mouse
+	0009  Gaming Mouse [Tempest Habu]
+	000a  Mamba (Wired)
+	000c  Lachesis
+	000d  DiamondBack 3G
+	000e  Megalodon
+	000f  Mamba (Wireless)
+	0012  Gaming Mouse [Salmosa]
+	0013  Orochi 2011
+	0015  Naga Mouse
+	0016  DeathAdder 3.5G
+	0017  RZ01-0035 Laser Gaming Mouse [Imperator]
+	0019  Marauder
+	001a  Spectre
+	001b  Gaming Headset
+	001c  RZ01-0036 Optical Gaming Mouse [Abyssus]
+	001e  Lachesis (5600 DPI)
+	001f  Naga Epic (Wired)
+	0020  Abyssus 1800
+	0021  Naga Epic Dock (Wireless, Bluetooth)
+	0022  Gaming Mouse [TRON]
+	0023  Gaming Keyboard [TRON]
+	0024  Mamba 2012 (Wired)
+	0025  Mamba 2012 (Wireless)
+	0029  DeathAdder Black Edition
+	002a  Gaming Mouse [Star Wars: The Old Republic]
+	002b  Gaming Keyboard [Star Wars: The Old Republic]
+	002c  Gaming Headset [Star Wars: The Old Republic]
+	002e  RZ01-0058 Gaming Mouse [Naga 2012]
+	002f  Imperator 2012
+	0031  Gaming Mouse Dock [Star Wars: The Old Republic]
+	0032  Ouroboros 2012 (Wired)
+	0033  Ouroboros 2012 (Wireless)
+	0034  Taipan
+	0035  Krait 2013 Essential
+	0036  RZ01-0075, Gaming Mouse [Naga Hex (Red)]
+	0037  DeathAdder 2013
+	0038  DeathAdder 1800
+	0039  Orochi 2013
+	003e  Naga Epic Chroma (Wired)
+	003f  Naga Epic Chroma (Wireless)
+	0040  Naga 2014
+	0041  Naga Hex
+	0042  Abyssus 2014
+	0043  DeathAdder Chroma
+	0044  Mamba Chroma (Wired)
+	0045  Mamba Chroma (Wireless)
+	0046  Mamba 2015 Tournament Edition [RZ01-01370100-R3]
+	0048  Orochi 2015 (Wired)
+	004a  RZ03-0133 Gaming Lapboard, Keyboard Mouse Combo, Dongle [Turret Dongle]
+	004c  Diamondback Chroma
+	004d  DeathAdder 2000 (Cynosa Pro Bundle)
+	004f  RZ01-0145, Gaming Mouse [DeathAdder 2000 (Alternate)]
+	0050  Naga Hex V2
+	0053  Naga Chroma
+	0054  DeathAdder 3500
+	0056  Orochi 2015 (Wireless)
+	0059  RZ01-0212 Gaming Mouse [Lancehead (Wired)]
+	005a  RZ01-0212 Gaming Mouse [Lancehead (Wireless)]
+	005b  Abyssus V2
+	005c  DeathAdder Elite
+	005e  Abyssus 2000
+	005f  DeathAdder 2000
+	0060  RZ01-0213 Gaming Mouse [Lancehead Tournament Edition]
+	0062  Atheris
+	0064  Basilisk
+	0065  RZ01-0265, Gaming Mouse [Basilisk Essential]
+	0067  Naga Trinity
+	0068  Gaming Mouse Mat [Firefly Hyperflux]
+	0069  Gaming Mouse [Mamba Hyperflux]
+	006a  Abyssus Elite (D.Va Edition)
+	006b  Abyssus Essential
+	006c  Mamba Elite (Wired)
+	006e  DeathAdder Essential
+	006f  RZ01-0257 Gaming Mouse [Lancehead Wireless (2019, Wireless, Receiver)]
+	0070  RZ01-0257 Gaming Mouse [Lancehead Wireless (2019, Wired)]
+	0071  RZ01-0254 Gaming Mouse [DeathAdder Essential White Edition]
+	0072  Mamba 2018 (Wireless)
+	0073  Mamba 2018 (Wired)
+	0078  Viper (wired)
+	007a  RC30-0305 Gaming Mouse [Viper Ultimate (Wired)]
+	007b  RC30-0305 Gaming Mouse Dongle [Viper Ultimate (Wireless)]
+	007e  RC30-030502 Mouse Dock
+	0083  RC30-0315, Gaming Mouse [Basilisk X HyperSpeed]
+	0084  RZ01-0321 Gaming Mouse [DeathAdder V2]
+	0085  RZ01-0316 Gaming Mouse [Basilisk V2]
+	0086  Gaming Mouse [Basilisk Ultimate, Wired]
+	0088  Gaming Mouse [Basilisk Ultimate, Wireless, Receiver]
+	008a  RZ01-0325, Gaming Mouse [Viper Mini]
+	0101  Copperhead Mouse
+	0102  Tarantula Keyboard
+	0103  Gaming Keyboard [Reclusa]
+	0105  Gaming Keyboard [ProType]
+	0106  Gaming Keyboard [ProType]
+	0109  Lycosa Keyboard
+	010b  Gaming Keyboard [Arctosa]
+	010d  BlackWidow Ultimate 2012
+	010e  BlackWidow Classic (Alternate)
+	010f  Anansi
+	0110  Cyclosa
+	0111  Nostromo
+	0113  RZ07-0074 Gaming Keypad [Orbweaver]
+	0114  DeathStalker Ultimate
+	0116  Blade Pro (2015)
+	0118  RZ03-0080, Gaming Keyboard [Deathstalker Essential]
+	0119  Gaming Keyboard [Lycosa]
+	011a  BlackWidow Ultimate 2013
+	011b  BlackWidow Classic
+	011c  BlackWidow Tournament Edition Stealth
+	011d  Blade 2013
+	011e  Gaming Keyboard Dock [Edge Keyboard Dock]
+	011f  Deathstalker Essential 2014
+	0200  Gaming Keyboard [Reclusa]
+	0201  Tartarus
+	0202  DeathStalker Expert
+	0203  BlackWidow Chroma
+	0204  DeathStalker Chroma
+	0205  Blade Stealth
+	0207  Orbweaver Chroma keypad
+	0208  Tartarus Chroma
+	0209  BlackWidow Tournament Edition Chroma
+	020d  Cynosa Pro keyboard (Cynosa Pro Bundle)
+	020f  Blade QHD
+	0210  Blade Pro (Late 2016)
+	0211  BlackWidow Chroma (Overwatch)
+	0214  BlackWidow Ultimate 2016
+	0215  Core
+	0216  BlackWidow X Chroma
+	0217  BlackWidow X Ultimate
+	021a  BlackWidow X Tournament Edition Chroma
+	021b  Gaming Keyboard [BlackWidow X Tournament Edition]
+	021e  Ornata Chroma
+	021f  Ornata
+	0220  Blade Stealth (2016)
+	0221  RZ03-0203 Gaming Keyboard [BlackWidow Chroma V2]
+	0224  Blade (Late 2016)
+	0225  Blade Pro (2017)
+	0226  Huntsman Elite
+	0227  Huntsman
+	0228  BlackWidow Elite
+	022a  Cynosa Chroma
+	022b  Tartarus V2
+	022c  Cynosa Chroma Pro
+	022d  Blade Stealth (Mid 2017)
+	022f  Blade Pro FullHD (2017)
+	0232  Blade Stealth (Late 2017)
+	0233  Blade 15 (2018)
+	0234  Blade Pro 17 (2019)
+	0235  BlackWidow Lite (2018)
+	0237  BlackWidow Essential
+	0239  Blade Stealth (2019)
+	023a  Blade 15 (2019) Advanced
+	023b  Blade 15 (2018) Base Model
+	023f  RZ03-0274 Gaming Keyboard [Cynosa Lite]
+	0240  Blade 15 (2018) Mercury
+	0241  BlackWidow (2019)
+	0243  Huntsman Tournament Edition
+	0244  RZ07-0311 Gaming Keypad [Tartarus Pro]
+	0245  Blade 15 (Mid 2019) Mercury
+	0246  Blade 15 (Mid 2019) Base Model
+	024a  Blade Stealth (Late 2019)
+	024b  Gaming Laptop [Blade 15 Advanced (Late 2019)]
+	024c  Gaming Laptop [Blade Pro (Late 2019)]
+	024d  Blade 15 Studio Edition (2019)
+	0253  RZ09-0330, Gaming Laptop [Blade 15 Advanced (Early 2020)]
+	0255  RZ09-0328, Gaming Laptop [Blade 15 Base Model (2020)]
+	0256  RZ09--0329, Gaming Laptop [Blade Pro 17 Full HD (2020)]
+	025d  RZ03-0338, Gaming Keyboard [Ornata V2]
+	0300  RZ06-0063 Motion Sensing Controllers [Hydra]
+	0401  Gaming Arcade Stick [Panthera]
+	0501  Kraken 7.1
+	0502  Gaming Headset [Kraken USB]
+	0504  Kraken 7.1 Chroma
+	0506  Kraken 7.1 (Alternate Version)
+	0510  Kraken 7.1 V2
+	0511  RZ19-0229 Gaming Microphone
+	0514  Electra V2 USB
+	0517  Nommo Chroma
+	0518  Nommo Pro
+	051a  Nari Ultimate
+	051c  Nari (Wireless)
+	051d  Nari (Wired)
+	051e  RC30-026902, Gaming Headset [Nari Essential, Wireless, Receiver]
+	051f  RC30-026901, Gaming Headset [Nari Essential, Wired]
+	0520  Kraken Tournament Edition
+	0521  Kraken Kitty Edition
+	0527  RZ04-0318 Gaming Headset [Kraken Ultimate]
+	0904  R201-0282 Gaming Keyboard, Mouse Combination [Turret For Xbox One]
+	0a00  Atrox Arcade Stick for Xbox One
+	0a02  ManO'War
+	0a03  Wildcat
+	0a15  RZ06-0199, Gaming Controller [Wolverine Tournament Edition]
+	0c00  RZ02-0135 Hard Gaming Mouse Mat [Firefly]
+	0c01  Goliathus
+	0c02  Goliathus Extended
+	0c04  Firefly V2
+	0e03  Gaming Webcam [Kiyo]
+	0f03  Tiamat 7.1 V2
+	0f07  Chroma Mug Holder
+	0f08  Base Station Chroma
+	0f09  Chroma HDK
+	0f0d  Laptop Stand Chroma
+	0f13  Lian Li O11 Dynamic Razer Edition
+	0f1a  Core X Chroma
+	1000  Gaming Controller [Raiju]
+	1004  Gaming Controller [Raiju Ultimate Wired]
+	1007  Gaming Controller [Raiju 2 Tournament Edition (USB)]
+	1008  Gaming Flightstick [Panthera Evo]
+	1009  Gaming Controller [Raiju 2 Ultimate Edition (BT)]
+	100a  Gaming Controller [Raiju 2 Tournament Edition (BT)]
+	110d  Bootloader (Alternate)
+	800e  Bootloader
+153b  TerraTec Electronic GmbH
+	1181  Cinergy S2 PCIe Dual Port 1
+	1182  Cinergy S2 PCIe Dual Port 2
 1546  U-Blox AG
+	01a4  Antaris 4
+	01a5  [u-blox 5]
+	01a6  [u-blox 6]
+	01a7  [u-blox 7]
+	01a8  [u-blox 8]
+	1102  LISA-U2
+1547  SG Intec Ltd & Co KG
+	1000  SG-Lock[U2]
+154a  Celectronic GmbH
+	8180  CARD STAR/medic2
+154b  PNY
+	000f  Flash Drive
+	0010  USB 2.0 Flash Drive
+	0048  Flash Drive
+	004d  8 GB Flash Drive
+	0053  Flash Drive
+	0057  32GB Micro Slide Attache Flash Drive
+	005b  Flash Drive
+	0062  Flash Drive
+	007a  Classic Attache Flash Drive
+	5408  2.5in drive enclosure
+	6000  Flash Drive
+	6545  FD Device
+	fa05  Flash Drive
+154d  ConnectCounty Holdings Berhad
+154e  D&M Holdings, Inc. (Denon/Marantz)
+	3000  Marantz RC9001 Remote Control
+154f  SNBC CO., Ltd
 1554  Prolink Microsystems Corp.
+	5010  PV-D231U(RN)-F [PixelView PlayTV SBTVD Full-Seg]
+1557  OQO
+	0002  model 01 WiFi interface
+	0003  model 01 Bluetooth interface
+	0a80  Gobi Wireless Modem (QDL mode)
+	7720  model 01+ Ethernet
+	8150  model 01 Ethernet interface
 1568  Sunf Pu Technology Co., Ltd
+156f  Quantum Corporation
+1570  ALLTOP TECHNOLOGY CO., LTD.
+157b  Ketron SRL
+157e  TRENDnet
+	3006  TEW-444UB EU [TRENDnet]
+	3007  TEW-444UB EU (no firmware)
+	300a  TEW-429UB 802.11bg
+	300b  TEW-429UB 802.11bg
+	300c  TEW-429UF A1 802.11bg Wireless Adapter [ZyDAS ZD1211B]
+	300d  TEW-429UB C1 802.11bg
+	300e  SMC SMCWUSB-N 802.11bgn 2x2:2 Wireless Adapter [Ralink RT2870]
+	3012  TEW-604UB 802.11bg Wireless Adapter [Atheros AR5523]
+	3013  TEW-645UB 802.11bgn 1x2:2 Wireless Adapter [Ralink RT2770]
+	3204  Allnet ALL0298 v2 802.11bg
+	3205  Allnet ALL0283 [AR5523]
+	3206  Allnet ALL0283 [AR5523](no firmware)
+	3207  TEW-509UB A1 802.11abg Wireless Adapter [ZyDAS ZD1211]
+	3208  TEW-509UB 1.1R 802.11abg Wireless Adapter
+1582  Fiberline
+	6003  WL-430U 802.11bg
+1587  SMA Technologie AG
+158d  Oakley Inc.
+158e  JDS Uniphase Corporation (JDSU)
+	0820  SmartPocket Class Device
+1598  Kunshan Guoji Electronics Co., Ltd.
+15a2  Freescale Semiconductor, Inc.
+	0038  9S08JS Bootloader
+	003b  USB2CAN Application for ColdFire DEMOJM board
+	0041  i.MX51 SystemOnChip in RecoveryMode
+	0042  OSBDM - Debug Port
+	004e  i.MX53 SystemOnChip in RecoveryMode
+	004f  i.MX28 SystemOnChip in RecoveryMode
+	0052  i.MX50 SystemOnChip in RecoveryMode
+	0054  i.MX 6Dual/6Quad SystemOnChip in RecoveryMode
+	0061  i.MX 6Solo/6DualLite SystemOnChip in RecoveryMode
+	006a  Vybrid series SystemOnChip in RecoveryMode
+	0076  i.MX 7Solo/7Dual SystemOnChip in RecoveryMode
+	0080  i.MX 6ULL SystemOnChip in RecoveryMode
+15a4  Afatech Technologies, Inc.
+	1000  AF9015/AF9035 DVB-T stick
+	1001  AF9015/AF9035 DVB-T stick
+	1336  SDHC/MicroSD/MMC/MS/M2/CF/XD Flash Card Reader
+	9015  AF9015 DVB-T USB2.0 stick
+	9016  AF9015 DVB-T USB2.0 stick
+15a8  Teams Power Limited
+15a9  Gemtek
+	0002  SparkLAN WL-682 802.11bg Wireless Adapter [Intersil ISL3887]
+	0004  WUBR-177G [Ralink RT2571W]
+	0006  Wireless 11n USB Adapter
+	0010  802.11n USB Wireless Card
+	0012  WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870]
+	002d  WLTUBA-107 [Yota 4G LTE]
+15aa  Gearway Electronics (Dong Guan) Co., Ltd.
+15ad  VMware Inc.
+15ba  Olimex Ltd.
+	0003  OpenOCD JTAG
+	0004  OpenOCD JTAG TINY
+	002a  ARM-USB-TINY-H JTAG interface
+	002b  ARM-USB-OCD-H JTAG+RS232
+	003c  TERES Keyboard+Touchpad
+15c0  XL Imaging
+	0001  2M pixel Microscope Camera
+	0002  3M pixel Microscope Camera
+	0003  1.3M pixel Microscope Camera (mono)
+	0004  1.3M pixel Microscope Camera (colour)
+	0005  3M pixel Microscope Camera (Mk 2)
+	0006  2M pixel Microscope Camera (with capture button)
+	0007  3M pixel Microscope Camera (with capture button)
+	0008  1.3M pixel Microscope Camera (colour, with capture button)
+	0009  1.3M pixel Microscope Camera (colour, with capture button)
+	000a  2M pixel Microscope Camera (Mk 2)
+	0010  1.3M pixel "Tinycam"
+	0101  3M pixel Microscope Camera
 15c2  SoundGraph Inc.
+	0036  LC16M VFD Display/IR Receiver
+	0038  GD01 MX LCD Display/IR Receiver
+	0042  Antec Veris Multimedia Station E-Z IR Receiver
+	ffda  iMON PAD Remote Controller
 	ffdc  iMON PAD Remote Controller
+15c5  Advance Multimedia Internet Technology Inc. (AMIT)
+	0008  WL532U 802.11g Adapter
 15c6  Laboratoires MXM
-	1000 DigistimSP (cold)
-	1001 DigistimSP (warm)
-	1002 DigimapSP USB (cold)
-	1003 DigimapSP USB (warm)
+	1000  DigistimSP (cold)
+	1001  DigistimSP (warm)
+	1002  DigimapSP USB (cold)
+	1003  DigimapSP USB (warm)
+	1004  DigistimSP (cold)
+	1005  DigistimSP (warm)
+	1100  Odyssee (cold)
+	1101  Odyssee (warm)
+	1200  Digispy
+15c8  KTF Technologies
+	3201  EVER EV-W100/EV-W250
+15c9  D-Box Technologies
+15ca  Textech International Ltd.
+	00c3  Mini Optical Mouse
+	0101  MIDI Interface cable
+	1806  MIDI Interface cable
+15d5  Coulomb Electronics Ltd.
+15d9  Trust International B.V.
+	0a33  Optical Mouse
+	0a37  Mouse
+	0a41  MI-2540D [Optical mouse]
+	0a4c  USB+PS/2 Optical Mouse
+	0a4d  Optical Mouse
+	0a4e  AM-5400 [Optical Mouse]
+	0a4f  Optical Mouse
+15dc  Hynix Semiconductor Inc.
+15e0  Seong Ji Industrial Co., Ltd.
 15e1  RSA
 	2007  RSA SecurID (R) Authenticator
+15e4  Numark
+	0024  Mixtrack
+	003c  DJ2GO2 Touch
+	0140  ION VCR 2 PC / Video 2 PC
+	3f00  Power A Mini Pro Elite
+	3f0a  Airflo Wired Controller for Xbox 360
+	3f10  Batarang controller for Xbox 360
 15e8  SohoWare
 	9100  NUB100 Ethernet [pegasus]
+	9110  10/100 USB Ethernet
 15e9  Pacific Digital Corp.
+	04ce  MemoryFrame MF-570
+	1968  MemoryFrame MF-570
+	1969  Digital Frame
+15ec  Belcarra Technologies Corp.
 15f4  HanfTek
 	0001  HanfTek UMT-010 USB2.0 DVB-T (cold)
 	0025  HanfTek UMT-010 USB2.0 DVB-T (warm)
+	0131  Astrometa DVB-T/T2/C FM & DAB receiver [RTL2832P]
+	0135  Astrometa T2hybrid
 1604  Tascam
+	10c0  Dell Integrated Hub
 	8000  US-428 Audio/Midi Controller (without fw)
 	8001  US-428 Audio/Midi Controller
 	8004  US-224 Audio/Midi Controller (without fw)
 	8005  US-224 Audio/Midi Controller
 	8006  US-122 Audio/Midi Interface (without fw)
 	8007  US-122 Audio/Midi Interface
-1606  Umax [hex]
+1605  ACCES I/O Products, Inc.
+	0001  DIO-32 (No Firmware Yet)
+	0002  USB-DIO-48 (No Firmware Yet)
+	0003  USB-DIO-96 (No Firmware Yet)
+	0004  USB-DIO-32I (No Firmware Yet)
+	0005  USB-DIO24 (based on -CTR6) (No Firmware Yet)
+	0006  USB-DIO24-CTR6 (No Firmware Yet)
+1606  Umax
+	0002  Astra 1236U Scanner
 	0010  Astra 1220U
-	0030  Astra 2000U
-	0060  Astra 3400U
+	0030  Astra 1600U/2000U
+	0050  Scanner
+	0060  Astra 3400/3450
+	0070  Astra 4400/4450
 	0130  Astra 2100U
 	0160  Astra 5400U
+	0170  Uniscan D50
 	0230  Astra 2200/2200SU
+	0350  Astra 4800/4850 Scanner
+	1030  Astra 4000U
+	1220  Genesys Logic Scanner Controller NT5.0
+	2010  AstraCam Digital Camera
 	2020  AstraCam 1000
+	2030  AstraCam 1800 Digital Camera
 1608  Inside Out Networks [hex]
 	0001  EdgePort/4 Serial Port
+	0002  Edgeport/8
+	0003  Rapidport/4
+	0004  Edgeport/4
+	0005  Edgeport/2
+	0006  Edgeport/4i
+	0007  Edgeport/2i
+	0008  Edgeport/8
+	000c  Edgeport/421
+	000d  Edgeport/21
+	000e  Edgeport/4
+	000f  Edgeport/8
+	0010  Edgeport/2
+	0011  Edgeport/4
+	0012  Edgeport/416
+	0014  Edgeport/8i
+	0018  Edgeport/412
+	0019  Edgeport/412
+	001a  Edgeport/2+2i
+	0101  Edgeport/4
+	0105  Edgeport/2
+	0106  Edgeport/4i
+	0107  Edgeport/2i
+	010c  Edgeport/421
+	010d  Edgeport/21
+	0110  Edgeport/2
+	0111  Edgeport/4
+	0112  Edgeport/416
+	0114  Edgeport/8i
+	0201  Edgeport/4
+	0203  Rapidport/4
+	0204  Edgeport/4
+	0205  Edgeport/2
+	0206  Edgeport/4i
+	0207  Edgeport/2i
+	020c  Edgeport/421
+	020d  Edgeport/21
+	020e  Edgeport/4
+	020f  Edgeport/8
+	0210  Edgeport/2
+	0211  Edgeport/4
+	0212  Edgeport/416
+	0214  Edgeport/8i
+	0215  Edgeport/1
+	0216  EPOS/44
+	0217  Edgeport/42
+	021a  Edgeport/2+2i
+	021b  Edgeport/2c
+	021c  Edgeport/221c
+	021d  Edgeport/22c
+	021e  Edgeport/21c
+	021f  Edgeport/62
+	0240  Edgeport/1
+	0241  Edgeport/1i
+	0242  Edgeport/4s
+	0243  Edgeport/8s
+	0244  Edgeport/8
+	0245  Edgeport/22c
+	0301  Watchport/P
+	0302  Watchport/M
+	0303  Watchport/W
+	0304  Watchport/T
+	0305  Watchport/H
+	0306  Watchport/E
+	0307  Watchport/L
+	0308  Watchport/R
+	0309  Watchport/A
+	030a  Watchport/D
+	030b  Watchport/D
+	030c  Power Management Port
+	030e  Power Management Port
+	030f  Watchport/G
+	0310  Watchport/Tc
+	0311  Watchport/Hc
 	1403  MultiTech Systems MT4X56 Modem
+	1a17  Agilent Technologies (E6473)
+160a  VIA Technologies, Inc.
+	3184  VIA VNT-6656 [WiFi 802.11b/g USB Dongle]
+160e  INRO
+	0001  E2USBKey
+1614  Amoi Electronics
+	0404  WMA9109 UMTS Phone
+	0600  Vodafone VDA GPS / Toschiba Protege G710
+	0804  WP-S1 Phone
+1617  Sony Corp.
+	2002  NVX-P1 Personal Navigation System
+1619  L & K Precision Technology Co., Ltd.
+161c  Digitech Systems
+	0002  DTC-02U [Digi Touch Controller]
+1621  Wionics Research
+1628  Stonestreet One, Inc.
+162a  Airgo Networks Inc.
+162f  WiQuest Communications, Inc.
+1630  2Wire, Inc.
+	0005  802.11g Wireless Adapter [Intersil ISL3886]
+	0011  PC Port 10 Mps Adapter
+	ff81  802.11b Wireless Adapter [Lucent/Agere Hermes I]
+1631  Good Way Technology
+	6200  GWUSB2E
+	c019  RT2573
+1633  AIM GmbH
+	4510  ASC1553
+	4520  ASC429
+	4560  ASC-FDX
 1645  Entrega [hex]
 	0001  1S Serial Port
 	0002  2S Serial Port
@@ -4506,234 +18339,5015 @@
 	0005  E45 Ethernet [klsi]
 	0006  Parallel Port
 	0007  U1-SC25 SCSI
+	0008  Ethernet
+	0016  Bi-directional to Parallel Printer Converter
+	0080  1 port to Serial Converter
+	0081  1 port to Serial Converter
 	0093  1S9 Serial Port
 	8000  EZ-USB
+	8001  1 port to Serial
 	8002  2x Serial Port
+	8003  1 port to Serial
+	8004  2U4S serial/usb hub
+	8005  Ethernet
+	8080  1 port to Serial
+	8081  1 port to Serial
 	8093  PortGear Serial Port
+1649  SofTec Microsystems
+	0102  uDART In-Circuit Debugger
+	0200  SpYder USBSPYDER08
+164a  ChipX
+164c  Matrix Vision GmbH
+	0101  mvBlueFOX camera (no firmware)
+	0103  mvBlueFOX camera
+	0201  mvBlueLYNX-X intelligent camera (bootloader)
+	0203  mvBlueLYNX-X intelligent camera
 1657  Struck Innovative Systeme GmbH
 	3150  SIS3150 USB2.0 to VME interface
+165b  Frontier Design Group
+	8101  Tranzport Control Surface
+	fad1  Alphatrack Control Surface
+165c  Kondo Kagaku
+	0002  Serial Adapter
+	0006  FT232 [ICS adapter HS]
+	0008  FT232 [Dual adapter HS]
+1660  Creatix Polymedia GmbH
+1667  GIGA-TMS INC.
+	0005  PCR330A RFID Reader (125 kHz, keyboard emulation)
 1668  Actiontec Electronics, Inc. [hex]
+	0009  Gateway
 	0333  Modem
+	0358  InternetPhoneWizard
+	0405  Gateway
 	0408  Prism2.5 802.11b Adapter
+	0413  Gateway
 	0421  Prism2.5 802.11b Adapter
+	0441  IBM Integrated Bluetooth II
 	0500  BTM200B BlueTooth Adapter
+	1050  802UIG-1 802.11g Wireless Mini Adapter [Intersil ISL3887]
+	1200  802AIN Wireless N Network Adapter [Atheros AR9170+AR9101]
+	1441  IBM Integrated Bluetooth II
+	2441  BMDC-2 IBM Bluetooth III w.56k
+	3441  IBM Integrated Bluetooth III
+	6010  Gateway
+	6097  802.11b Wireless Adapter
+	6106  802UI3(B) 802.11b Wireless Adapter [Intersil PRISM 3]
+	7605  UAT1 Wireless Ethernet Adapter
+1669  PiKRON Ltd. [hex]
+	1001  uLan2USB Converter - PS1 protocol
+166a  Clipsal
+	0101  C-Bus Multi-room Audio Matrix Switcher
+	0201  C-Bus Pascal Automation Controller
+	0301  C-Bus Wireless PC Interface
+	0303  C-Bus interface
+	0304  C-Bus Black and White Touchscreen
+	0305  C-Bus Spectrum Colour Touchscreen
+	0401  C-Bus Architectural Dimmer
+1677  China Huada Integrated Circuit Design (Group) Co., Ltd. (CIDC Group)
+	0103  Token
+1679  Total Phase
+	2001  Beagle Protocol Analyzer
+	2002  Cheetah SPI Host Adapter
+167b  Pure Digital Technologies, Inc.
+	2009  Flip Ultra U1120
+1680  Golden Bridge Electech Inc.
+	a332  DVB-T Dongle [RTL2832U]
+1681  Prevo Technologies, Inc.
+	0001  Tuner's Dashboard
+	0002  DocuBrain(R) Tubachron
+	0003  DocuBrain(R) I2C
+	0004  DocuBrain(R) WWVB Receiver
+	0005  DocuBrain(R) WWVB Transmitter
+1682  Maxwise Production Enterprise Ltd.
+1684  Godspeed Computer Corp.
+1685  Delock
+	0200  Infrared adapter
+1686  ZOOM Corporation
+	0045  Handy Recorder stereo mix
+	01c0  Zoom Handy Recorder card reader
+	01c5  Zoom Handy Recorder multi track
+	03d5  LiveTrak L-12
+1687  Kingmax Digital Inc.
+	5289  FlashDisk
+	6211  FlashDisk
+	6213  FlashDisk
+1688  Saab AB
+1689  Razer USA, Ltd
+	fd00  Onza Tournament Edition controller
+	fd01  Onza Classic Edition
+	fe00  Sabertooth Elite
+168c  Atheros Communications
+	0001  AR5523
+	0002  AR5523 (no firmware)
 1690  Askey Computer Corp. [hex]
+	0001  Arcaze Gamepad
 	0101  Creative Modem Blaster DE5670
-	0103  Askey 1456 VQE-R3 Modem [conexant]
-	0109  Askey MagicXpress V.90 Pocket Modem [conexant]
+	0102  V1456 VQE-R2 Modem [conexant]
+	0103  1456 VQE-R3 Modem [conexant]
+	0104  HCF V90 Data Fax RTAD Modem
+	0107  HCF V.90 Data,Fax,RTAD Modem
+	0109  MagicXpress V.90 Pocket Modem [conexant]
+	0203  Voyager ADSL Modem Loader
+	0204  Voyager ADSL Modem
+	0205  DSL Modem
+	0206  GlobeSpan ADSL WAN Modem
+	0208  DSL Modem
+	0209  Voyager 100 ADSL Modem
+	0211  Globespan Virata ADSL LAN Modem
+	0212  DSL Modem
+	0213  HM121d DSL Modem
+	0214  HM121d DSL Modem
+	0215  Voyager 105 ADSL Modem
+	0701  WLAN
+	0710  SMCWUSBT-G
+	0711  SMCWUSBT-G (no firmware)
+	0712  AR5523
+	0713  AR5523 (no firmware)
+	0715  Name: Voyager 1055 Laptop 802.11g Adapter [Broadcom 4320]
+	0722  RT2573
+	0726  Wi-Fi Wireless LAN Adapter
+	0740  802.11n Wireless LAN Card
+	0901  Voyager 205 ADSL Router
+	2000  naturaSign Pad Standard
+	2001  naturaSign Pad Standard
+	fe12  Bootloader
 1696  Hitachi Video and Information System, Inc.
 1697  VTec Test, Inc.
+16a5  Shenzhen Zhengerya Cable Co., Ltd.
+16a6  Unigraf
+	3000  VTG-3xxx Video Test Generator family
+	4000  VTG-4xxx Video Test Generator family
+	5000  VTG-5xxx Video Test Generator family
+	5001  VTG-5xxx Special (update) mode of VTG-5xxx family
+16ab  Global Sun Technology
+	7801  AR5523
+	7802  AR5523 (no firmware)
+	7811  AR5523
+	7812  AR5523 (no firmware)
+16ac  Dongguan ChingLung Wire & Cable Co., Ltd.
+16b4  iStation
+	0801  U43
+16b5  Persentec, Inc.
+	0002  Otto driving companion
+16c0  Van Ooijen Technische Informatica
+	03e8  free for internal lab use 1000
+	03e9  free for internal lab use 1001
+	03ea  free for internal lab use 1002
+	03eb  free for internal lab use 1003
+	03ec  free for internal lab use 1004
+	03ed  free for internal lab use 1005
+	03ee  free for internal lab use 1006
+	03ef  free for internal lab use 1007
+	03f0  free for internal lab use 1008
+	03f1  free for internal lab use 1009
+	0477  Teensy Rebootor
+	0478  Teensy Halfkay Bootloader
+	0479  Teensy Debug
+	047a  Teensy Serial
+	047b  Teensy Serial+Debug
+	047c  Teensy Keyboard
+	047d  Teensy Keyboard+Debug
+	047e  Teensy Mouse
+	047f  Teensy Mouse+Debug
+	0480  Teensy RawHID
+	0481  Teensy RawHID+Debug
+	0482  Teensyduino Keyboard+Mouse+Joystick
+	0483  Teensyduino Serial
+	0484  Teensyduino Disk
+	0485  Teensyduino MIDI
+	0486  Teensyduino RawHID
+	0487  Teensyduino Serial+Keyboard+Mouse+Joystick
+	0488  Teensyduino Flight Sim Controls
+	05b5  BU0836
+	05dc  shared ID for use with libusb
+	05dd  BlackcatUSB2
+	05de  Flashcat
+	05df  HID device except mice, keyboards, and joysticks
+	05e1  Free shared USB VID/PID pair for CDC devices
+	05e4  Free shared USB VID/PID pair for MIDI devices
+	06b4  USB2LPT with 2 interfaces
+	06b5  USB2LPT with 3 interfaces (native, HID, printer)
+	074e  DSP-Weuffen USB-HPI-Programmer
+	074f  DSP-Weuffen USB2-HPI-Programmer
+	0762  Osmocom SIMtrace
+	076b  OpenPCD 13.56MHz RFID Reader
+	076c  OpenPICC 13.56MHz RFID Simulator (native)
+	08ac  OpenBeacon USB stick
+	08ca  Alpermann+Velte Universal Display
+	08cb  Alpermann+Velte Studio Clock
+	08cc  Alpermann+Velte SAM7S MT Boot Loader
+	08cd  Alpermann+Velte SAM7X MT Boot Loader
+	09ce  LINKUSB
+	0a32  jbmedia Light-Manager Pro
+	27d8  libusb-bound devices
+	27d9  HID device except mice, keyboards, and joysticks
+	27da  Mouse
+	27db  Keyboard
+	27dc  Joystick
+	27dd  CDC-ACM class devices (modems)
+	27de  MIDI class devices
+	294a  Eye Movement Recorder [Visagraph]
+	294b  Eye Movement Recorder [ReadAlyzer]
+16ca  Wireless Cables, Inc.
+	1502  Bluetooth Dongle
+16cc  silex technology, Inc.
+16d0  MCS
+	0436  Xylanta Ltd, XSP Device
+	0498  Braintechnology USB-LPS
+	0504  RETRO Innovations ZoomFloppy
+	054b  GrauTec ReelBox OLED Display (external)
+	05be  EasyLogic Board
+	05f0  Superior Freedom Programmable IR Remote
+	06cc  Trinamic TMCM-3110
+	06f0  Axium AX-R4C Controller
+	06f1  Axium AX-R1D Controller
+	06f9  Gabotronics Xminilab
+	0726  Autonomic M400 Amplifier
+	0727  Autonomic M800 Amplifier
+	0753  Digistump DigiSpark
+	075c  AB-1.x UAC1 [Audio Widget]
+	075d  AB-1.x UAC2 [Audio Widget]
+	07cc  Xylanta Ltd, Saint3 Device
+	07f8  Axium AX-R4D Controller
+	080a  S2E1 Interface
+	0830  DMXControl Projects e.V., Nodle U1
+	0831  DMXControl Projects e.V., Desklamp
+	0832  DMXControl Projects e.V., Nodle U2
+	0833  DMXControl Projects e.V., Nodle R4S
+	0870  Kaufmann Automotive GmbH, RKS+CAN Interface
+	09f2  Axium AX-1250 Amplifier
+	09f4  Axium AX-Mini4 Amplifier
+	0b03  AIS Receiver [dAISy]
+	0b7d  Autonomic M801 Amplifier
+	0b7e  Autonomic M401 Amplifier
+	0b7f  Autonomic M120e Amplifier
+	0bd4  codesrc SCSI2SD
+	0c9b  Fermium LABS srl/LabTrek srl Hall Effect Apparatus
+	0d3c  InputStick BT4.0
+	0e1e  AtomMiner
+16d1  Suprema Inc.
+	0401  SUP-SFR400(A) BioMini Fingerprint Reader
+16d3  Frontline Test Equipment, Inc.
+16d5  AnyDATA Corporation
+	6202  CDMA/UMTS/GPRS modem
+	6501  CDMA 2000 1xRTT/EV-DO Modem
+	6502  CDMA/UMTS/GPRS modem
+	6603  ADU-890WH modem
+16d6  JABLOCOM s.r.o.
+	8000  GDP-04 desktop phone
+	8001  EYE-02
+	8003  GDP-04 modem
+	8004  Bootloader
+	8005  GDP-04i
+	8007  BTP-06 modem
+16d8  CMOTECH Co., Ltd.
+	5141  CMOTECH CDMA Technologies modem
+	5533  CCU-550 CDMA EV-DO modem
+	5543  CDMA 2000 1xRTT/1xEVDO modem
+	6280  CMOTECH CDMA Technologies modem
+	6803  CNU-680 CDMA EV-DO modem
+	8001  Gobi 2000 Wireless Modem (QDL mode)
+	8002  Gobi 2000 Wireless Modem
+16dc  Wiener, Plein & Baus
+	0001  CC
+	000b  VM
+	0010  PL512 Power Supply System
+	0011  MARATON Power Supply System
+	0012  MPOD Multi Channel Power Supply System
+	0015  CML Control, Measurement and Data Logging System
+16de  Telemecanique
+16df  King Billion Electronics Co., Ltd.
+16f0  GN Hearing A/S
+	0001  Speedlink Programming Interface
+	0003  Airlink Wireless Programming Interface
+	0004  Accessory Programming Interface
+16f5  Futurelogic Inc.
+1702  FDI-MATELEC
+	0002  Encodeur
 1706  BlueView Technologies, Inc.
+1707  ARTIMI
+170b  Swissonic
+	0011  MIDI-USB 1x1
+170d  Avnera
+1711  Leica Microsystems
+	0101  DFC-365FX camera
+	3020  IC80 HD Camera
+1724  Meyer Instruments (MIS)
+	0115  PAXcam5
+1725  Vitesse Semiconductor
+1726  Axesstel, Inc.
+	1000  wireless modem
+	2000  wireless modem
+	3000  wireless modem
+172f  Waltop International Corp.
+	0022  Tablet
+	0024  Tablet
+	0025  Tablet
+	0026  Tablet
+	0031  Slim Tablet 12.1"
+	0032  Slim Tablet 5.8"
+	0034  Slim Tablet 12.1"
+	0038  Genius G-Pen F509
+	0500  Media Tablet 14.1"
+	0501  Media Tablet 10.6"
+	0502  Sirius Battery Free Tablet
 1733  Cellink Technology Co., Ltd
 	0101  RF Wireless Optical Mouse OP-701
-1781  MetaGeek
-	083e  Wi-Spy
+1736  CANON IMAGING SYSTEM TECHNOLOGIES INC.
+1737  802.11g Adapter [Linksys WUSB54GC v3]
+	0039  USB1000 Gigabit Notebook Adapter
+	0070  WUSB100 v1 RangePlus Wireless Network Adapter [Ralink RT2870]
+	0071  WUSB600N v1 Dual-Band Wireless-N Network Adapter [Ralink RT2870]
+	0073  WUSB54GC v2 802.11g Adapter [Realtek RTL8187B]
+	0075  WUSB54GSC v2 802.11g Adapter [Broadcom 4326U]
+	0077  WUSB54GC v3 802.11g Adapter [Ralink RT2070L]
+	0078  WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070]
+	0079  WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572]
+173a  Roche
+	2198  Accu-Chek Mobile
+	21ca  ACCU-CHEK Mobile Model U1
+173d  QSENN
+	0002  GP-K7000 keyboard
+1740  Senao
+	0100  EUB1200AC AC1200 DB Wireless Adapter [Realtek RTL8812AU]
+	0600  EUB600v1 802.11abgn Wireless Adapter [Ralink RT3572]
+	0605  LevelOne WUA-0605 N_Max Wireless USB Adapter
+	0615  LevelOne WUA-0615 N_Max Wireless USB Adapter
+	1000  NUB-350 802.11g Wireless Adapter [Intersil ISL3887]
+	2000  NUB-8301 802.11bg
+	3701  EUB-3701 EXT 802.11g Wireless Adapter [Ralink RT2571W]
+	9603  RTL8188S WLAN Adapter
+	9701  EnGenius 802.11n Wireless USB Adapter
+	9702  EnGenius 802.11n Wireless USB Adapter
+	9703  EnGenius 802.11n Wireless USB Adapter
+	9705  EnGenius 802.11n Wireless USB Adapter
+	9706  EUB9706 802.11n Wireless Adapter [Ralink RT3072]
+	9801  EUB9801 802.11abgn Wireless Adapter [Ralink RT3572]
+1743  General Atomics
+1748  MQP Electronics
+	0101  Packet-Master USB12
+174c  ASMedia Technology Inc.
+	07d1  Transcend ESD400 Portable SSD (USB 3.0)
+	1151  ASM1151W
+	1153  ASM1153 SATA 3Gb/s bridge
+	2074  ASM1074 High-Speed hub
+	3074  ASM1074 SuperSpeed hub
+	5106  ASM1051 SATA 3Gb/s bridge
+	5136  ASM1053 SATA 3Gb/s bridge
+	51d6  ASM1051W SATA 3Gb/s bridge
+	55aa  ASM1051E SATA 6Gb/s bridge, ASM1053E SATA 6Gb/s bridge, ASM1153 SATA 3Gb/s bridge, ASM1153E SATA 6Gb/s bridge
+174f  Syntek
+	1105  SM-MS/Pro-MMC-XD Card Reader
+	110b  HP Webcam
+	1122  HP Webcam
+	1169  Lenovo EasyCamera
+	1403  Integrated Webcam
+	1404  USB Camera device, 1.3 MPixel Web Cam
+	1758  XYZ printing cameraR2
+	1759  XYZ printing cameraL2
+	5212  USB 2.0 UVC PC Camera
+	5a11  PC Camera
+	5a31  Sonix USB 2.0 Camera
+	5a35  Sonix 1.3MPixel USB 2.0 Camera
+	6a31  Web Cam - Asus A8J, F3S, F5R, VX2S, V1S
+	6a33  Web Cam - Asus F3SA, F9J, F9S
+	6a51  2.0MPixel Web Cam - Asus Z96J, Z96S, S96S
+	6a54  Web Cam
+	6d51  2.0Mpixel Web Cam - Eurocom D900C
+	8a12  Syntek 0.3MPixel USB 2.0 UVC PC Camera
+	8a33  Syntek USB 2.0 UVC PC Camera
+	a311  1.3MPixel Web Cam - Asus A3A, A6J, A6K, A6M, A6R, A6T, A6V, A7T, A7sv, A7U
+	a312  1.3MPixel Web Cam
+	a821  Web Cam - Packard Bell BU45, PB Easynote MX66-208W
+	aa11  Web Cam
+1753  GERTEC Telecomunicacoes Ltda.
+	c901  PPC900 Pinpad Terminal
+1756  ENENSYS Technologies
+	0006  DiviPitch
+1759  LucidPort Technology, Inc.
+1761  ASUSTek Computer, Inc. (wrong ID)
+	0b05  802.11n Network Adapter (wrong ID - swapped vendor and device)
+1770  MSI
+	ff00  steel series rgb keyboard
+1772  System Level Solutions, Inc.
+1776  Arowana
+	501c  300K CMOS Camera
+1777  Microscan Systems, Inc.
+	0003  MicroHAWK ID-20
+177f  Sweex
+	0004  MM004V5 Photo Key Chain (Digital Photo Frame) 1.5"
+	0153  LW153 802.11n Adapter [ralink rt3070]
+	0154  LW154 802.11bgn (1x1:1) Wireless Adapter [Realtek RTL8188SU]
+	0313  LW313 802.11n Adapter [ralink rt2770 + rt2720]
+1781  Multiple Vendors
+	07df  Axium AX-800DAV Amplifier
+	07e1  Axium AX-KPC Keypad
+	07e2  Axium AX-KPD Keypad
+	07e3  Axium AX-400DA Amplifier
+	083e  MetaGeek Wi-Spy
+	083f  MetaGeek Wi-Spy 2.4x
+	0938  Iguanaworks USB IR Transceiver
+	0941  qNimble Quark
+	0a96  raphnet.net usb_game12
+	0a97  raphnet.net SNES mouse adapter
+	0a98  raphnet.net USBTenki
+	0a99  raphnet.net NES
+	0a9a  raphnet.net Gamecube/N64 controller
+	0a9b  raphnet.net DB9Joy
+	0a9c  raphnet.net Intellivision
+	0a9d  raphnet.net 4nes4snes
+	0a9e  raphnet.net Megadrive multitap
+	0a9f  raphnet.net MultiDB9joy
+	0bad  Mantracourt Load Cell
+	0c30  Telldus TellStick
+	0c31  Telldus TellStick Duo
+	0c9f  USBtiny
+	1eef  OpenAPC SecuKey
+	1ef0  E1701 Modular Controller Card
+	1ef1  E1701 Modular Controller Card
+	1ef2  E1803 Compact Controller Card
+1782  Spreadtrum Communications Inc.
+	3d00  F200n mobile phone
+1784  TopSeed Technology Corp.
+	0001  eHome Infrared Transceiver
+	0004  RF Combo Device
+	0006  eHome Infrared Transceiver
+	0007  eHome Infrared Transceiver
+	0008  eHome Infrared Transceiver
+	000a  eHome Infrared Transceiver
+	0011  eHome Infrared Transceiver
+1787  ATI AIB
+1788  ShenZhen Litkconn Technology Co., Ltd.
+178e  ASUSTek Computer, Inc. (wrong ID)
+	0b05  CrossLink cable 2GB (wrong ID - swapped vendor and device)
+1796  Printrex, Inc.
+1797  JALCO CO., LTD.
+1799  Thales Norway A/S
+	7051  Belkin F5D7051 802.11g Adapter v1000 [Broadcom 4320]
+	8051  Belkin F5D8051 v2 802.11bgn Wireless Adapter [Marvell 88W8362]
+179d  Ricavision International, Inc.
+	0010  Internal Infrared Transceiver
+17a0  Samson Technologies Corp.
+	0001  C01U condenser microphone
+	0002  Q1U dynamic microphone
+	0100  C03U multi-pattern microphone
+	0101  UB1 boundary microphone
+	0120  Meteorite condenser microphone
+	0130  Go Mic Direct
+	0132  Go Mic Mobile wireless receiver
+	0200  StudioDock monitors (internal hub)
+	0201  StudioDock monitors (audio)
+	0210  StudioGT monitors
+	0211  StudioGT monitors [CM6400]
+	0240  Go Mic Connect
+	0241  G-Track Pro microphone
+	0301  Q2U handheld microphone with XLR
+	0302  GoMic compact condenser microphone
+	0303  C01U Pro condenser microphone
+	0304  Q2U handheld mic with XLR
+	0305  GoMic compact condenser mic
+	0310  Meteor condenser microphone
+	0311  Satellite condenser microphone
+	1616  RXD1 wireless receiver
+	b241  G-Track Pro firmware update
+	b311  Satellite firmware update
+17a4  Concept2
+	0001  Performance Monitor 3
+	0002  Performance Monitor 4
+17a5  Advanced Connection Technology Inc.
+17a7  MICOMSOFT CO., LTD.
+17a8  Kamstrup A/S
+	0001  Optical Eye/3-wire
+	0005  M-Bus Master MultiPort 250D
+	0010  444MHz Radio Mesh Frontend
+	0011  444MHz RF sniffer
+	0012  870MHz Radio Mesh Frontend
+	0013  870MHz RF sniffer
 17b3  Grey Innovation
 	0004  Linux-USB Midi Gadget
+17b5  Lunatone
+	0010  MFT Sensor
+17ba  SAURIS GmbH
+	0001  SAU510-USB [no firmware]
+	0510  SAU510-USB and SAU510-USB plus JTAG Emulators
+	0511  SAU510-USB Iso Plus JTAG Emulator
+	0520  SAU510-USB Nano JTAG Emulator
+	1511  Onboard Emulator on SAUModule development kit
+17c3  Singim International Corp.
+17cc  Native Instruments
+	041c  Audio 2 DJ
+	041d  Traktor Audio 2
+	0808  Maschine Controller
+	0815  Audio Kontrol 1
+	0839  Audio 4 DJ
+	0d8d  Guitarrig Mobile
+	1001  Komplete Audio 6
+	1110  Maschine Mikro
+	1915  Session I/O
+	1940  RigKontrol3
+	1969  RigKontrol2
+	1978  Audio 8 DJ
+	2280  Medion MDPNA1500 in card reader mode
+	2305  Traktor Kontrol X1
+	4711  Kore Controller
+	4712  Kore Controller 2
+	baff  Traktor Kontrol S4
+17cf  Hip Hing Cable & Plug Mfy. Ltd.
+17d0  Sanford L.P.
+17d3  Korea Techtron Co., Ltd.
+17e9  DisplayLink
+	0051  USB VGA Adaptor
+	0198  DisplayLink
+	019e  Overfly FY-1016A
+	028f  HIS Multi-View II
+	030b  HP T100
+	0377  Plugable UD-160-A (M)
+	0378  Plugable UGA-2K-A
+	0379  Plugable UGA-125
+	037a  Plugable UGA-165
+	037b  Plugable USB-VGA-165
+	037c  Plugable DC-125
+	037d  Plugable USB2-HDMI-165
+	410a  HDMI Adapter
+	430a  HP Port Replicator (Composite Device)
+	430f  Kensington Dock (Composite Device)
+	4312  S2340T
+	436e  Dell D3100 Docking Station
+	ff10  I1659FWUX {AOC Powered Monitor]
 17eb  Cornice, Inc.
+17ef  Lenovo
+	1000  ThinkPad X6 UltraBase
+	1003  Integrated Smart Card Reader
+	1004  Integrated Webcam
+	1005  ThinkPad X200 Ultrabase (42X4963 )
+	1008  Hub
+	100a  ThinkPad Mini Dock Plus Series 3
+	100f  ThinkPad Ultra Dock Hub
+	1010  ThinkPad Ultra Dock Hub
+	1020  ThinkPad Dock Hub
+	1021  ThinkPad Dock Hub [Cypress HX2VL]
+	3049  ThinkPad OneLink integrated audio
+	304b  AX88179 Gigabit Ethernet [ThinkPad OneLink GigaLAN]
+	304f  RTL8153 Gigabit Ethernet [ThinkPad OneLink Pro Dock]
+	3060  ThinkPad Dock
+	3062  ThinkPad Dock Ethernet [Realtek RTL8153B]
+	3063  ThinkPad Dock Audio
+	3066  ThinkPad Thunderbolt 3 Dock MCU
+	3069  ThinkPad TBT3 LAN
+	306a  ThinkPad Thunderbolt 3 Dock Audio
+	3815  ChipsBnk 2GB USB Stick
+	4802  Vc0323+MI1310_SOC Camera
+	4807  UVC Camera
+	480c  Integrated Webcam
+	480d  Integrated Webcam [R5U877]
+	480e  Integrated Webcam [R5U877]
+	480f  Integrated Webcam [R5U877]
+	4810  Integrated Webcam [R5U877]
+	4811  Integrated Webcam [R5U877]
+	4812  Integrated Webcam [R5U877]
+	4813  Integrated Webcam [R5U877]
+	4814  Integrated Webcam [R5U877]
+	4815  Integrated Webcam [R5U877]
+	4816  Integrated Webcam
+	481c  Integrated Webcam
+	481d  Integrated Webcam
+	6004  ISD-V4 Tablet Pen
+	6007  Smartcard Keyboard
+	6009  ThinkPad Keyboard with TrackPoint
+	600e  Optical Mouse
+	6014  Mini Wireless Keyboard N5901
+	6019  M-U0025-O Mouse
+	6022  Ultraslim Plus Wireless Keyboard and Mouse
+	6025  ThinkPad Travel Mouse
+	602d  Black Silk Keyboard
+	6032  Wireless Dongle for Keyboard and Mouse
+	6044  ThinkPad Laser Mouse
+	6047  ThinkPad Compact Keyboard with TrackPoint
+	604b  Precision Wireless Mouse
+	608d  Optical Mouse
+	609b  Professional Wireless Keyboard and Mouse Combo
+	609c  Professional Wireless Keyboard
+	7203  Ethernet adapter [U2L 100P-Y1]
+	7205  Thinkpad LAN
+	7217  VGA adapter
+	7423  IdeaPad A1 Tablet
+	7435  A789 (Mass Storage mode, with debug)
+	743a  A789 (Mass Storage mode)
+	7497  A789 (MTP mode)
+	7498  A789 (MTP mode, with debug)
+	749a  A789 (PTP mode)
+	749b  A789 (PTP mode, with debug)
+	7604  A760 (Mass Storage mode)
+	7605  A760 (Mass Storage mode, with debug)
+	760a  A760 (MTP mode)
+	760b  A760 (MTP mode, with debug)
+	760c  A760 (PTP mode)
+	760d  A760 (PTP mode, with debug)
+	76fc  B8000-H (Yoga Tablet 10) (mass storage)
+	76fd  B8000-H (Yoga Tablet 10) (debug , mass storage)
+	76fe  B8000-H (Yoga Tablet 10) (MTP)
+	76ff  B8000-H (Yoga Tablet 10) (debug , MTP)
+	7702  B8000-H (Yoga Tablet 10) (PTP)
+	7703  B8000-H (Yoga Tablet 10) (debug , PTP)
+	7704  B8000-H (Yoga Tablet 10) (USB tether)
+	7705  B8000-H (Yoga Tablet 10) (debug , USB tether)
+	7706  B8000-H (Yoga Tablet 10) (zerocd)
+	7707  B8000-H (Yoga Tablet 10) (debug , zerocd)
+	785f  TAB 2 A7-10 Tablet
+	b000  Virtual Keyboard and Mouse
+	b001  Ethernet
+	b003  Virtual Keyboard and Mouse / Mass Storage
+	f003  MEDION LIFETAB X10605 MTP mode
+17f4  WaveSense
+	aaaa  Jazz Blood Glucose Meter
+17f5  K.K. Rocky
+17f6  Unicomp, Inc.
+	0709  Model M Keyboard
+	0822  Ruffian 6 Keyboard v3 [Model M]
+1809  Advantech
+	4604  USB-4604
+	4761  USB-4761 Portable Data Acquisition Module
 1822  Twinhan
 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
 	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
+1831  Gwo Jinn Industries Co., Ltd.
+1832  Huizhou Shenghua Industrial Co., Ltd.
+183d  VIVOphone
+	0010  VoiceKey
+1843  Vaisala
+1849  ASRock Incorporation
+184f  K2L GmbH
+	0012  MOCCA compact
+1852  GYROCOM C&C Co., LTD
+	7022  Fiio E10
+	7921  Audiotrak ProDigy CUBE
+	7922  Audiotrak DR.DAC2 DX [GYROCOM C&C]
+1854  Memory Devices Ltd.
 185b  Compro
+	3020  K100 Infrared Receiver
+	3082  K100 Infrared Receiver v2
 	d000  Compro Videomate DVB-U2000 - DVB-T USB cold
 	d001  Compro Videomate DVB-U2000 - DVB-T USB warm
+1861  Tech Technology Industrial Company
+1862  Teridian Semiconductor Corp.
+1870  Nexio Co., Ltd
+	0001  iNexio Touchscreen controller
+1871  Aveo Technology Corp.
+	0101  UVC camera (Bresser microscope)
+	0141  Camera
+	0d01  USB2.0 Camera
+1873  Navilock
+	ee93  EasyLogger
+187c  Alienware Corporation
+	0511  AlienFX Mobile lighting
+	0513  Gaming Desktop [Aurora R4]
+	0550  LED controller
+	0600  Dual Compatible Game Pad
+187f  Siano Mobile Silicon
+	0010  Stallar Board
+	0100  Stallar Board
+	0200  Nova A
+	0201  Nova B
+	0202  Nice
+	0300  Vega
+	0301  VeNice
+1892  Vast Technologies, Inc.
 1894  Topseed
 	5632  Atek Tote Remote
 	5641  TSAM-004 Presentation Remote
+1897  Evertop Wire Cable Co.
+189f  3Shape A/S
+	0002  Legato2 3D Scanner
+18a4  CSSN
+	0001  Snapshell IDR
+18a5  Verbatim, Ltd
+	0214  Portable Hard Drive
+	0216  External Hard Drive
+	0218  External Hard Drive
+	0224  Store 'n' Go Micro Plus
+	0227  Pocket Hard Drive
+	022b  Portable Hard Drive (Store'n'Go)
+	0237  Portable Harddrive
+	0243  Flash Drive (Store'n'Go)
+	0245  Store'n'Stay
+	0302  Flash Drive
+	0304  Store 'n' Go
+	0408  Store 'n' Go
+	4123  Store N Go
+18b1  Petalynx
+	0037  Maxter Remote Control
+18b4  e3C Technologies
+	1001  DUTV007
+	1002  EC168 (v5) based USB DVB-T receiver
+	1689  DUTV009
+	fffa  EC168 (v2) based USB DVB-T receiver
+	fffb  EC168 (v3) based USB DVB-T receiver
+18b6  Mikkon Technology Limited
+18b7  Zotek Electronic Co., Ltd.
+18c5  AMIT Technology, Inc.
+	0002  CG-WLUSB2GO
+	0008  CG-WLUSB2GNR Corega Wireless USB Adapter
+	0012  CG-WLUSB10 Corega Wireless USB Adapter
+18cd  Ecamm
+	cafe  Pico iMage
+18d1  Google Inc.
+	0001  Onda V972 (storage access)
+	0003  Android-powered device using AllWinner Technology SoC
+	0006  Onda V972 MTP
+	0008  Onda V972 PTP (camera)
+	0d02  Celkon A88
+	2d00  Android Open Accessory device (accessory)
+	2d01  Android Open Accessory device (accessory + ADB)
+	2d02  Android Open Accessory device (audio)
+	2d03  Android Open Accessory device (audio + ADB)
+	2d04  Android Open Accessory device (accessory + audio)
+	2d05  Android Open Accessory device (accessory + audio + ADB)
+	4e11  Nexus One
+	4e12  Nexus One (debug)
+	4e13  Nexus One (tether)
+	4e20  Nexus S (fastboot)
+	4e21  Nexus S
+	4e22  Nexus S (debug)
+	4e24  Nexus S (tether)
+	4e30  Galaxy Nexus (fastboot)
+	4e40  Nexus 7 (fastboot)
+	4e41  Nexus 7 (MTP)
+	4e42  Nexus 7 (debug)
+	4e43  Nexus 7 (PTP)
+	4e44  Nexus 7 2012 (PTP)
+	4ee0  Nexus/Pixel Device (fastboot)
+	4ee1  Nexus/Pixel Device (MTP)
+	4ee2  Nexus/Pixel Device (MTP + debug)
+	4ee3  Nexus/Pixel Device (tether)
+	4ee4  Nexus/Pixel Device (tether+ debug)
+	4ee5  Nexus/Pixel Device (PTP)
+	4ee6  Nexus/Pixel Device (PTP + debug)
+	4ee7  Nexus/Pixel Device (charging + debug)
+	4ee8  Nexus/Pixel Device (MIDI)
+	4ee9  Nexus/Pixel Device (MIDI + debug)
+	5033  Pixel earbuds
+	7102  Toshiba Thrive tablet
+	b004  Pandigital / B&N Novel 9" tablet
+	d001  Nexus 4 (fastboot)
+	d002  Nexus 4 (debug)
+	d00d  Xiaomi Mi/Redmi 2 (fastboot)
+	d109  LG G2x MTP
+	d10a  LG G2x MTP (debug)
+18d5  Starline International Group Limited
 18d9  Kaba
-	01xy  LEGIC advant desktop reader
+	01a0  B-Net 91 07
+18dc  LKC Technologies, Inc.
+18dd  Planon System Solutions Inc.
+	1000  DocuPen RC800
+18e3  Fitipower Integrated Technology Inc
+	7102  Multi Card Reader (Internal)
+	9101  All-in-1 Card Reader
+	9102  Multi Card Reader
+	9512  Webcam
+18e8  Qcom
+	6144  LR802UA 802.11b Wireless Adapter [ALi M4301AU]
+	6196  RT2573
+	6229  RT2573
+	6232  Wireless 802.11g 54Mbps Network Adapter [RTL8187]
+18ea  Matrox Graphics, Inc.
+	0002  DualHead2Go [Analog Edition]
+	0004  TripleHead2Go [Digital Edition]
+18ec  Arkmicro Technologies Inc.
+	3118  USB to IrDA adapter [ARK3116T]
+	3188  ARK3188 UVC Webcam
+	3299  Webcam Carrefour
+	3366  Bresser Biolux NV
+	5850  CVBS / S-Video Capture Device [UVC]
+18ef  ELV Elektronik AG
+	e014  FS20PCE
+	e015  FS20PCS
+	e01a  Bedien-Anzeige-Terminal
+18f8  [Maxxter]
+	0f97  Optical Gaming Mouse [Xtrem]
+	0f99  Optical gaming mouse
+	1142  Optical gaming mouse
+	1486  X5s ZEUS Macro Pro Gaming Mouse
+18fb  Scriptel Corporation
+	01c0  ST1501-STN
+	01c1  ST1526-STN
+	01c2  ST1501-PYJ
+	01c3  ST1501B-PYJ
+	01c4  ST1501-PUN
+	01c5  ST1401-STN
+	01c7  ST1526-PYJ
+	01c8  ST1501-ECA
+	01c9  ST1476-STN
+	01cb  ST1571-STN
+	0200  ST1500
+	0201  ST1550
+	0202  ST1525
+	0204  ST1400
+	0206  ST1475
+	0207  ST1570
+18fd  FineArch Inc.
+1901  GE Healthcare
+	0015  Nemo Tracker
+1908  GEMBIRD
+	0102  Digital Photo Frame
+	0226  MicroSD Card Reader/Writer
+	1315  Digital Photo Frame
+	1320  DM8261 Flashdisc
+	2070  Honk HK-5002 USB Speaker
+	2220  Buildwin Media-Player
+	2311  Generic UVC 1.00 camera [AppoTech AX2311]
+190d  Motorola GSG
+1914  Alco Digital Devices Limited
+1915  Nordic Semiconductor ASA
+	000c  Wireless Desktop nRF24L01 CX-1766
+	0101  HP Prime Wireless Kit [FOK65AA] (Flash mode)
+	2233  Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505]
+	2234  Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886]
+	2235  Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886]
+	2236  Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3]
+	7777  Bitcraze Crazyradio (PA) dongle
+191c  Innovative Technology LTD
+	4104  Banknote validator NV-150
+1923  FitLinxx
+	0002  Personal SyncPoint
+1926  NextWindow
+	0003  1900 HID Touchscreen
+	0006  1950 HID Touchscreen
+	0064  1950 HID Touchscreen
+	0065  1950 HID Touchscreen
+	0066  1950 HID Touchscreen
+	0067  1950 HID Touchscreen
+	0068  1950 HID Touchscreen
+	0069  1950 HID Touchscreen
+	0071  1950 HID Touchscreen
+	0072  1950 HID Touchscreen
+	0073  1950 HID Touchscreen
+	0074  1950 HID Touchscreen
+	0075  1950 HID Touchscreen
+	0076  1950 HID Touchscreen
+	0077  1950 HID Touchscreen
+	0078  1950 HID Touchscreen
+	0079  1950 HID Touchscreen
+	007a  1950 HID Touchscreen
+	007e  1950 HID Touchscreen
+	007f  1950 HID Touchscreen
+	0080  1950 HID Touchscreen
+	0081  1950 HID Touchscreen
+	0082  1950 HID Touchscreen
+	0083  1950 HID Touchscreen
+	0084  1950 HID Touchscreen
+	0085  1950 HID Touchscreen
+	0086  1950 HID Touchscreen
+	0087  1950 HID Touchscreen
+	0dbf  HID Touchscreen
+	0dc2  HID Touchscreen
+1928  Proceq SA
+	0400  Equotip Piccolo
+192f  Avago Technologies, Pte.
+	0000  Mouse
+	0416  ADNS-5700 Optical Mouse Controller (3-button)
+	0616  ADNS-5700 Optical Mouse Controller (5-button)
+	0916  ADNS-2710 Optical Mouse Controller
+1930  Shenzhen Xianhe Technology Co., Ltd.
+1931  Ningbo Broad Telecommunication Co., Ltd.
+1934  Feature Integration Technology Inc. (Fintek)
+	0602  F71610 or F71612 Consumer Infrared Receiver/Transceiver
+	0702  Integrated Consumer Infrared Receiver/Transceiver
+	5168  F71610A or F71612A Consumer Infrared Receiver/Transceiver
+1935  Elektron Music Machines
+	000d  Elektron Digitakt
+1938  Meinberg Funkuhren GmbH & Co. KG
+	0501  TCR51USB IRIG Time Code Reader
+	0502  TCR600USB IRIG Time Code Reader
+1941  Dream Link
+	8021  WH1080 Weather Station / USB Missile Launcher
+1943  Sensoray Co., Inc.
+	2250  Model 2250 MPEG and JPEG Capture Card
+	2253  Model 2253 Audio/Video Codec Card
+	2255  Model 2255 4 Channel Capture Card
+	2257  Model 2257 4 Channel Capture Card
+	2263  Model 2263 UVC HD Audio/Video Codec Card
+	a250  Model 2250 MPEG and JPEG Capture Card (cold)
+	a253  Model 2253 Audio/Video Codec Card (cold)
+1949  Lab126, Inc.
+	0002  Amazon Kindle
+	0004  Amazon Kindle 3/4/Paperwhite
+	0006  Amazon Kindle Fire
+	0008  Amazon Kindle Fire HD 8.9"
+	000a  Amazon Kindle Fire 2nd generation (2012)
+	0331  Kindle Fire HD 8 (2018)
+	0417  Amazon Zukey; clone of Yubikey 4 OTP+U2F
+	0800  Fire Phone
+194f  PreSonus Audio Electronics, Inc.
+	0101  AudioBox 22 VSL
+	0102  AudioBox 44 VSL
+	0103  AudioBox 1818 VSL
+	0201  FaderPort
+	0301  AudioBox
+1951  Hyperstone AG
+1953  Ironkey Inc.
+	0202  S200 2GB Rev. 1
+1954  Radiient Technologies
+195d  Itron Technology iONE
+	2030  Func KB-460 Gaming Keyboard
+	7002  Libra-Q11 IR remote
+	7006  Libra-Q26 / 1.0 Remote
+	7777  Scorpius wireless keyboard
+	7779  Scorpius-P20MT
+1963  IK Multimedia
+	0005  iRig KEYS
+	0046  UNO Synth
+1965  Uniden Corporation
+	0016  HomePatrol-1
+	0018  UBC125XLT
+	001a  BCD436HP Scanner
+1967  CASIO HITACHI Mobile Communications Co., Ltd.
+196b  Wispro Technology Inc.
+1970  Dane-Elec Corp. USA
+	0000  Z Mate 16GB
+1973  Spectralink Corporation
+	0002  Pivot recovery
+	0003  Pivot Media Transfer Protocol
+	0004  Pivot Media Transfer Protocol
+1975  Dongguan Guneetal Wire & Cable Co., Ltd.
+1976  Chipsbrand Microelectronics (HK) Co., Ltd.
+	1307  microSD Card Reader
+	6025  CBM2090 Flash Drive
 1977  T-Logic
 	0111  TL203 MP3 Player and Voice Recorder
+197d  Leuze electronic
+	0222  BCL 508i
+1980  Storage Appliance Corporation
+	0808  Clickfree C2 Slimline (527SE)
+1989  Nuconn Technology Corp.
+198f  Beceem Communications Inc.
+	0210  BCS200 WiMAX Adapter
+	0220  BCSM250 WiMAX Adapter
+1990  Acron Precision Industrial Co., Ltd.
 1995  Trillium Technology Pty. Ltd.
 	3202  REC-ADPT-USB (recorder)
 	3203  REC-A-ADPT-USB (recorder)
+1996  PixeLINK
+	3010  Camera Release 4
+	3011  OEM Camera
+	3012  e-ImageData Corp. ScanPro
+1997  Shenzhen Riitek Technology Co., Ltd
+	0409  wireless mini keyboard with touchpad
+	2433  wireless mini keyboard with touchpad
+199b  MicroStrain, Inc.
+	3065  3DM-GX3-25 Orientation Sensor
+199e  The Imaging Source Europe GmbH
+	8101  DFx 21BU04 Camera
+	8457  DFK AFU130-L53 camera
+199f  Benica Corporation
+19a5  HARRIS Corp.
+	0004  Remote NDIS Network Device
+	0012  RF-7800S Secure Personal Radio
+	0401  Mass Storage Device
+	0402  Falcon III RF-7800V family RNDIS
+19a8  Biforst Technology Inc.
+19ab  Bodelin
+	1000  ProScope HR
+19af  S Life
+	6611  Celestia VoIP Phone
+19b2  Batronix
+	0010  BX32 Batupo
+	0011  BX32P Barlino
+	0012  BX40 Bagero
+	0013  BX48 Batego
+19b4  Celestron
+	0002  SkyScout Personal Planetarium
+	0101  Handheld Digital Microscope 44302
+19b5  B & W Group
+19b6  Infotech Logistic, LLC
+19b9  Data Robotics
+	4b10  Drobo
+	8d20  Drobo Elite
+19c2  Futuba
+	6a11  MDM166A Fluorescent Display
+19ca  Mindtribe
+	0001  Sandio 3D HID Mouse
+19cf  Parrot SA
+	0001  MiniKit Slim handsfree car kit in firmware update mode
+19d1  BYD
+19d2  ZTE WCDMA Technologies MSM
+	0001  CDMA Wireless Modem
+	0002  MF632/ONDA ET502HS/MT505UP
+	0007  TU25 WiMAX Adapter [Beceem BCS200]
+	0017  MF669
+	0031  MF110/MF627/MF636
+	0037  ONDA MC503HSA
+	0039  MF100
+	0063  K3565-Z HSDPA
+	0064  MF627 AU
+	0083  MF190
+	0103  MF112
+	0104  K4505-Z
+	0117  MF667
+	0146  MF 195E (HSPA+ Modem)
+	0167  MF820 4G LTE
+	0172  AX226 WIMAX MODEM (After Modeswitch)
+	0325  LTE4G O2 ZTE MF821D LTE/UMTS/GSM Modem/Networkcard
+	0326  LTE4G O2 ZTE MF821D LTE/UMTS/GSM Modem/Networkcard
+	0501  Lever Cell Phone Model Z936L
+	1001  K3805-Z vodafone WCDMA/GSM Modem - storage mode (made by ZTE)
+	1002  K3805-Z vodafone WCDMA/GSM Modem/Networkcard (made by ZTE)
+	1008  K3570-Z
+	1010  K3571-Z
+	1017  K5006-Z vodafone LTE/UMTS/GSM Modem/Networkcard
+	1018  K5006-Z vodafone LTE/UMTS/GSM Modem/Networkcard
+	1203  MF691 [ T-Mobile webConnect Rocket 2.0]
+	1217  MF652
+	1218  MF652
+	1270  MF667
+	2000  MF627/MF628/MF628+/MF636+ HSDPA/HSUPA
+	fff2  Gobi Wireless Modem (QDL mode)
+	fff3  Gobi Wireless Modem
+19db  KFI Printers
+	02f1  NAUT324C
+19e1  WeiDuan Electronic Accessory (S.Z.) Co., Ltd.
+19e8  Industrial Technology Research Institute
+19ef  Pak Heng Technology (Shenzhen) Co., Ltd.
+19f7  RODE Microphones
+	0001  Podcaster
+19fa  Gampaq Co.Ltd
+	0607  GAME CONTROLLER
+	0703  Steering Wheel
+19fd  MTI Instruments Inc.
+19ff  Dynex
+	0102  1.3MP Webcam
+	0201  Rocketfish Wireless 2.4G Laser Mouse
+	0220  RF-HDWEBLT RocketFish HD WebCam
+	0238  DX-WRM1401 Mouse
+	0239  Bluetooth 4.0 Adapter [Broadcom, 1.12, BCM20702A0]
+1a08  Bellwood International, Inc.
+1a0a  USB-IF non-workshop
+	badd  USB OTG Compliance test device
+1a12  KES Co., Ltd.
+1a1d  Veho
+	0407  Mimi WiFi speakers
+1a25  Amphenol East Asia Ltd.
+1a2a  Seagate Branded Solutions
+1a2c  China Resource Semico Co., Ltd
+	0021  Keyboard
+	0024  Multimedia Keyboard
+	2124  Keyboard
+	2d23  Keyboard
+	427c  Backlit Keyboard [Cougar Vantar]
+1a32  Quanta Microsystems, Inc.
+	0304  802.11n Wireless LAN Card
+1a34  ACRUX
+	0802  Gamepad
+1a36  Biwin Technology Ltd.
+1a40  Terminus Technology Inc.
+	0101  Hub
+	0201  FE 2.1 7-port Hub
+1a41  Action Electronics Co., Ltd.
+1a44  VASCO Data Security International
+	0001  Digipass 905 SmartCard Reader
+1a4a  Silicon Image
+1a4b  SafeBoot International B.V.
+1a5a  Tandberg Data
+1a61  Abbott Diabetes Care
+	3410  CoPilot System Cable
+	3650  FreeStyle Libre
+	3850  FreeStyle Optium/Precision Neo
+	3950  FreeStyle Libre 2
+1a64  Mastervolt
+	0000  MasterBus Link
+1a6a  Spansion Inc.
+1a6d  SamYoung Electronics Co., Ltd
+1a6e  Global Unichip Corp.
+1a6f  Sagem Orga GmbH
+1a72  Physik Instrumente
+	1008  E-861 PiezoWalk NEXACT Controller
+1a79  Bayer Health Care LLC
+	6002  Contour
+	6210  Contour Next Link 2.4 glucometer
+	6300  Contour next link
+	7410  Contour Next
+	7800  Contour Plus One
+1a7b  Lumberg Connect  GmbH & Co. KG
+1a7c  Evoluent
+	0068  VerticalMouse 3
+	0168  VerticalMouse 3 Wireless
+	0191  VerticalMouse 4
+	0195  VerticalMouse C Wireless
+1a7e  Meltec Systementwicklung
+	1001  UFT75, UT150, UT60
+	1003  Thermostick
+1a81  Holtek Semiconductor, Inc.
+	1004  Wireless Dongle 2.4 GHZ HT82D40REW
+	1701  Wireless dongle
+	2004  Keyboard
+	2203  Laser Gaming mouse
+	2204  Optical Mouse
+	2205  Laser Mouse
+	4001  Keyboard
+1a86  QinHeng Electronics
+	5512  CH341 in EPP/MEM/I2C mode, EPP/I2C adapter
+	5523  CH341 in serial mode, usb to serial port converter
+	5584  CH341 in parallel mode, usb to printer port converter
+	7523  CH340 serial converter
+	752d  CH345 MIDI adapter
+	7584  CH340S
+	e008  HID-based serial adapater
+1a89  Dynalith Systems Co., Ltd.
+1a8b  SGS Taiwan Ltd.
+1a8d  BandRich, Inc.
+	1002  BandLuxe 3.5G HSDPA Adapter
+	1009  BandLuxe 3.5G HSPA Adapter
+	100d  4G LTE adapter
+1a98  Leica Camera AG
+1aa4  Data Drive Thru, Inc.
+1aa5  UBeacon Technologies, Inc.
+1aa6  eFortune Technology Corp.
+1aab  Silvercreations Software AG
+	7736  sceye (Gen 2)
+	7737  sceye (Gen 3)
+	7738  sceye (Gen 4, 3 Mpix)
+	7750  sceyeS (Gen 5, 5 MPix)
+1aad  KeeTouch
+	0001  Touchscreen
+1ab1  Rigol Technologies
+	04b0  DS6000 SERIES
+	04be  DS4000 SERIES
+	04ce  DS1xx4Z/MSO1xxZ series
+	0588  DS1000 SERIES
+1ab2  Allied Vision
+	0001  Vision device
+1acb  Salcomp Plc
+1acc  Midiplus Co, Ltd.
+	0103  AudioLink plus 4x4 2.9.28
+1ad1  Desay Wire Co., Ltd.
+1ad4  APS
+	0002  KM290-HRS
+1adb  Schweitzer Engineering Laboratories, Inc
+	0001  C662 Serial Cable
+	0003  CDC Ethernet Gadget
+1ae4  ic-design Reinhard Gottinger GmbH
+1ae7  X-TENSIONS
+	0381  VS-DVB-T 380U (af9015 based)
+	0525  X-Tensions ISDN TA XC-525 [HFC-S USB]
+	2001  SpeedLink Snappy Mic webcam (SL-6825-SBK)
+	9003  SpeedLink Vicious And Devine Laplace webcam, white (VD-1504-SWT)
+	9004  SpeedLink Vicious And Devine Laplace webcam, black (VD-1504-SBK)
+1aed  High Top Precision Electronic Co., Ltd.
+1aef  Conntech Electronic (Suzhou) Corporation
+1af1  Connect One Ltd.
+1af3  Kingsis Technology Corporation
+	0001  ZOWIE Gaming mouse
+1afe  A. Eberle GmbH & Co. KG
+	0001  PQ Box 100
+1b04  Meilhaus Electronic GmbH
+	0630  ME-630
+	0940  ME-94
+	0950  ME-95
+	0960  ME-96
+	1000  ME-1000
+	100a  ME-1000
+	100b  ME-1000
+	1400  ME-1400
+	140a  ME-1400A
+	140b  ME-1400B
+	140c  ME-1400C
+	140d  ME-1400D
+	140e  ME-1400E
+	14ea  ME-1400EA
+	14eb  ME-1400EB
+	1604  ME-1600/4U
+	1608  ME-1600/8U
+	160c  ME-1600/12U
+	160f  ME-1600/16U
+	168f  ME-1600/16U8I
+	4610  ME-4610
+	4650  ME-4650
+	4660  ME-4660
+	4661  ME-4660I
+	4662  ME-4660
+	4663  ME-4660I
+	4670  ME-4670
+	4671  ME-4670I
+	4672  ME-4670S
+	4673  ME-4670IS
+	4680  ME-4680
+	4681  ME-4680I
+	4682  ME-4680S
+	4683  ME-4680IS
+	6004  ME-6000/4
+	6008  ME-6000/8
+	600f  ME-6000/16
+	6014  ME-6000I/4
+	6018  ME-6000I/8
+	601f  ME-6000I/16
+	6034  ME-6000ISLE/4
+	6038  ME-6000ISLE/8
+	603f  ME-6000ISLE/16
+	6044  ME-6000/4/DIO
+	6048  ME-6000/8/DIO
+	604f  ME-6000/16/DIO
+	6054  ME-6000I/4/DIO
+	6058  ME-6000I/8/DIO
+	605f  ME-6000I/16/DIO
+	6074  ME-6000ISLE/4/DIO
+	6078  ME-6000ISLE/8/DIO
+	607f  ME-6000ISLE/16/DIO
+	6104  ME-6100/4
+	6108  ME-6100/8
+	610f  ME-6100/16
+	6114  ME-6100I/4
+	6118  ME-6100I/8
+	611f  ME-6100I/16
+	6134  ME-6100ISLE/4
+	6138  ME-6100ISLE/8
+	613f  ME-6100ISLE/16
+	6144  ME-6100/4/DIO
+	6148  ME-6100/8/DIO
+	614f  ME-6100/16/DIO
+	6154  ME-6100I/4/DIO
+	6158  ME-6100I/8/DIO
+	615f  ME-6100I/16/DIO
+	6174  ME-6100ISLE/4/DIO
+	6178  ME-6100ISLE/8/DIO
+	617f  ME-6100ISLE/16/DIO
+	6259  ME-6200I/9/DIO
+	6359  ME-6300I/9/DIO
+	810a  ME-8100A
+	810b  ME-8100B
+	820a  ME-8200A
+	820b  ME-8200B
+1b0e  BLUTRONICS S.r.l.
+	1078  BLUDRIVE II CCID
+	1079  BLUDRIVE II CCID
+	1080  WRITECHIP II CCID
+1b12  Eventide
+	0011  ModFactor
+1b1c  Corsair
+	0890  Flash Padlock
+	0a00  SP2500 Speakers
+	0a60  Vengeance K60 Keyboard
+	0c04  Link Cooling Node
+	0c06  RM-Series C-Link Adapter
+	0c0a  Hydro Series H115i Liquid CPU Cooler
+	0c0b  Lighting Node Pro
+	0c0c  Lighting Node Loader
+	0c22  iCUE H150i RGB PRO XT Liquid CPU Cooler
+	1a01  Flash Voyager GT
+	1a03  Voyager 3.0
+	1a09  Voyager GT 3.0
+	1a0a  Survivor Stealth Flash Drive
+	1a0b  Flash Voyager LS
+	1a0e  Voyager GTX
+	1a14  Voyager Vega
+	1a15  Voyager Slider Flash Drive
+	1a90  Flash Voyager GT
+	1ab1  Voyager
+	1b04  Raptor K50 Keyboard
+	1b07  Vengeance K65 Gaming Keyboard
+	1b08  Vengeance K95 Keyboard
+	1b09  Vengeance K70R keyboard
+	1b11  K95 RGB Mechanical Gaming Keyboard
+	1b13  Vengeance K70RGB keyboard
+	1b20  STRAFE RGB Gaming Keyboard
+	1b2d  K95 RGB Platinum Keyboard [RGP0056]
+	1b2e  Corsair Corsair Gaming M65 Pro RGB Mouse
+	1b2f  Sabre RGB [CH-9303011-XX]
+	1b3d  Corsair Corsair Gaming K55 RGB Keyboard
+	1b5e  Harpoon Wireless Mouse
+	1b65  Harpoon Wireless Dongle
+	1c00  Controller for Corsair Link
+	1c02  AX1500i Power Supply
+	1c05  HX750i Power Supply
+	1c07  HX1000i Power Supply
+	1c08  HX1200i Power Supply
+	1c0b  RM750i Power Supply
+	1c0c  RM850i Power Supply
+	1c1a  Corsair CORSAIR Lighting Node CORE
+1b1e  General Imaging / General Electric
+	1003  A1250
+1b1f  eQ-3 Entwicklung GmbH
+	c00f  HM-CFG-USB/HM-CFG-USB-2 [HomeMatic Configuration adapter]
+	c020  HmIP-RFUSB
+1b20  MStar Semiconductor, Inc.
+1b22  WiLinx Corp.
+1b24  Telegent Systems, Inc.
+	4001  TLG2300 Hybrid TV Device
+1b26  Cellex Power Products, Inc.
+1b27  Current Electronics Inc.
+1b28  NAVIsis Inc.
+1b32  Ugobe Life Forms, Inc.
+	0064  Pleo robotic dinosaur
+1b36  ViXS Systems, Inc.
+1b3b  iPassion Technology Inc.
+	2933  PC Camera/Webcam controller
+	2935  PC Camera/Webcam controller
+	2936  PC Camera/Webcam controller
+	2937  PC Camera/Webcam controller
+	2938  PC Camera/Webcam controller
+	2939  PC Camera/Webcam controller
+	2950  PC Camera/Webcam controller
+	2951  PC Camera/Webcam controller
+	2952  PC Camera/Webcam controller
+	2953  PC Camera/Webcam controller
+	2955  PC Camera/Webcam controller
+	2956  PC Camera/Webcam controller
+	2957  PC Camera/Webcam controller
+	2958  PC Camera/Webcam controller
+	2959  PC Camera/Webcam controller
+	2960  PC Camera/Webcam controller
+	2961  PC Camera/Webcam controller
+	2962  PC Camera/Webcam controller
+	2963  PC Camera/Webcam controller
+	2965  PC Camera/Webcam controller
+	2966  PC Camera/Webcam controller
+	2967  PC Camera/Webcam controller
+	2968  PC Camera/Webcam controller
+	2969  PC Camera/Webcam controller
+1b3f  Generalplus Technology Inc.
+	0c52  808 Camera #9 (mass storage mode)
+	2002  808 Camera #9 (web-cam mode)
+	2003  GPD6000 [Digital MP3 Player]
+1b47  Energizer Holdings, Inc.
+	0001  CHUSB Duo Charger (NiMH AA/AAA USB smart charger)
+1b48  Plastron Precision Co., Ltd.
+1b52  ARH Inc.
+	2101  FXMC Neural Network Controller
+	2102  FXMC Neural Network Controller V2
+	2103  FXMC Neural Network Controller V3
+	4101  Passport Reader CLR device
+	4201  Passport Reader PRM device
+	4202  Passport Reader PRM extension device
+	4203  Passport Reader PRM DSP device
+	4204  Passport Reader PRMC device
+	4205  Passport Reader CSHR device
+	4206  Passport Reader PRMC V2 device
+	4301  Passport Reader MRZ device
+	4302  Passport Reader MRZ DSP device
+	4303  Passport Reader CSLR device
+	4401  Card Reader
+	4501  Passport Reader RFID device
+	4502  Passport Reader RFID AIG device
+	6101  Neural Network Controller
+	6202  Fingerprint Reader device
+	6203  Fingerprint Scanner device
+	8101  Camera V1
+	8102  Recovery / Camera V2
+	8103  Camera V3
+1b59  K.S. Terminals Inc.
+1b5a  Chao Zhou Kai Yuan Electric Co., Ltd.
+1b65  The Hong Kong Standards and Testing Centre Ltd.
+1b71  Fushicai
+	0050  Encore ENUTV-4 Analog TV Tuner
+	3002  USBTV007 Video Grabber [EasyCAP]
+1b72  ATERGI TECHNOLOGY CO., LTD.
+1b73  Fresco Logic
+	1000  xHC1 Controller
+1b75  Ovislink Corp.
+	3072  AirLive WN-360USB adapter
+	8171  WN-370USB 802.11bgn Wireless Adapter [Realtek RTL8188SU]
+	8187  AirLive WL-1600USB 802.11g Adapter [Realtek RTL8187L]
+	9170  AirLive X.USB 802.11abgn [Atheros AR9170+AR9104]
+	a200  AirLive WN-200USB wireless 11b/g/n dongle
+1b76  Legend Silicon Corp.
+1b80  Afatech
+	c810  MC810 [af9015]
+	d393  DVB-T receiver [RTL2832U]
+	d396  UB396-T [RTL2832U]
+	d397  DVB-T receiver [RTL2832U]
+	d398  DVB-T receiver [RTL2832U]
+	d700  FM Radio SnapMusic Mobile 700 (FM700)
+	e297  Conceptronic DVB-T CTVDIGRCU V3.0
+	e302  CVBS / S-Video Capture Device [Pinnacle Dazzle / UB315-E]
+	e34c  UB435-Q ATSC TV Stick
+	e383  DVB-T UB383-T [af9015]
+	e385  DVB-T UB385-T [af9015]
+	e386  DVB-T UB385-T [af9015]
+	e399  DVB-T KWorld PlusTV 399U [af9015]
+	e39a  DVB-T395U [af9015]
+	e39b  DVB-T395U [af9015]
+	e401  Sveon STV22 DVB-T [af9015]
+	e409  IT9137FN Dual DVB-T [KWorld UB499-2T]
+1b86  Dongguan Guanshang Electronics Co., Ltd.
+1b88  ShenMing Electron (Dong Guan) Co., Ltd.
+1b8c  Altium Limited
+1b8d  e-MOVE Technology Co., Ltd.
+1b8e  Amlogic, Inc.
+1b8f  MA LABS, Inc.
+1b96  N-Trig
+	0001  Duosense Transparent Electromagnetic Digitizer
+1b98  YMax Communications Corp.
+1b99  Shenzhen Yuanchuan Electronic
+1ba1  JINQ CHERN ENTERPRISE CO., LTD.
+1ba2  Lite Metals & Plastic (Shenzhen) Co., Ltd.
+1ba4  Ember Corporation
+	0001  InSight USB Link
+	0002  EM358 Virtual COM Port
+1ba6  Abilis Systems
+1ba8  China Telecommunication Technology Labs
+1bad  Harmonix Music
+	0002  Rock Band Guitar for Xbox 360
+	0003  Rock Band Drum Kit for Xbox 360
+	0130  Ion Drum Rocker for Xbox 360
+	028e  Controller
+	3330  Rock Band 3 Keyboard wii interface
+	f016  Controller
+	f018  Street Fighter IV SE FightStick for Xbox 360
+	f019  BrawlStick for Xbox 360
+	f021  Ghost Recon Future Soldier Gamepad for Xbox 360
+	f023  MLG Pro Circuit Controller for Xbox 360
+	f025  Call of Duty Controller for Xbox 360
+	f027  FPS Pro Controller for Xbox 360
+	f028  Street Fighter IV FightPad for Xbox 360
+	f02e  FightPad
+	f030  MC2 MicroCON Racing Wheel for Xbox 360
+	f036  MicroCON Gamepad Pro for Xbox 360
+	f038  Street Fighter IV FightStick TE for Xbox 360
+	f039  Marvel VS Capcom 2 Tournament Stick for Xbox 360
+	f03a  Street Fighter X Tekken FightStick Pro for Xbox 360
+	f03d  Street Fighter IV Arcade Stick TE for Xbox 360
+	f03e  MLG Arcade FightStick TE for Xbox 360
+	f03f  Soulcalibur FightStick for Xbox 360
+	f042  Arcade FightStick TE S+ for Xbox 360
+	f080  FightStick TE2 for Xbox 360
+	f501  Horipad EX2 Turbo for Xbox 360
+	f502  Real Arcade Pro.VX SA for Xbox 360
+	f503  Fighting Stick VX for Xbox 360
+	f504  Real Arcade Pro.EX
+	f505  Fighting Stick EX2B for Xbox 360
+	f506  Real Arcade Pro.EX Premium VLX for Xbox 360
+	f900  Controller
+	f901  GameStop Controller
+	f903  Tron Controller for Xbox 360
+	f904  PDP Versus Fighting Pad for Xbox 360
+	f906  Mortal Kombat FightStick for Xbox 360
+	f907  Afterglow Gamepad
+	fa01  Gamepad
+	fd00  Razer Onza Tournament Edition
+	fd01  Razer Onza Classic Edition
+1bae  Vuzix Corporation
+	0002  VR920 Immersive Eyewear
+1bbb  T & A Mobile Phones
+	0003  Alcatel one touch 4030D modem connection
+	0017  HSPA Data Card
+	007a  Alcatel OneTouch (firmware upgrade mode)
+	011e  Alcatel One Touch L100V / Telekom Speedstick LTE II
+	0169  Alcatel ONE TOUCH Fierce
+	0195  Alcatel OneTouch L850V / Telekom Speedstick LTE
+	a00e  Vodafone Smart Tab 4G
+	f000  Alcatel OneTouch (mass storage mode)
+	f017  Alcatel One Touch L100V / Telekom Speedstick LTE II
+1bbd  Videology Imaging Solutions, Inc.
+	0060  1.3MP Mono Camera
+	0066  1.3MP Mono Camera
+	0067  1.3MP Mono Camera
+1bc0  Beijing Senseshield Technology Co.,Ltd.
+	0013  Elitee-e
+	0014  Elite4
+	0020  iToken
+	0021  Mikey
+	0051  Elite5
+	0055  Elite5 v3.x
+	485d  EliteIV
+1bc4  Ford Motor Co.
+1bc5  AVIXE Technology (China) Ltd.
+1bc7  Telit Wireless Solutions
+	0020  HE863
+	0021  HE910
+	0022  GE910-QUAD
+	0023  HE910-D ECM
+	0032  LE910-EU V2
+	1003  UC864-E
+	1004  UC864-G
+	1005  CC864-DUAL
+	1006  CC864-SINGLE
+	1010  DE910-DUAL
+	1011  CE910-DUAL
+	1012  UE910 V2
+	1101  ME910C1
+	110a  ME310
+	1200  LE920 (old firmware)
+	1201  LE910 / LE920
+1bce  Contac Cable Industrial Limited
+1bcf  Sunplus Innovation Technology Inc.
+	0005  Optical Mouse
+	0007  Optical Mouse
+	053a  Targa Silvercrest OMC807-C optische Funkmaus
+	05c5  SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver]
+	05cf  Micro keyboard & mouse receiver
+	08a0  Gaming mouse [Philips SPK9304]
+	0c31  SPIF30x Serial-ATA bridge
+	2281  SPCA2281 Web Camera
+	2880  Dell HD Webcam
+	2883  Asus Webcam
+	2885  ASUS Webcam
+	2888  HP Universal Camera
+	2895  Dell Integrated Webcam
+	28a2  Dell Integrated Webcam
+	28a6  DELL XPS Integrated Webcam
+	28ae  Laptop Integrated Webcam HD
+	28bd  Dell Integrated HD Webcam
+	2985  Laptop Integrated Webcam HD
+	2b83  Laptop Integrated Webcam FHD
+	2b91  Dell E5570 integrated webcam
+	2b97  Laptop Integrated Webcam FHD
+	2c6e  Laptop Integrated WebCam HD
+1bd0  Hangzhou Riyue Electronic Co., Ltd.
+1bd5  BG Systems, Inc.
+1bda  University Of Southampton
+	0010  Power Board v4 Rev B
+	0011  Student Robotics SBv4B
+1bde  P-TWO INDUSTRIES, INC.
+1bef  Shenzhen Tongyuan Network-Communication Cables Co., Ltd
+1bf0  RealVision Inc.
+1bf5  Extranet Systems Inc.
+1bf6  Orient Semiconductor Electronics, Ltd.
+1bfd  TouchPack
+	1268  Touch Screen
+	1368  Touch Screen
+	1568  Capacitive Touch Screen
+	1668  IR Touch Screen
+	1688  Resistive Touch Screen
+	2968  Touch Screen
+	5968  Touch Screen
+	6968  Touch Screen
+1c02  Kreton Corporation
+1c04  QNAP System Inc.
+	2074  ASM1074 High-Speed hub
+	3074  ASM1074 SuperSpeed hub
+1c05  Shenxhen Stager Electric
+	ea75  G540 Programmer
+1c0c  Ionics EMS, Inc.
+	0102  Plug Computer
+1c0d  Relm Wireless
+1c10  Lanterra Industrial Co., Ltd.
+1c11  Input Club Inc.
+	b04d  ErgoDox Infinity
+1c13  ALECTRONIC LIMITED
+1c1a  Datel Electronics Ltd.
+	0100  Action Replay DS "3DS/DSi/DS/Lite Compatible"
+1c1b  Volkswagen of America, Inc.
+1c1f  Goldvish S.A.
+1c20  Fuji Electric Device Technology Co., Ltd.
+1c21  ADDMM LLC
+1c22  ZHONGSHAN CHIANG YU ELECTRIC CO., LTD.
+1c26  Shanghai Haiying Electronics Co., Ltd.
+1c27  HuiYang D & S Cable Co., Ltd.
+1c28  PMD Technologies
+	c003  CamCube
+	c004  CamBoard
+	c005  ConceptCam
+	c006  CamBoard 22
+	c007  CamBoard nano
+	c008  CamBoard mod
+	c009  CamBoard plus
+	c00a  DigiCam
+	c00d  CamBoard pico LDD
+	c00f  CamBoard pico
+1c29  Elster GmbH
+	0001  ExMFE5 Simulator
+	10fc  enCore device
+1c31  LS Cable Ltd.
+1c34  SpringCard
+	7241  Prox'N'Roll RFID Scanner
+1c37  Authorizer Technologies, Inc.
+	6190  U2F Fido-compliant cryptotoken
+1c3d  NONIN MEDICAL INC.
+1c3e  Wep Peripherals
+1c40  EZPrototypes
+	0533  TiltStick
+	0534  i2c-tiny-usb interface
+	0535  glcd2usb interface
+	0536  Swiss ColorPAL
+	0537  MIST Board
+1c49  Cherng Weei Technology Corp.
+1c4b  Geratherm Medical AG
+	026f  Spirostik
+1c4f  SiGma Micro
+	0002  Keyboard TRACER Gamma Ivory
+	0003  HID controller
+	000e  Genius KB-120 Keyboard
+	0026  Keyboard
+	0032  Optical Mouse with Scroll Wheel
+	0034  XM102K Optical Wheel Mouse
+	0063  Touchpad (integrated in detachable keyboard of Chuwi SurBook)
+	0065  Optical Wheel Mouse [Rapoo N1130]
+	3000  Micro USB Web Camera
+	3002  WebCam SiGma Micro
+1c57  Zalman Tech Co., Ltd.
+	1e45  FPSGUN FG1000 Mouse
+1c6b  Philips & Lite-ON Digital Solutions Corporation
+	a220  DVD Writer Slimtype eSAU108
+	a222  DVD Writer Slimtype eTAU108
+	a223  DVD Writer Slimtype eUAU108
+1c6c  Skydigital Inc.
+1c71  Humanware Inc
+	c004  Braille Note Apex (braille terminal mode)
+1c73  AMT
+	861f  Anysee E30 USB 2.0 DVB-T Receiver
+1c75  Arturia
+	0288  KeyStep
+1c77  Kaetat Industrial Co., Ltd.
+1c78  Datascope Corp.
+1c79  Unigen Corporation
+1c7a  LighTuning Technology Inc.
+	0577  Fingerprint Sensor
+	0603  ES603 Swipe Fingerprint Sensor
+	0801  Fingerprint Reader
+1c7b  LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD.
+1c82  Atracsys
+	0200  spryTrac
+1c83  Schomaecker GmbH
+	0001  RS150 V2
+	0002  RFID card reader
+	0003  Communicator
+	0005  Mobile RFID Reader
 1c87  2N TELEKOMUNIKACE a.s.
+1c88  Somagic, Inc.
+	0007  SMI Grabber (EasyCAP DC60+ clone) (no firmware) [SMI-2021CBE]
+	003c  SMI Grabber (EasyCAP DC60+ clone) [SMI-2021CBE]
+1c89  HONGKONG WEIDIDA ELECTRON LIMITED
+1c8e  ASTRON INTERNATIONAL CORP.
+1c98  ALPINE ELECTRONICS, INC.
+1c9e  OMEGA TECHNOLOGY
+	6061  WL-72B 3.5G MODEM
+1ca0  ACCARIO Inc.
+1ca1  Symwave
+	18ab  SATA bridge
+1cac  Kinstone
+	a332  C8 Webcam
+	b288  C18 Webcam
+1cb3  Aces Electronic Co., Ltd.
+1cb4  OPEX CORPORATION
+1cb6  IdeaCom Technology Inc.
+	6681  IDC6681
+1cbe  Luminary Micro Inc.
+	0002  CDC serial port [TivaWare]
+	00fd  In-Circuit Debug Interface
+	00ff  Stellaris ROM DFU Bootloader
+	0166  CANAL USB2CAN
+	0240  McGill Robotics TM4C Microcontroller
+1cbf  FORTAT SKYMARK INDUSTRIAL COMPANY
+1cc0  PlantSense
+1cca  NextWave Broadband Inc.
+1ccd  Bodatong Technology (Shenzhen) Co., Ltd.
+1cd4  adp corporation
+1cd5  Firecomms Ltd.
+1cd6  Antonio Precise Products Manufactory Ltd.
+1cde  Telecommunications Technology Association (TTA)
+1cdf  WonTen Technology Co., Ltd.
+1ce0  EDIMAX TECHNOLOGY CO., LTD.
+1ce1  Amphenol KAE
+1cf1  Dresden Elektronik
+	0001  Sensor Terminal Board
+	0004  Wireless Handheld Terminal
+	0017  deRFusbSniffer 2.4 GHz
+	0018  deRFusb24E001
+	0019  deRFusb14E001
+	001a  deRFusb23E00
+	001b  deRFusb13E00
+	001c  deRFnode
+	001d  deRFnode / gateway
+	0022  deUSB level shifter
+	0023  deRFusbSniffer Sub-GHz
+	0025  deRFusb23E06
+	0027  deRFusb13E06
+	0030  ZigBee gateway [ConBee II]
+1cfc  ANDES TECHNOLOGY CORPORATION
+1cfd  Flextronics Digital Design Japan, LTD.
+1d03  iCON
+	0028  iCreativ MIDI Controller
+1d07  Solid-Motion
+1d08  NINGBO HENTEK DRAGON ELECTRONICS CO., LTD.
+1d09  TechFaith Wireless Technology Limited
+	1026  HSUPA Modem FLYING-LARK46-VER0.07 [Flying Angel]
+1d0a  Johnson Controls, Inc. The Automotive Business Unit
+1d0b  HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD.
+1d0d  TDKMedia
+	0214  Trans-It Drive
+1d0f  Sonix Technology Co., Ltd.
+1d14  ALPHA-SAT TECHNOLOGY LIMITED
+1d17  C-Thru Music Ltd.
+	0001  AXiS-49 Harmonic Table MIDI Keyboard
+1d19  Dexatek Technology Ltd.
+	1101  DK DVB-T Dongle
+	1102  DK mini DVB-T Dongle
+	1103  DK 5217 DVB-T Dongle
+	1104  MSI DigiVox Micro HD
+	6105  Video grabber
+	610a  Video grabber
+	8202  DK DVBC/T DONGLE
+1d1f  Diostech Co., Ltd.
+1d20  SAMTACK INC.
+1d27  ASUS
+	0601  Xtion
+1d34  Dream Cheeky
+	0001  Fidget
+	0002  Fidget (Basketball)
+	0003  Fidget (Golf Ball)
+	0004  Webmail Notifier
+	0008  button
+	000a  Mailbox Friends Alert
+	000d  Big Red Button
+	0013  LED Message Board
+	0020  Stress Ball
+1d45  Touch
+	1d45  Foxlink Optical touch sensor
+	459d  BenQ F5
+	465c  Harrier Mini by EE
+1d4d  PEGATRON CORPORATION
+	0002  Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device
+	000c  Ralink RT3070 802.11b/g/n Wireless Lan USB Device
+	000e  Ralink RT3070 802.11b/g/n Wireless Lan USB Device
+1d50  OpenMoko, Inc.
+	1db5  IDBG (DFU)
+	1db6  IDBG
+	5117  Neo1973/FreeRunner kernel usbnet (g_ether, CDC Ethernet) mode
+	5118  Neo1973/FreeRunner Debug board (V2+)
+	5119  Neo1973/FreeRunner u-boot cdc_acm serial port
+	511a  HXD8 u-boot usbtty CDC ACM Mode
+	511b  SMDK2440 u-boot usbtty CDC ACM mode
+	511c  SMDK2443 u-boot usbtty CDC ACM mode
+	511d  QT2410 u-boot usbtty CDC ACM mode
+	5120  Neo1973/FreeRunner u-boot usbtty generic serial
+	5121  Neo1973/FreeRunner kernel mass storage (g_storage) mode
+	5122  Neo1973/FreeRunner kernel cdc_ether USB network
+	5123  Neo1973/FreeRunner internal USB CSR4 module
+	5124  Neo1973/FreeRunner Bluetooth Device ID service
+	5300  Rockbox
+	530e  iriver H10 20GB (Rockbox)
+	530f  iriver H10 5/6GB (Rockbox)
+	5314  Apple iPod Color/Photo (Rockbox)
+	5315  Apple iPod Nano 1g (Rockbox)
+	5316  Apple iPod Video (Rockbox)
+	5318  Apple iPod 4g Grayscale (Rockbox)
+	5319  Apple iPod Mini 1g (Rockbox)
+	531a  Apple iPod Mini 2g (Rockbox)
+	531c  Apple iPod Nano 2g (Rockbox)
+	531d  Apple iPod Classic/6G (Rockbox)
+	5321  Cowon D2 (Rockbox)
+	5329  Toshiba Gigabeat S (Rockbox)
+	5332  Sandisk Sansa e200 series (Rockbox)
+	5334  Sandisk Sansa c200 series (Rockbox)
+	5337  Sandisk Sansa Clip (Rockbox)
+	5338  Sandisk Sansa e200v2 series (Rockbox)
+	5339  Sandisk Sansa m200 v4 series (Rockbox)
+	533a  Sandisk Sansa Fuze (Rockbox)
+	533b  Sandisk Sansa c200v2 series (Rockbox)
+	533c  Sandisk Sansa Clipv2 (Rockbox)
+	533e  Sandisk Sansa Clip+ (Rockbox)
+	533f  Sandisk Sansa Fuze v2 (Rockbox)
+	5340  Sandisk Sansa Fuze+ (Rockbox)
+	5341  Sandisk Sansa Zip (Rockbox)
+	5342  Sandisk Sansa Connect (Rockbox)
+	5346  Olympus M:Robe 500i (Rockbox)
+	5347  Olympus m:robe MR-100 (Rockbox)
+	5359  Creative Zen X-Fi Style (Rockbox)
+	535d  Creative Zen X-Fi2 (Rockbox)
+	535e  Creative Zen X-Fi3 (Rockbox)
+	5360  Creative Zen X-Fi (Rockbox)
+	5361  Creative ZEN Mozaic (Rockbox)
+	5362  Creative Zen (Rockbox)
+	5364  Philips GoGear SA9200 (Rockbox)
+	5365  Philips GoGear HDD16x0 (Rockbox)
+	5366  Philips GoGear HDD63x0 (Rockbox)
+	5378  Onda VX747 (Rockbox)
+	5379  Onda VX767 (Rockbox)
+	537b  Onda VX777 (Rockbox)
+	538c  Samsung YH-820 (Rockbox)
+	538d  Samsung YH-920 (Rockbox)
+	538e  Samsung YH-925 (Rockbox)
+	53a0  Packard Bell Vibe 500 (Rockbox)
+	53b4  Rockchip 27xx generic (Rockbox)
+	53be  HiFiMAN HM-60x (Rockbox)
+	53bf  HiFiMAN HM-801 (Rockbox)
+	53d2  HiFi E.T. MA9 (Rockbox)
+	53d3  HiFi E.T. MA9C (Rockbox)
+	53d4  HiFi E.T. MA8 (Rockbox)
+	53d5  HiFi E.T. MA8C (Rockbox)
+	53dc  Sony NWZ-E370/E380 series (Rockbox)
+	53dd  Sony NWZ-E360 series (Rockbox)
+	53e6  IHIFI 760 (Rockbox)
+	53e7  IHIFI 960 (Rockbox)
+	53ff  Generic Rockbox device
+	6000  Ubertooth Zero
+	6001  Ubertooth Zero (DFU)
+	6002  Ubertooth One
+	6003  Ubertooth One (DFU)
+	6004  LeoLipo
+	6005  LED Flower S
+	6006  LED Cube
+	6007  LED Flower
+	6008  Kisbee 802.15.4 transceiver
+	6009  Adjacent Reality Tracker
+	600a  AVR Programmer
+	600b  Hypna Go Go
+	600c  CatNip LPC1343 development board
+	600d  Enhanced RoboBrrd Brain board
+	600e  OpenRISC Ordb2a-ep4ce22 development board
+	600f  Paparazzi Lisa/M (DFU)
+	6010  OpenPipe: OSHW Bagpipes MIDI controller
+	6011  LeoLipo (DFU)
+	6012  Universal C64 Cartridge
+	6013  DiscFerret magnetic disc analyser (bootloader)
+	6014  DiscFerret magnetic disc analyser
+	6015  Smoothieboard
+	6016  phInterface
+	6017  Black Magic Debug Probe (DFU)
+	6018  Black Magic Debug Probe (Application)
+	6019  4pi 5 axis motion controller
+	601a  Paparazzi Lisa/M
+	601b  IST-2 chronograph for bullet speeds
+	601c  EPOSMote II
+	601d  UDS18B20 temperature sensor
+	601e  5x5 STM32 prototyping board
+	601f  uNSF
+	6020  Toad3
+	6021  AlphaSphere
+	6022  LightPack
+	6023  Pixelkit
+	6024  Illucia
+	6025  Keyglove (HID)
+	6026  Keyglove (Serial)
+	6027  Key64 Keyboard
+	6028  Teensy 2.0 Development Board [ErgoDox Keyboard]
+	6029  Marlin 2.0 (Serial)
+	602a  Marlin 2.0 (Mass Storage)
+	602b  FPGALink
+	602c  5nes5snes (5x8)
+	602d  5nes5snes (4x12)
+	602e  Flexibity
+	602f  K-copter
+	6030  USB-oscope
+	6031  Handmade GSM GPS tracker
+	6032  ncrmnt.org uISP
+	6033  frobiac / adnw keyboard
+	6034  Tiflomag Ergo 2
+	6035  FreeLaserTag Gun
+	6036  FreeLaserTag Big Brother
+	6037  FreeLaserTag Node
+	6038  Monaka
+	6039  eXtreme Feedback Device
+	603a  TiLDA
+	603b  Raspiface
+	603c  Paparazzi (bootloader)
+	603d  Paparazzi (Serial)
+	603e  Paparazzi (Mass Storage)
+	603f  airGuitar
+	6040  moco
+	6041  AlphaSphere (bootloader)
+	6042  Dspace robot controller
+	6043  pc-power
+	6044  open-usb-can (DFU)
+	6045  open-usb-can
+	6046  mimus-weigand
+	6047  RfCat Chronos Dongle
+	6048  RfCat Dons Dongle
+	6049  RfCat Chronos bootloader
+	604a  RfCat Dons bootloader
+	604b  HackRF Jawbreaker Software-Defined Radio
+	604c  Makibox A6
+	604d  Paella Pulse height analyzer
+	604e  Miniscope v2b
+	604f  Miniscope v2c
+	6050  GoodFET
+	6051  pinocc.io
+	6052  APB Team Robotic Development Board
+	6053  Darkgame Controller
+	6054  Satlab/AAUSAT3 BlueBox
+	6055  RADiuS ER900TRS-02 transciever with SMA Connector
+	6056  The Glitch
+	6057  OpenPipe MIDI Shield
+	6058  Novena OTG port
+	6059  xser serial
+	605a  Daisho test
+	605b  RfCat YARD Stick One
+	605c  YARD Stick One bootloader
+	605d  Funky Sensor v2
+	605e  Blinkiverse Analog LED Fader
+	605f  Small DIP package Cypress FX2
+	6060  Data logger using the Cypress FX2
+	6061  Power Manager
+	6062  WhiteRabbit console and Wishbone bridge
+	6063  CPC FPGA
+	6064  CPC FPGA (DFU)
+	6065  CPC FPGA (Serial)
+	6066  Nuand BladeRF
+	6067  Orbotron 9000 (Serial)
+	6068  Orbotron 9000 (HID)
+	6069  xser (DFU)
+	606a  xser (legacy)
+	606b  S08-245, urJtag compatible firmware for S08JS
+	606c  Blinkytape full-color light tape
+	606d  TinyG open source motion controller
+	606e  Reefangel Evolution 1.0
+	606f  Geschwister Schneider CAN adapter
+	6070  Open Pinball Project
+	6071  The Glitch HID
+	6072  The Glitch Disk
+	6073  The Glitch Serial
+	6074  The Glitch MIDI
+	6075  The Glitch RawHID
+	6076  Vultureprog BIOS chip programmer
+	6077  PaintDuino
+	6078  DTplug
+	6079  Mood Light
+	607a  Fadecandy
+	607b  RCDongle for IR remote control
+	607c  OpenVizsla USB sniffer/analyzer
+	607d  Spark Core Arduino-compatible board with WiFi
+	607e  OSHUG Wuthering multi-tool
+	607f  Spark Core Arduino-compatible board with WiFi (bootloader)
+	6080  arcin arcade controller
+	6081  BladeRF (bootloader)
+	6082  Facecandy (DFU)
+	6083  LightUp (bootloader)
+	6084  arcin arcade controller (DFU)
+	6085  IRKit for controlloing home electronics from iOS devices
+	6086  OneRNG entropy device
+	6087  Blinkytape (alternate endpoint config)
+	6088  picp PIC16F145x based PIC16F145x programmer
+	6089  Great Scott Gadgets HackRF One SDR
+	608a  BLEduino
+	608b  Loctronix ASR-2300 SDR/motion sensing module
+	608c  Fx2lafw
+	608d  Fx2lafw
+	608e  Fx2lafw
+	608f  Fx2lafw
+	6090  Fx2lafw
+	6091  Fx2lafw
+	6092  Fx2lafw
+	6093  Fx2lafw
+	6094  Fx2lafw
+	6095  Fx2lafw
+	6096  LightUp (sketch)
+	6097  Tessel JavaScript enabled Microcontroller with built-in WiFi
+	6098  RFIDler
+	6099  RASDR Radio Astronomy SDR Rx Interface
+	609a  RASDR Radio Astronomy SDR Tx Interface
+	609b  RASDR Radio Astronomy SDR (bootloader)
+	609c  antiAFK keyboard
+	609d  PIC16F145x bootloader
+	609e  Clyde Lamp by Fabule (bootloader)
+	609f  Clyde Lamp by Fabule (sketch)
+	60a0  Smoothiepanel robotic control interface
+	60a1  Airspy
+	60a2  barebox (DFU)
+	60a3  keyboard (bootloader)
+	60a4  Papilio Duo (AVR)
+	60a5  Papilio Duo (FPGA)
+	60a6  HydraBus/HydraNFC (bootloader)
+	60a7  HydraBus/HydraNFC
+	60a8  reserved
+	60a9  Blinky Light Controller (DFU)
+	60aa  Blinky Light Controller
+	60ab  AllPixel
+	60ac  OpenBLT generic microcontroller (bootloader)
+	60ad  Clasic Gamepad Adapter (NES)
+	60ae  Clasic Gamepad Adapter (N64)
+	60af  Clasic Gamepad Adapter (DB9)
+	60b0  Waterott Arduino based Clock (caterina bootloader)
+	60b1  Drinkbot (processing)
+	60b2  Drinkbot (OTG-tablet support)
+	60b3  calc.pw password generator device (standard)
+	60b4  calc.pw password generator device (enhanced)
+	60b5  TimVideos' HDMI2USB (FX2) - Unconfigured device
+	60b6  TimVideos' HDMI2USB (FX2) - Firmware load/upgrade
+	60b7  TimVideos' HDMI2USB (FX2) - HDMI/DVI Capture Device
+	60b8  TimVideos' HDMI2USB (Soft+UTMI) - Unconfigured device
+	60b9  TimVideos' HDMI2USB (Soft+UTMI) - Firmware upgrade
+	60ba  TimVideos' HDMI2USB (Soft+UTMI) - HDMI/DVI Capture Device
+	60bc  Simple CC25xx programmer / serial board
+	60bd  Open Source control interface for multimedia applications
+	60be  Pixelmatix Aurora (bootloader)
+	60bf  Pixelmatix Aurora
+	60c0  Nucular Keyboard adapter
+	60c1  BrewBit Model-T pOSHW temperature controller for homebrewers (bootloader)
+	60c2  BrewBit Model-T pOSHW temperature controller for homebrewers
+	60c3  X Antenna Tracker arduino board
+	60c4  CAN bus communication device
+	60c5  PIC16F1 bootloader
+	60c6  USBtrng hardware random number generator
+	60c7  Zubax GNSS positioning module for light UAV systems
+	60c8  Xlink data transfer and control system for Commodore C64
+	60c9  random number generator
+	60ca  FinalKey password manager
+	60cb  PteroDAQ Data Acquisition on FRDM-KL25Z and future boards
+	60cc  LamDiNao
+	60cd  Open Lighting DMX512 / RDM widget
+	60de  Cryptech.is random number generator
+	60df  Numato Opsis HDMI2USB board (unconfigured)
+	60e0  Numato Opsis HDMI2USB board (JTAG Programming Mode)
+	60e1  Numato Opsis HDMI2USB board (User Mode)
+	60e2  Osmocom SIMtrace 2 (DFU)
+	60e3  Osmocom SIMtrace 2
+	60e4  3D printed racing game - (Catalina CDC bootloader)
+	60e5  3D printed racing game
+	60e6  replacement for GoodFET/FaceDancer - GreatFet
+	60e7  replacement for GoodFET/FaceDancer - GreatFet target
+	60e8  Alpen Clack keyboard
+	60e9  keyman64 keyboard itercepter
+	60ea  Wiggleport FPGA-based I/O board
+	60eb  candleLight CAN adapter
+	60ec  Duet 2 WiFi or Duet 2 Ethernet 3D printer control electronics
+	60ed  Duet 2 Maestro 3D printer control electronics
+	60ee  Duet 3 motion control electronics
+	60f0  UDAD-T1 data aquisition device (boot)
+	60f1  UDAD-T1 data aquisition device
+	60f2  UDAD-T2 data aquisition device (boot)
+	60f3  UDAD-T2 data aquisition device
+	60f4  Uniti ARC motor controller
+	60f5  EightByEight Blinky Badge (DFU)
+	60f6  EightByEight Blinky Badge
+	60f7  cardio NFC/RFID card reader (bootloader)
+	60f8  cardio NFC/RFID card reader
+	60fc  OnlyKey Two-factor Authentication and Password Solution
+	6100  overlay64 video overlay module
+	6104  ScopeFun open source instrumentation
+	6108  Myriad-RF LimeSDR
+	610c  Magic Keys (boot)
+	610d  Magic Keys
+	6114  MIDI key
+	6118  Thomson MO5 keyboard
+	6122  Ultimate Hacking Keyboard
+	614c  dwtk In-Circuit Emulator
+	8085  Box0 (box0-v5)
+	cc15  rad1o badge for CCC summer camp 2015
+1d57  Xenta
+	0005  Wireless Receiver (Keyboard and Mouse)
+	0006  Wireless Receiver (RC Laser Pointer)
+	000c  Optical Mouse
+	130f  2.4Ghz wireless optical mouse receiver
+	2400  Wireless Mouse Receiver
+	32da  2.4GHz Receiver (Keyboard and Mouse)
+	83d0  Click-mouse!
+	ac01  Wireless Receiver (Keyboard and Mouse)
+	ac02  ViFit Activity Tracker
+	ac08  RFID Receiver (Keyboard)
+	ad02  SE340D PC Remote Control
+	ad03  [T3] 2.4GHz and IR Air Mouse Remote Control
+	af01  AUVIO Universal Remote Receiver for PlayStation 3
+	af03  Wireless Receiver
+	fa20  2.4GHz Wireless Reciever (Mini Keyboard & Mouse)
+1d5b  Smartronix, Inc.
+1d5c  Fresco Logic
+	2000  FL2000/FL2000DX VGA/DVI/HDMI Adapter
+1d6b  Linux Foundation
+	0001  1.1 root hub
+	0002  2.0 root hub
+	0003  3.0 root hub
+	0100  PTP Gadget
+	0101  Audio Gadget
+	0102  EEM Gadget
+	0103  NCM (Ethernet) Gadget
+	0104  Multifunction Composite Gadget
+	0105  FunctionFS Gadget
+	0200  Qemu Audio Device
+1d88  Mahr GmbH
+	0001  Measurement Device [MarECon]
+	0002  Probe
+	0003  Surface Measurement [PS10]
+1d90  Citizen
+	201e  PPU-700
+	2037  CL-S631 Barcode Printer
+	20f0  Thermal Receipt Printer [CT-E351]
+1d9d  Sigma Sport
+	1010  Docking Station Topline 2009
+	1011  Docking Station Topline 2012
+	1012  Docking Station Topline 2016
+1dd2  Leo Bodnar Electronics Ltd
+1dd3  Dajc Inc.
+	0001  Expert I/O 1000
+1de1  Actions Microelectronics Co.
+	1101  Generic Display Device (Mass storage mode)
+	c101  Generic Display Device
+1de6  MICRORISC s.r.o.
+1e0e  Qualcomm / Option
+	f000  iCON 210 UMTS Surfstick
+1e10  Point Grey Research, Inc.
+	2004  Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon]
+1e17  Mirion Technologies Dosimetry Services Division
+	0001  instadose dosimeter
+1e1d  Kanguru Solutions
+	0165  Secure Pen drive
+	1101  FlashBlu Flash Drive
+1e1f  INVIA
+1e29  Festo AG & Co. KG
+	0101  CPX Adapter
+	0102  CPX Adapter >=HW10.09 [CP2102]
+	0401  iL3-TP [AT90USB646]
+	0402  FTDI232 [EasyPort]
+	0403  FTDI232 [EasyPort Mini]
+	0404  FTDI232 [Netzteil-GL]
+	0405  FTDI232 [MotorPrüfstand]
+	0406  STM32F103 [EasyKit]
+	0407  LPC2378 [Robotino]
+	0408  LPC2378 [Robotino-Arm]
+	0409  LPC2378 [Robotino-Arm Bootloader]
+	040a  LPC2378 [Robotino Bootloader]
+	040b  LPC2378 [Robotino XT]
+	040c  LPC2378 [Robotino XT Bootloader]
+	040d  LPC2378 [Robotino 3]
+	040e  LPC2378 [Robotino 3 Bootloader]
+	040f  LPC2148 [Robotino gripper]
+	0410  LPC2148 [Robotino IR panel]
+	0501  CP2102 [CMSP]
+	0601  CMMP-AS
+	0602  FTDI232 [CMMS]
+1e2d  Gemalto M2M GmbH
+	004f  EGS3 GSM/GPRS modem
+	0054  PH8 wireless module
+	0058  Wireless Module [Cinterion EHS6]
+	0059  Wireless Module [Cinterion BGx]
+	005b  Zoom 4625 Modem
+	0061  ALSx PLSx LTE modem
+	00a0  Cinterion ELS31-V
+1e3d  Chipsbank Microelectronics Co., Ltd
+	198a  Flash Disk
+	2093  CBM209x Flash Drive (OEM)
+	4082  CBM4082 SD Card Reader
+1e41  Cleverscope
+	0001  CS328A PC Oscilloscope
+	0004  CS448
+1e44  SHIMANO INC.
+	7220  SM-BCR2
+1e4e  Cubeternet
+	0100  WebCam
+	0102  GL-UPC822 UVC WebCam
+	0109  EtronTech CMOS based eSP570 WebCam [Onyx Titanium TC101]
+1e54  TypeMatrix
+	2030  2030 USB Keyboard
+1e68  TrekStor GmbH & Co. KG
+	001b  DataStation maxi g.u
+	004c  DataStation Pocket Click
+	0050  DataStation maxi light
+	1045  ST70408-3 [SurfTab breeze 7.0 quad 3G] (MTP Mode)
+	1046  ST70408-3 [SurfTab breeze 7.0 quad 3G] (PTP Mode)
+1e71  NZXT
+	0001  Avatar Optical Mouse
+	170e  Kraken X
+	1711  Grid+ V3
+	1714  Smart Device
+	1715  Kraken M22
+	2006  Smart Device V2
+1e74  Coby Electronics Corporation
+	2211  MP300
+	2647  2 GB 2 Go Video MP3 Player [MP601-2G]
+	2659  Coby 4GB Go Video MP3 Player [MP620-4G]
+	4641  A8705 MP3/Video Player
+	6511  MP705-8G MP3 player
+	6512  MP705-4G
+	7111  MP957 Music and Video Player
+1e7b  Zurich Instruments
+	0002  HF2
+	0003  UHF
+	0004  MFLI
+1e7d  ROCCAT
+	2c24  Pyra Mouse (wired)
+	2c2e  Lua Mouse
+	2c38  Kiro Mouse
+	2ced  Kone Mouse
+	2cee  Kova 2016 Gray Mouse
+	2cef  Kova 2016 White Mouse
+	2cf0  Kova 2016 Black Mouse
+	2cf6  Pyra Mouse (wireless)
+	2d50  Kova[+] Mouse
+	2d51  Kone[+] Mouse
+	2d5a  Savu Mouse
+	2db4  Kone Pure Optical Mouse
+	2dbe  Kone Pure Mouse
+	2dbf  Kone Pure Military Mouse
+	2dc2  Kone Pure Optical Black Mouse
+	2dcb  Kone Pure SE(L) Mouse
+	2e22  Kone XTD Mouse
+	2e23  Kone XTD Optical Mouse
+	2e27  Kone AIMO Mouse
+	2e4a  Tyon Black Mouse
+	2e4b  Tyon White Mouse
+	2e7c  Nyth Black Mouse
+	2e7d  Nyth White Mouse
+	2f76  Sova Keyboard
+	2f94  Sova MK Keyboard
+	2fa8  Suora Keyboard
+	2fc6  Skeltr Keyboard
+	2fda  Ryos MK FX Keyboard
+	30d4  Arvo Keyboard
+	3138  Ryos MK Keyboard
+	316a  Ryos TKL Keyboard
+	319c  Isku Keyboard
+	31ce  Ryos MK Glow Keyboard
+	3232  Ryos MK Pro Keyboard
+	3246  Suora FX Keyboard
+	3264  Isku FX Keyboard
+1e8e  Airbus Defence and Space
+	6001  P8GR
+1e91  Other World Computing
+	b0b1  miniStack
+1ea7  SHARKOON Technologies GmbH
+	0030  Trust GXT 158 Orna Laser Gaming Mouse
+	0064  2.4GHz Wireless rechargeable vertical mouse [More&Better]
+	0066  [Mediatrack Edge Mini Keyboard]
+	0907  Keyboard
+	1002  Vintorez Gaming Mouse
+	2007  SHARK ZONE K30 Illuminated Gaming Keyboard
+1eab  Fujian Newland Computer Co., Ltd
+	0103  HR200 Barcode scanner engine (HID keyboard)
+	0106  HR200 Barcode scanner engine (Serial CDC)
+	0110  HR200 Barcode scanner engine (HID Pos)
+	0c03  HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (HID keyboard)
+	0c06  HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (USB Serial CDC)
+	0c10  HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (HID Pos)
+	0d03  EM2028 Barcode scanner engine (HID keyboard)
+	0d06  EM2028 Barcode scanner engine (Serial CDC)
+	0d10  EM2028 Barcode scanner engine (HID Pos)
+	1303  EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (HID keyboard)
+	1306  EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (USB serial CDC)
+	1310  EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (HID Pos)
+	1403  HR15-xx Barcode scanner engine (HID keyboard)
+	1406  HR15-xx Barcode scanner engine (Serial CDC)
+	1410  HR15-xx Barcode scanner engine (HID Pos)
+	1603  FM100-M/3250 Barcode scanner engine (HID keyboard)
+	1606  FM100-M/3250 Barcode scanner engine (Serial CDC)
+	1610  FM100-M/3250 Barcode scanner engine (HID Pos)
+	1903  EM1300 Barcode scanner engine (HID keyboard)
+	1906  EM1300 Barcode scanner engine (Serial CDC)
+	1910  EM1300 Barcode scanner engine (HID Pos)
+	1a03  HR3290 corded/HR22 Barcode scanner engine (HID keyboard)
+	1a06  HR3290 corded/HR22 Barcode scanner engine (Serial CDC)
+	1a10  HR3290 corded/HR22 Barcode scanner engine (HID Pos)
+	1c03  HR2150 Barcode scanner engine (HID keyboard)
+	1c06  HR2150 Barcode scanner engine (Serial CDC)
+	1c10  HR2150 Barcode scanner engine (HID Pos)
+	1d03  FM430 Barcode scanner engine (HID keyboard)
+	1d06  FM430 Barcode scanner engine (Serial CDC)
+	1d10  FM430 Barcode scanner engine (HID Pos)
+	1e03  HR42 Barcode scanner engine (HID keyboard)
+	1e06  HR42 Barcode scanner engine (Serial CDC)
+	1e10  HR42 Barcode scanner engine (HID Pos)
+	1f03  HR11+ Barcode scanner engine (HID keyboard)
+	1f06  HR11+ Barcode scanner engine (Serial CDC)
+	1f10  HR11+ Barcode scanner engine (HID Pos)
+	2003  EM2037v2 Barcode scanner engine (HID keyboard)
+	2006  EM2037v2 Barcode scanner engine (Serial CDC)
+	2010  EM2037v2 Barcode scanner engine (HID Pos)
+	8003  EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (HID keyboard)
+	8006  EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (USB Serial CDC)
+	8010  EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (HID Pos)
+	8203  EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (HID keyboard)
+	8206  EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (USB Serial CDC)
+	8210  EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (HID Pos)
+	8303  HR2160 Barcode scanner engine (HID keyboard)
+	8306  HR2160 Barcode scanner engine (Serial CDC)
+	8310  HR2160 Barcode scanner engine (HID Pos)
+1eaf  Leaflabs
+	0003  Maple DFU interface
+	0004  Maple serial interface
+1eb8  Modacom Co., Ltd.
+	7f00  MW-U3500 WiMAX adapter
 1ebb  NuCORE Technology, Inc.
-2001  D-Link Corp. [hex]
-	3200  DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]
-	3700  DWL-122 802.11b
-	3701  DWL-G120 Spinnaker 802.11b
-	3703  DWL-122 802.11b
-	3704  DWL-G122 802.11g rev. A2
-	3c00  DWL-G122 802.11g rev. B1 [ralink]
+1ecb  AMTelecom
+	02e2  JMR1140 [Jiofi]
+1ed8  FENDER MUSICAL INSTRUMENTS CORPORATION
+	0004  Mustang I/II
+	0005  Mustang III/IV/V
+	0006  Mustang I/II [Firmware Update]
+	0007  Mustang III/IV/V [Firmware Update]
+	0010  Mustang Mini
+	0011  Mustang Mini [Firmware Update]
+	0014  Mustang I (V.2)
+	0016  Mustang IV v.2
+1eda  AirTies Wireless Networks
+	2012  Air2210 54 Mbps Wireless Adapter
+	2210  Air2210 54 Mbps Wireless Adapter
+	2310  Air2310 150 Mbps Wireless Adapter
+	2410  Air2410 300 Mbps Wireless Adapter
+1edb  Blackmagic design
+	bd3b  Intensity Shuttle
+	bd46  Mini Converter Analog to SDI
+	bd75  2.5K Cinema Camera (BMCC)
+1ee8  ONDA COMMUNICATION S.p.a.
+	0014  MT833UP
+1ef6  EADS Deutschland GmbH
+	2233  Cassidian NH90 STTE
+	5064  FDR Interface
+	5523  Cassidian SSDC Adapter II
+	5545  Cassidian SSDC Adapter III
+	5648  RIU CSMU/BSD
+	564a  Cassidian RIU CSMU/BSD Simulator
+1f0c  CMX Systems
+	2000  HP StreamSmart 410 [NW278AA]
+1f28  Cal-Comp
+	0020  CDMA USB Modem A600
+	0021  CD INSTALLER USB Device
+1f3a  Allwinner Technology
+	1000  Prestigio PER3464B ebook reader (Mass storage mode)
+	1002  mediacom XPRO 415
+	1010  Android device in fastboot mode
+	efe8  sunxi SoC OTG connector in FEL/flashing mode
+1f44  The Neat Company
+	0001  NM-1000 scanner
+1f48  H-TRONIC GmbH
+	0627  Data capturing system
+	0628  Data capturing and control module
+1f4d  G-Tek Electronics Group
+	a115  EVOLVEO XtraTV stick [DVB-T]
+	b803  Lifeview LV5TDLX DVB-T [RTL2832U]
+	c803  NotOnlyTV (Lifeview) LV5TDLX DVB-T [RTL2832U]
+	d220  Geniatech T220 DVB-T2 TV Stick
+1f52  Systems & Electronic Development FZCO (SEDCO)
+	0001  Ultima 49 Printer
+	0002  Ultima 90 Printer
+	0003  FormsPro 50 Printer
+	0004  Ultima 90+ Printer
+1f6f  Aliph
+	0023  Jawbone Jambox
+	8000  Jawbone Jambox - Updating
+1f75  Innostor Technology Corporation
+	0611  IS611 SATA/PATA Bridge Controller
+	0621  IS621 SATA Storage Controller
+	0888  IS888 SATA Storage Controller
+	0902  IS902 UFD controller
+	0916  IS916 Flash Drive
+	0917  IS917 Mass storage
+	0918  IS918 Flash Drive
+1f82  TANDBERG
+	0001  PrecisionHD Camera
+1f84  Alere, Inc.
+	1f7e  Lateral Flow Engine
+1f87  Stantum
+	0002  Multi-touch HID Controller
+1f9b  Ubiquiti Networks, Inc.
+	0241  AirView2-EXT
+	b0b1  UniFi VoIP Phone
+1fab  Samsung Opto-Electroncs Co., Ltd.
+	104d  ES65
+1fac  Franklin Wireless
+	0232  U770 3G/4G Wimax/4G LTE Modem
+1fae  Lumidigm
+	0040  M311 Fingerprint Scanner
+	212c  M30x (Mercury) fingerprint sensor
+1fb2  Withings
+	0001  Wi-Fi Body Scale (WBS01)
+1fba  DERMALOG Identification Systems GmbH
+1fbd  Delphin Technology AG
+	0001  Expert Key - Data aquisition system
+1fc9  NXP Semiconductors
+	0003  LPC1343
+	000c  LPC4330FET180 [ARM Cortex M4 + M0] (device firmware upgrade mode)
+	0082  LPC4330FET180 [ARM Cortex M4 + M0] (mass storage controller mode)
+	010b  PR533
+	0126  i.MX 7ULP SystemOnChip in RecoveryMode
+	012b  i.MX 8M Dual/8M QuadLite/8M Quad Serial Downloader
+	5002  PTN5002 [Startech VGA/DVI-D adapter]
+	8124  SharkRF Bootloader
+	824c  LumiNode1
+1fde  ILX Lightwave Corporation
+	0001  UART Bridge
+1fe7  Vertex Wireless Co., Ltd.
+	1000  VW100 series CDMA EV-DO Rev.A modem
+1ff7  CVT Electronics.Co.,Ltd
+	0013  CVTouch Screen (HID)
+	001a  Human Interface Device
+1ffb  Pololu Corporation
+	0081  AVR Programmer
+	0083  Jrk 21v3 Motor Controller
+	0089  Micro Maestro 6-Servo Controller
+	008a  Mini Maestro 12-Channel Servo Controller
+	008b  Mini Maestro 18-Channel Servo Controller
+	008c  Mini Maestro 24-Channel Servo Controller
+	00b0  AVR Programmer v2
+1fff  Ideofy Inc.
+2000  CMX Systems
+	1f0c  HP StreamSmart 410 [NW278AA]
+2001  D-Link Corp.
+	0001  DWL-120 WIRELESS ADAPTER
+	0201  DHN-120 10Mb Home Phoneline Adapter
+	1a00  DUB-E100 Fast Ethernet Adapter(rev.A) [ASIX AX88172]
+	1a02  DUB-E100 Fast Ethernet Adapter(rev.C1) [ASIX AX88772]
+	200c  10/100 Ethernet
+	3101  DWA-182 AC1200 DB Wireless Adapter(rev.A1) [Broadcom BCM43526]
+	3200  DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a]
+	3301  DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U]
+	3306  DWL-G122 Wireless Adapter(rev.F1) [Realtek RTL8188SU]
+	3308  DWA-121 802.11n Wireless N 150 Pico Adapter [Realtek RTL8188CUS]
+	3309  DWA-135 802.11n Wireless N Adapter(rev.A1) [Realtek RTL8192CU]
+	330a  DWA-133 802.11n Wireless N Adapter [Realtek RTL8192CU]
+	330d  DWA-131 802.11n Wireless N Nano Adapter (rev.B1) [Realtek RTL8192CU]
+	330f  DWA-125 Wireless N 150 Adapter(rev.D1) [Realtek RTL8188ETV]
+	3310  DWA-123 Wireless N 150 Adapter (rev.D1)
+	3314  DWA-171 AC600 DB Wireless Adapter(rev.A1) [Realtek RTL8811AU]
+	3315  DWA-182 Wireless AC Dualband Adapter(rev.C) [Realtek RTL8812AU]
+	3317  DWA-137 Wireless N High-Gain Adapter [Ralink RT5372]
+	3319  DWA-131 Wireless N Nano Adapter (Rev. E1) [Realtek RTL8192EU]
+	3500  Elitegroup Computer Systems WLAN card WL-162
+	3700  DWL-122 802.11b [Intersil Prism 3]
+	3701  DWL-G120 Spinnaker 802.11g [Intersil ISL3886]
+	3702  DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871]
+	3703  AirPlus G DWL-G122 Wireless Adapter(rev.A1) [Intersil ISL3880]
+	3704  AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887]
+	3705  AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887]
+	3761  IEEE 802.11g USB2.0 Wireless Network Adapter-PN
+	3a00  DWL-AG132 [Atheros AR5523]
+	3a01  DWL-AG132 (no firmware) [Atheros AR5523]
+	3a02  DWL-G132 [Atheros AR5523]
+	3a03  DWL-G132 (no firmware) [Atheros AR5523]
+	3a04  DWL-AG122 [Atheros AR5523]
+	3a05  DWL-AG122 (no firmware) [Atheros AR5523]
+	3a80  AirPlus Xtreme G DWL-G132 Wireless Adapter
+	3a81  predator Bootloader Download
+	3a82  AirPremier AG DWL-AG132 Wireless Adapter
+	3a83  predator Bootloader Download
+	3b00  AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB]
+	3b01  WLAN Boot Device
+	3c00  AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2571]
+	3c01  AirPlus AG DWL-AG122 Wireless Adapter
+	3c02  AirPlus G DWL-G122 Wireless Adapter
+	3c05  DUB-E100 Fast Ethernet Adapter(rev.B1) [ASIX AX88772]
+	3c15  DWA-140 RangeBooster N Adapter(rev.B3) [Ralink RT5372]
+	3c17  DWA-123 Wireless N 150 Adapter(rev.A1) [Ralink RT3370]
+	3c19  DWA-125 Wireless N 150 Adapter(rev.A3) [Ralink RT5370]
+	3c1a  DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.B2) [Ralink RT5572]
+	3c1b  DWA-127 Wireless N 150 High-Gain Adapter(rev.A1) [Ralink RT3070]
+	3c1e  DWA-125 Wireless N 150 Adapter(rev.B1) [Ralink RT5370]
 	4000  DSB-650C Ethernet [klsi]
 	4001  DSB-650TX Ethernet [pegasus]
 	4002  DSB-650TX Ethernet [pegasus]
 	4003  DSB-650TX-PNA Ethernet [pegasus]
+	400b  10/100 Ethernet
+	4102  10/100 Ethernet
+	4a00  DUB-1312 Gigabit Ethernet Adapter
+	5100  DSL-200 ADSL ATM Modem
+	5102  DSL-200 ADSL Loader
+	5b00  Remote NDIS Network Device
+	9414  Cable Modem
+	9b00  Broadband Cable Modem Remote NDIS Device
 	abc1  DSB-650 Ethernet [pegasus]
 	f013  DLink 7 port USB2.0 Hub
+	f103  DUB-H7 7-port USB 2.0 hub
 	f10d  Accent Communications Modem
+	f110  DUB-AV300 A/V Capture
 	f111  DBT-122 Bluetooth adapter
+	f112  DUB-T210 Audio Device
+	f116  Formosa 2
+	f117  Formosa 3
+	f118  Formosa 4
+2002  DAP Technologies
+2003  detectomat
+	ea61  dc3500
+2006  LenovoMobile
+2009  iStorage
+	5004  datAshur 4GB
+	5016  datAshur 16GB
+	5032  datAshur 32GB
+200c  Reloop
+	100b  Play audio soundcard
+2013  PCTV Systems
+	0242  QuatroStick 510e
+	0245  PCTV 73ESE
+	0246  PCTV 74E
+	0248  PCTV 282E
+	024c  DVB-S2 Stick 460e
+	024f  nanoStick T2 290e
+	0251  QuatroStick nano 520e
+	0258  DVB-S2 Stick 461e
+	025a  AndroiDTV 78e
+	025f  tripleStick 292e
+	0262  microStick 79e
+2018  Deutsche Telekom AG
+	0406  Eumex 800
+	0408  Eumex 800
+2019  PLANEX
+	3220  GW-US11S WLAN [Atmel AT76C503A]
+	4901  GW-USSuper300 802.11bgn Wireless Adapter [Realtek RTL8191SU]
+	4903  GW-USFang300 802.11abgn Wireless Adapter [Realtek RTL8192DU]
+	4904  GW-USUltra300 802.11abgn Wireless Adapter [Realtek RTL8192DU]
+	5303  GW-US54GXS 802.11bg
+	5304  GWUS300 802.11n
+	ab01  GW-US54HP
+	ab24  GW-US300MiniS
+	ab25  GW-USMini2N 802.11n Wireless Adapter [Ralink RT2870]
+	ab28  GW-USNano
+	ab29  GW-USMicro300
+	ab2a  GW-USNano2 802.11n Wireless Adapter [Realtek RTL8188CUS]
+	ab2b  GW-USEco300 802.11bgn Wireless Adapter [Realtek RTL8192CU]
+	ab2c  GW-USDual300 802.11abgn Wireless Adapter [Realtek RTL8192DU]
+	ab50  GW-US54Mini2
+	c002  GW-US54SG
+	c007  GW-US54GZL
+	ed02  GW-USMM
+	ed06  GW-US300MiniW 802.11bgn Wireless Adapter
+	ed10  GW-US300Mini2
+	ed14  GW-USMicroN
+	ed16  GW-USMicroN2W 802.11bgn Wireless Adapter [Realtek RTL8188SU]
+	ed17  GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS]
+	ed18  GW-USHyper300 / GW-USH300N 802.11bgn Wireless Adapter [Realtek RTL8191SU]
+201e  Haier
+	2009  CE100 CDMA EVDO
+203a  PARALLELS
+203d  Encore Electronics Inc.
+	1480  ENUWI-N3 [802.11n Wireless N150 Adapter]
 2040  Hauppauge
-	7050  Hauppauge Nova-T Stick
-	9300  Hauppauge WinTV NOVA-T USB2 (cold)
-	9301  Hauppauge WinTV NOVA-T USB2 (warm)
+	0265  WinTV-dualHD DVB
+	026d  WinTV-dualHD ATSC
+	0c80  Windham
+	0c90  Windham
+	1605  WinTV-HVR 930C HD
+	1700  CataMount
+	1800  Okemo A
+	1801  Okemo B
+	2000  Tiger Minicard
+	2009  Tiger Minicard R2
+	200a  Tiger Minicard
+	2010  Tiger Minicard
+	2011  WinTV MiniCard [Dell Digital TV Receiver]
+	2019  Tiger Minicard
+	2400  WinTV PVR USB2 (Model 24019)
+	4200  WinTV
+	4700  WinTV Nova-S-USB2
+	4902  HD PVR
+	4903  HS PVR
+	4982  HD PVR
+	5500  Windham
+	5510  Windham
+	5520  Windham
+	5530  Windham
+	5580  Windham
+	5590  Windham
+	6500  WinTV HVR-900
+	6502  WinTV HVR-900
+	6503  WinTV HVR-930
+	6513  WinTV HVR-950/HVR-980
+	6600  WinTV HVR-900H (Model 660xx)
+	7050  Nova-T Stick
+	7060  Nova-T Stick 2
+	7070  Nova-T Stick 3
+	7240  WinTV HVR-850
+	8400  WinTV Nova-T-500
+	9300  WinTV NOVA-T USB2 (cold)
+	9301  WinTV NOVA-T USB2 (warm)
+	9941  WinTV Nova-T-500
+	9950  WinTV Nova-T-500
+	b123  WinTV-HVR-955Q
+	b138  WinTV-HVR-900 model 00246 [WinTV-T Video]
+	b910  Windham
+	b980  Windham
+	b990  Windham
+	c000  Windham
+	c010  Windham
+2047  Texas Instruments
+	0013  MSP eZ-FET lite
+	0014  MSP-FET
+	0200  MSP430 Bootloader
+	0203  eZ-FET Bootloader
+	0204  MSP-FET Bootloader
+	0300  MSP430 CDC Example
+	0301  MSP430 HID Datapipe Example
+	0302  MSP430 CDC+HID Example
+	0309  MSP430 HID Mouse Example
+	0313  MSP430 CDC+CDC Example
+	0314  MSP430 HID+HID Example
+	0315  MSP430 HID Keyboard Example
+	0316  MSP430 MSC File System Emulation Example
+	0317  MSP430 MSC SD Card Example
+	0318  MSP430 MSC Multiple LUNs Example
+	0319  MSP430 MSC+CDC+HID Example
+	0320  MSP430 SYSBIOS Tasks MSC+CDC+HID Example
+	0321  MSP430 SYSBIOS SWIs MSC+CDC+HID Example
+	0322  MSP430 MSC Double-Buffering Example
+	0323  MSP430 MSC CD-ROM Example
+	03df  MSP430 User Experiment
+	03e0  MSP430 User Experiment
+	03e1  MSP430 User Experiment
+	03e2  MSP430 User Experiment
+	03e3  MSP430 User Experiment
+	03e4  MSP430 User Experiment
+	03e5  MSP430 User Experiment
+	03e6  MSP430 User Experiment
+	03e7  MSP430 User Experiment
+	03e8  MSP430 User Experiment
+	03e9  MSP430 User Experiment
+	03ea  MSP430 User Experiment
+	03eb  MSP430 User Experiment
+	03ec  MSP430 User Experiment
+	03ed  MSP430 User Experiment
+	03ee  MSP430 User Experiment
+	03ef  MSP430 User Experiment
+	03f0  MSP430 User Experiment
+	03f1  MSP430 User Experiment
+	03f2  MSP430 User Experiment
+	03f3  MSP430 User Experiment
+	03f4  MSP430 User Experiment
+	03f5  MSP430 User Experiment
+	03f6  MSP430 User Experiment
+	03f7  MSP430 User Experiment
+	03f8  MSP430 User Experiment
+	03f9  MSP430 User Experiment
+	03fa  MSP430 User Experiment
+	03fb  MSP430 User Experiment
+	03fc  MSP430 User Experiment
+	03fd  MSP430 User Experiment
+	0401  MSP430 Keyboard Example
+	0855  Invensense Embedded MotionApp HID Sensor
+	08f8  FDC2x14/LDC13xx/LDC16xx EVM
+	0964  Inventio Software MSP430
+	0a76  GEOKON S-3810A-5 USB-RS485 CONVERTER
+	ffe7  HID v1.00 Device [Improv Device]
+2058  Nano River Technology
+	2058  ViperBoard I2C, SPI, GPIO interface
+2077  Taicang T&W Electronics Co. Ltd
+	9002  W1M100 HSPA/WCDMA Module
+2080  Barnes & Noble
+	0001  nook
+	0002  NOOKcolor
+	0003  NOOK Simple Touch
+	0004  NOOK Tablet
+	0005  BNTV600 [Nook HD+]
+	0006  BNTV400 [Nook HD]
+	0007  BNRV500 [Nook Glowlight]
+	000a  BNRV510 [Nook Glowlight Plus]
+	000b  BNRV520 [Nook Glowlight 3]
+	000c  BNRV700 [Nook Glowlight Plus]
+2086  SIMPASS
+2087  Cando
+	0a01  Multi Touch Panel
+	0a02  Multi Touch Panel
+	0b03  Multi Touch Panel
+20a0  Clay Logic
+	0006  flirc
+	4107  GPF Crypto Stick V1.2
+	4123  IKALOGIC SCANALOGIC 2
+	414a  MDE SPI Interface
+	415a  OpenPilot
+	415b  CopterControl
+	415c  PipXtreme
+	41e5  BlinkStick
+	4211  Nitrokey Start
+	4223  ATSAMD21 [castAR]
+	428d  Electrosense wideband converter
+20b1  XMOS Ltd
+	10ad  XUSB Loader
+	f7d1  XTAG2 - JTAG Adapter
+20b3  Hanvon
+	0a18  10.1 Touch screen overlay
+20b7  Qi Hardware
+	0713  Milkymist JTAG/serial
+	1540  ben-wpan, AT86RF230-based
+	1db5  IDBG in DFU mode
+	1db6  IDBG in normal mode
+	9db1  Glasgow Debug Tool
+	c25b  C2 Dongle
+	cb72  ben-wpan, cntr
+20bc  ShenZhen ShanWan Technology Co., Ltd.
+	5500  Frostbite controller
+20ce  Minicircuits
+	0012  RF Sythesizer 250-4200MHz model SSG-4000LH
+	0021  RF Switch Matrix
+	0022  I/O Controller
+20df  Simtec Electronics
+	0001  Entropy Key [UDEKEY01]
+20f0  L3Harris Technologies
+	2102  EWLA V2 Module
+20f1  NET New Electronic Technology GmbH
+	0101  iCube3 Camera
+20f4  TRENDnet
+	646b  TEW-646UBH High Power 150Mbps Wireless N Adapter [Realtek RTL8188SU]
+	648b  TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
+	664b  TEW-664UB H/W:V2.0R
+	804b  TEW-804UB 802.11a/b/g/n/ac (1x1) Wireless Adapter [Realtek RTL8811AU]
+	805b  TEW-805UB 300Mbps+867Mbps Wireless AC Adapter [Realtek RTL8812AU]
+	806b  TEW-806UBH 802.11a/b/g/n/ac (1x1) Wireless Adapter [MediaTek MT7610U]
+20f7  XIMEA
+	3001  MQ or MD camera
+	3002  MU camera
+	3021  MJ camera
+	30b3  MQ in U3V mode or MC camera
+	a003  MU camera
+2100  RT Systems
+	0e56  USB62C Radio Cable [Yaesu 857/D - 897/D]
+	9e50  USB-59 Radio Cable [Yaesu VX-8/D/DR]
+	9e52  Yaesu VX-7
+	9e54  CT29B Radio Cable
+	9e57  RTS01 Radio Cable
+	9e58  USB63C Radio Cable [Yaesu FTDX-1200]
+	9e5d  K4Y Radio Cable
+	9e5f  FT232RL [RTS05 Serial Cable]
 2101  ActionStar
 	0201  SIIG 4-to-2 Printer Switch
-2162  Creative (?)
+	1402  Keyboard/Mouse Switch
+2104  Tobii Technology AB
+	0050  Eye tracker [EYEX2]
+	0124  Eyechip
+2107  RDING TECH CO.,LTD
+2109  VIA Labs, Inc.
+	0210  Hub
+	0700  VL700 SATA 3Gb/s bridge
+	0701  VL701 SATA 3Gb/s bridge
+	0711  VL711 SATA 6Gb/s bridge
+	0715  VL817 SATA Adaptor
+	0810  VL81x Hub
+	0811  Hub
+	0812  VL812 Hub
+	0813  VL813 Hub
+	0820  VL820 Hub
+	2210  Hub
+	2811  Hub
+	2812  VL812 Hub
+	2813  VL813 Hub
+	2820  VL820 Hub
+	3431  Hub
+	711f  External
+	8110  Hub
+2113  Softkinetic
+	0137  DepthSense 311 (3D)
+	0145  DepthSense 325
+	8000  DepthSense 311 (Color)
+2116  KT Tech
+	000a  IDE Hard Drive Enclosure
+211f  CELOT Corporation
+	6801  CDMA Products
+2123  Cheeky Dream
+	1010  Rocket Launcher
+2125  Fiberpro Inc.
+	0000  Bootloader
+	0010  MCB-100 Series
+2133  signotec GmbH
+	0001  LCD Signature Pad Sigma
+	0018  Delta Pen
+	0019  Delta Touch
+	001c  Kronos Pen
+	0022  Epsilon Pen
+2149  Advanced Silicon S.A.
+	211b  Touchscreen Controller
+	2306  TS58xxA/TC56xxA [CoolTouch]
+	2703  TS58xxA/TC56xxA [CoolTouch]
+214b  Huasheng Electronics
+	7000  4-port hub [Maxxter ACT-HUB2-4P, HS8836, iSoul ultra-slim]
+214e  Swiftpoint
+	0005  Z - Gaming mouse [SM700]
+2162  Broadxent (Creative Labs)
+	2031  Network Blaster Wireless Adapter
 	500c  DE5771 Modem Blaster
+	8001  Broadxent BritePort DSL Bridge 8010U
+2166  JVC Kenwood
+	600b  TH-D74
+2184  GW Instek
+	0005  GDS-3000 Oscilloscope
+	0006  GDS-3000 Oscilloscope
+	0011  AFG Function Generator (CDC)
+	0017  DSO
+	0018  DSO
+	0036  AFG-125 Function Generator (CDC)
+2188  No brand
+	0610  Hub
+	0611  Hub
+	0620  Hub
+	0625  Hub
+	0754  Card Reader
+	4042  CalDigit Pro Audio
+219c  Seal One AG
+	0010  USB 2200 K Secure Sign Token
+21a1  Emotiv Systems Pty. Ltd.
+	0001  EPOC Consumer Headset Wireless Dongle
+21a4  Electronic Arts Inc.
+	ac27  SPORTS Active 2 Wireless Controller for PS3
+	ac40  SPORTS Active 2 Wireless Controller for Wii
+21a9  Saleae, Inc.
+	1001  16-channel Logic Analyzer [Logic16]
+	1003  Logic 4
+	1004  Logic8
+	1005  Logic Pro 8
+	1006  Logic Pro 16
+21ab  Planeta Informatica
+	0010  RC700 NFC SmartCard Reader
+	0011  DSR700 SmartCard Reader
+21b4  AudioQuest
+	0081  DragonFly
+	0082  DragonFly Red
+21d6  Agecodagis SARL
+	0002  Seismic recorder [Tellus]
+2207  Fuzhou Rockchip Electronics Company
+	0010  GoClever Tab R83
+	0011  SmartTab
+	281a  RK2818 in Mask ROM mode
+	290a  RK2918 in Mask ROM mode
+	292a  RK2928 in Mask ROM mode
+	292c  RK3026 in Mask ROM mode
+	300a  RK3066 in Mask ROM mode
+	300b  RK3168 in Mask ROM mode
+	301a  RK3036 in Mask ROM mode
+	310a  RK3066B in Mask ROM mode
+	310b  RK3188 in Mask ROM mode
+	310c  RK3126/RK3128 in Mask ROM mode
+	310d  RK3126 in Mask ROM mode
+	320a  RK3288 in Mask ROM mode
+	320b  RK3228/RK3229 in Mask ROM mode
+	320c  RK3328 in Mask ROM mode
+	330a  RK3368 in Mask ROM mode
+	330c  RK3399 in Mask ROM mode
+221a  ZTEX GmbH
+	0100  FPGA Boards
 2222  MacAlly
 	0004  iWebKey Keyboard
+	0005  ICEKey Keyboard
+	1001  Generic Hub
+	2520  Mini Tablet
+	4050  AirStick joystick
+2226  Copper Mountain technologies
+2227  SAMWOO Enterprise
+	3105  SKYDATA SKD-U100
+222a  ILI Technology Corp.
+	0001  Multi-Touch Screen
+	0037  Multi-Touch Screen
+2230  Plugable
+	0001  UD-160-A / M Integrated Hub
+	0003  DC-125 / M Integrated Hub
+2232  Silicon Motion
+	1005  WebCam SCB-0385N
+	1024  Webcam SC-13HDL11624N [Namuga Co., Ltd.]
+	1028  WebCam SC-03FFL11939N
+	1029  WebCam SC-13HDL11939N
+	1037  WebCam SC-03FFM12339N
+	1045  WebCam SC-10HDP12631N
 2233  RadioShack Corporation
 	6323  USB Electronic Scale
+2237  Kobo Inc.
+	4161  eReader White
+	4163  Touch
+	4173  Glo
+2245  Aspeed Technology, Inc.
+	1500  AST1500/1510 PC-over-LAN Virtual Hub
+224f  APDM
+	0001  Access Point
+	0002  Docking Station
+	0004  V2 Opal ACM
+	0005  V2 Opal
+	0006  V2 Docking Station
+	0007  V2 Access Point ACM
+	0008  V2 Access Point
+2256  Faderfox
+	1007  LV3 MIDI Controller
+225d  Morpho
+	0001  FINGER VP Multimodal Biometric Sensor
+	0008  CBM-E3 Fingerprint Sensor
+	0009  CBM-V3 Fingerprint Sensor
+	000a  MSO1300-E3 Fingerprint Sensor
+	000b  MSO1300-V3 Fingerprint Sensor
+	000c  MSO1350-E3 Fingerprint Sensor & SmartCard Reader
+	000d  MSO1350-V3 Fingerprint Sensor & SmartCard Reader
+	000e  MorphoAccess SIGMA Biometric Access Control Terminal
+	9015  Tablet 2
+	9024  Tablet 2
+	9039  Tablet 2 secure multifunction biometric tablet
+	904d  Tablet 2 secure multifunction biometric tablet
+	904e  Tablet 2 secure multifunction biometric tablet
+	9091  Tablet 2 secure multifunction biometric tablet
+	9092  Tablet 2 secure multifunction biometric tablet
+	f000  Tablet 2 secure multifunction biometric tablet
+	f003  Tablet 2 secure multifunction biometric tablet
+	f006  Tablet 2 secure multifunction biometric tablet
+	f00e  Tablet 2 secure multifunction biometric tablet
+226e  DISPLAX
+228d  8D Technologies inc.
+	0001  Terminal Bike Key Reader
+22a4  VERZO Technology
+22a6  Pie Digital, Inc.
+	ffff  PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB)
+22a7  Fortinet Technologies
+	1001  FortiGate Device
+22b1  Secret Labs LLC
+	1000  Netduino MCU pcb
 22b8  Motorola PCS
+	0001  Wally 2.2 chipset
+	0002  Wally 2.4 chipset
 	0005  V.60c/V.60i GSM Phone
+	002e  XT1806
+	0830  2386C-HT820
+	0833  2386C-HT820 [Flash Mode]
+	0850  Bluetooth Device
+	1001  Patriot 1.0 (GSM) chipset
+	1002  Patriot 2.0 chipset
 	1005  T280e GSM/GPRS Phone
+	1101  Patriot 1.0 (TDMA) chipset
+	1801  Rainbow chipset flash
+	2035  Bluetooth Device
+	2805  GSM Modem
 	2821  T720 GSM Phone
 	2822  V.120e GSM Phone
+	2823  Flash Interface
+	2a01  MSM6050 chipset
+	2a02  CDMA modem
+	2a03  MSM6050 chipset flash
 	2a21  V710 GSM Phone (P2K)
 	2a22  V710 GSM Phone (AT)
+	2a23  MSM6100 chipset flash
+	2a41  MSM6300 chipset
+	2a42  Usb Modem
+	2a43  MSM6300 chipset flash
 	2a61  E815 GSM Phone (P2K)
 	2a62  E815 GSM Phone (AT)
+	2a63  MSM6500 chipset flash
+	2a81  MSM6025 chipset
+	2a83  MSM6025 chipset flash
+	2ac1  MSM6100 chipset
+	2ac3  MSM6100 chipset flash
+	2d78  XT300[SPICE]
+	2e82  XT1541 [Moto G 3rd Gen]
+	2e83  XT1033 [Moto G], PTP mode
 	3001  A835/E1000 GSM Phone (P2K)
 	3002  A835/E1000 GSM Phone (AT)
 	3801  C350L/C450 (P2K)
 	3802  C330/C350L/C450/EZX GSM Phone (AT)
+	3803  Neptune LT chipset flash
+	4001  OMAP 1.0 chipset
 	4002  A920/A925 UMTS Phone
+	4003  OMAP 1.0 chipset flash
+	4008  OMAP 1.0 chipset RDL
+	41d6  Droid X (Windows media mode)
+	41d9  Droid/Milestone
+	41db  Droid/Milestone (Debug mode)
+	41de  Droid X (PC mode)
+	4204  MPx200 Smartphone
+	4214  MPc GSM
+	4224  MPx220 Smartphone
+	4234  MPc CDMA
+	4244  MPx100 Smartphone
+	4285  Droid X (Mass storage)
+	42d9  XT910 [Droid RAZR]
+	4801  Neptune LTS chipset
+	4803  Neptune LTS chipset flash
 	4810  Triplet GSM Phone (storage)
 	4901  Triplet GSM Phone (P2K)
 	4902  Triplet GSM Phone (AT)
+	4903  Neptune LTE chipset flash
+	4a01  Neptune LTX chipset
+	4a03  Neptune LTX chipset flash
 	4a32  L6-imode Phone
+	5801  Neptune ULS chipset
+	5803  Neptune ULS chipset flash
+	5901  Neptune VLT chipset
+	5903  Neptune VLT chipset flash
+	6001  Dalhart EZX
+	6003  Dalhart flash
 	6004  EZX GSM Phone (CDC Net)
+	6006  MOTOROKR E6
+	6008  Dalhart RDL
 	6009  EZX GSM Phone (P2K)
+	600a  Dalhart EZX config 17
+	600b  Dalhart EZX config 18
 	600c  EZX GSM Phone (USBLAN)
+	6021  JUIX chipset
+	6023  JUIX chipset flash
+	6026  Flash RAM Downloader/miniOS
+	6027  USBLAN
 	604c  EZX GSM Phone (Storage)
-	6631  CDC Modem
+	6101  Talon integrated chipset
+	6401  Argon chipset
+	6403  Argon chipset flash
+	6411  ROKR Z6 (print mode)
+	6415  ROKR Z6 (MTP mode)
+	6422  ROKR Z6 (modem mode)
+	6426  ROKR Z6 (storage mode)
 	6604  Washington CDMA Phone
+	6631  CDC Modem
+	7001  Q Smartphone
+	7086  Atrix
+	70a8  Xoom Tablet
+	fe01  StarTAC III MS900
 22b9  eTurboTouch Technology, Inc.
+	0006  Touch Screen
 22ba  Technology Innovation Holdings, Ltd
-2304  Pinnacle Systems, Inc. [hex]
-	0109  Pinnacle Studio PCTV USB (SECAM)
-	0110  Pinnacle Studio PCTV USB (PAL)
+	0108  Double Shock Steering Wheel HID
+	0109  Double Shock Steering Wheel Hub
+22c9  StepOver GmbH
+	0601  naturaSign Pad Colour
+	0701  naturaSign Pad Mobile
+	0801  naturaSign Pad Comfort
+	0881  naturaSign Pad Flawless
+	0901  naturaSign Pad Classic
+	09e1  naturaSign Pad Biometric
+	0ce1  duraSign Pad Brilliance
+	0cf1  duraSign Pad Biometric 5.0
+	0d01  duraSign 10.0
+	0df1  duraSign Pad Biometric 10.0
+22cd  Kinova Robotics Inc.
+22d4  Laview Technology
+	1301  Mionix NAOS 8200 [STM32F103 MCU]
+	1308  Mionix Avior 7000
+	130c  Mionix Naos 7000
+	1316  Mionix Castor
+22d9  OPPO Electronics Corp.
+	2765  Oppo N1
+	2767  Oppo Find 5 (X909)
+22db  Phase One
+	0003  IQ3 100MP IG030372
+22dc  Mellanox Technologies
+	0004  BlueField SOC
+22de  WeTelecom Incorporated
+22df  Medicom MTD, Ltd
+22e0  secunet Security Networks AG
+	0002  SINA Flash Drive
+	0003  SINA ID Token A
+22e8  Cambridge Audio
+	6512  651N Audio
+	6969  Audio Prototype
+	7512  751R Audio
+	770a  X70A Audio
+	850c  851C Audio [Azur 850C]
+	851d  851D Audio [Azur 851D]
+	ca02  Audio
+	ca04  Audio
+	ca06  AmpMagic
+	dac2  DacMagic Plus
+	dac3  Azur DacMagic 100
+	dac4  Azur DacMagic 100
+	dac6  DacMagicXS 2.0
+	dac8  Audio
+2304  Pinnacle Systems, Inc.
+	0109  Studio PCTV USB (SECAM)
+	0110  Studio PCTV USB (PAL)
 	0111  Miro PCTV USB
-	0112  Pinnacle Studio PCTV USB (NTSC) with FM radio
-	0208  Pinnacle Studio PCTV USB2
-	0210  Pinnacle Studio PCTV USB (PAL) with FM radio
-	0212  Pinnacle Studio PCTV USB (NTSC)
-	0214  Pinnacle Studio PCTV USB (PAL) with FM radio
-	0300  Pinnacle Studio Linx Video input cable (NTSC)
-	0301  Pinnacle Studio Linx Video input cable (PAL)
-	0419  Pinnacle PCTV Bungee USB (PAL) with FM radio
+	0112  Studio PCTV USB (NTSC) with FM radio
+	0201  Systems MovieBox Device
+	0204  MovieBox USB_B
+	0205  DVC 150B
+	0206  Systems MovieBox Deluxe Device
+	0207  Dazzle DVC90 Video Device
+	0208  Studio PCTV USB2
+	020e  PCTV 200e
+	020f  PCTV 400e BDA Device
+	0210  Studio PCTV USB (PAL) with FM radio
+	0212  Studio PCTV USB (NTSC)
+	0213  500-USB Device
+	0214  Studio PCTV USB (PAL) with FM radio
+	0216  PCTV 60e
+	0219  PCTV 260e
+	021a  Dazzle DVC100 Audio Device
+	021b  Dazzle DVC130/DVC170
+	021d  Dazzle DVC130
+	021e  Dazzle DVC170
+	021f  PCTV Sat HDTV Pro BDA Device
+	0222  PCTV Sat Pro BDA Device
+	0223  DazzleTV Sat BDA Device
+	0225  Remote Kit Infrared Transceiver
+	0226  PCTV 330e
+	0227  PCTV for Mac, HD Stick
+	0228  PCTV DVB-T Flash Stick
+	0229  PCTV Dual DVB-T 2001e
+	022a  PCTV 160e
+	022b  PCTV 71e [Afatech AF9015]
+	0232  PCTV 170e
+	0236  PCTV 72e [DiBcom DiB7000PC]
+	0237  PCTV 73e [DiBcom DiB7000PC]
+	023a  PCTV 801e
+	023b  PCTV 801e SE
+	023d  PCTV 340e
+	023e  PCTV 340e SE
+	0300  Studio Linx Video input cable (NTSC)
+	0301  Studio Linx Video input cable (PAL)
+	0302  Dazzle DVC120
+	0419  PCTV Bungee USB (PAL) with FM radio
+	061d  PCTV Deluxe (NTSC) Device
+	061e  PCTV Deluxe (PAL) Device
+	2304  1689
+230d  Teracom
+	0103  Huwaii 3g wireless modem
+2314  INQ Mobile
 2318  Shining Technologies, Inc. [hex]
 	0011  CitiDISK Jr. IDE Enclosure
+2319  Tronsmart
+	0014  TSM01 Air Mouse + Keyboard
+232b  Pantum Ltd.
+	0810  P2000
+232e  EA Elektro-Automatik GmbH & Co. KG
+	0010  EA-PS-2000 B Series Power Supply
+2340  Teleepoch
+2341  Arduino SA
+	0001  Uno (CDC ACM)
+	0010  Mega 2560 (CDC ACM)
+	0036  Leonardo Bootloader
+	003b  Serial Adapter (CDC ACM)
+	003d  Due Programming Port
+	003e  Due
+	003f  Mega ADK (CDC ACM)
+	0042  Mega 2560 R3 (CDC ACM)
+	0043  Uno R3 (CDC ACM)
+	0044  Mega ADK R3 (CDC ACM)
+	0045  Serial R3 (CDC ACM)
+	0049  ISP
+	8036  Leonardo (CDC ACM, HID)
+	8038  Robot Control Board (CDC ACM, HID)
+	8039  Robot Motor Board (CDC ACM, HID)
+2349  P2 Engineering Group, LLC
+234b  Free Software Initiative of Japan
+	0000  Gnuk Token
+	0001  NeuG True RNG
+2357  TP-Link
+	0005  M7350 4G Mi-Fi Router
+	0100  TL-WN8200ND [Realtek RTL8192CU]
+	0101  RTL8812AU Archer T4U 802.11ac
+	0103  Archer T4UH wireless Realtek 8812AU
+	0105  Archer T1U 802.11a/n/ac Wireless Adapter [MediaTek MT7610U]
+	0106  Archer T9UH v1 [Realtek RTL8814AU]
+	0107  TL-WN821N v5/v6 [RTL8192EU]
+	0108  TL-WN822N Version 4 RTL8192EU
+	0109  TL-WN823N v2/v3 [Realtek RTL8192EU]
+	010b  Archer T2UHP [MediaTek MT7610U]
+	010c  TL-WN722N v2/v3 [Realtek RTL8188EUS]
+	010d  Archer T4U v2 [Realtek RTL8812AU]
+	010e  Archer T4UH v2 [Realtek RTL8812AU]
+	010f  Archer T4UHP [Realtek RTL8812AU]
+	0115  Archer T4U ver.3
+	011e  AC600 wireless Realtek RTL8811AU [Archer T2U Nano]
+	0120  Archer T2U PLUS [RTL8821AU]
+	012d  Archer T3U [Realtek RTL8812BU]
+	0200  MA 180 Zero CD
+	0201  HSUPA Modem MA180
+	0600  UE300 10/100/1000 LAN (mass storage CD-ROM mode) [Realtek RTL8153]
+	0601  UE300 10/100/1000 LAN (ethernet mode) [Realtek RTL8153]
+2366  Bitmanufaktur GmbH
+	0001  Reserved Prototyping PID
+	0002  OpenBeacon USB 2
+	0003  OpenPCD 2 RFID Reader for 13.56MHz
+	0004  OpenBeacon
+	0005  Blinkenlights WDIM
+	0006  Blinkenlights WMCU
+	0007  OpenBeacon Ethernet EasyReader PoE II - Active 2.4GHz RFID Reader
+	0008  OpenBeacon WLAN
+	0009  OpenPCD 2 RFID Reader for 13.56MHz
+	000a  OpenPCD 2 Audio & LCD Display
+2367  Teenage Engineering
+	0002  OP-1 Portable synthesizer
+	000c  OP-Z Portable synthesizer
+2368  Peterson Electro-Musical Products Inc.
+	0001  BBS-1 [BodyBeat Sync]
+236a  SiBEAM
+	1965  SB6501 802.11ad Wireless Network Adapter
+2373  Pumatronix Ltda
+	0001  5 MegaPixel Digital Still Camera [DSC5M]
 2375  Digit@lway, Inc.
 	0001  Digital Audio Player
+2378  OnLive
+	100a  Universal Wireless Controller
+237d  Cradlepoint
+	0400  MC400
+2386  Raydium Corporation
+	3125  Touch System
+	4328  Touch System
+	432f  Touch System
+238b  Hytera Communications
+	0a11  DMR Radio
+239a  Adafruit
+	0001  CDC Bootloader
+	801e  Trinket M0
+23a0  BIFIT
+	0001  Token iBank2key
+	0002  iBank2Key Type M Token
+	0003  iToken
+	0008  MS_KEY K - Angara
+23a6  Tronical Components GmbH
+	2000  Gibson Firebird X Pedal Board
+	2001  Gibson Firebird X Switch Board
+23b4  Dental Wings Inc.
+	0200  DW0200 Color Camera
+	0300  DW0300 Hight Speed Monochrome Camera
+23c7  Gemini
+	1021  FirstMix
+23fc  SesKion GmbH
+	0201  SPI-Simulyzer box for SPI data communication
+	0202  PSI5-Simulyzer box for PSI5 (Peripheral-Sensor-Interfacs) data communication
+	0203  SENT-Simulyzer box for SENT data communication
+	0204  DSI-Simulyzer box for DSI3 data communication
+2405  Custom Computer Services, Inc
+	0002  West Mountain Radio RIGblaster Advantage Audio
+	0003  West Mountain Radio RIGblaster Advantage
 2406  SANHO Digital Electronics Co., Ltd.
 	6688  PD7X Portable Storage
+2420  IRiver
+242e  Vossloh-Schwabe Deutschland GmbH
+	0001  DALI Master
+	0002  LiCS Bootloader Mode
+	0003  LiCS Running Mode
+	0004  iProgrammer
+	0005  NFC programming device
+2433  ASETEK
+	b200  [NZXT Kraken X60]
+2443  Aessent Technology Ltd
+	00dc  aes220 FPGA Mini-Module
+2457  Ocean Optics Inc.
+	100a  HR2000 Spectrometer 1.00.0
+	1012  HR4000 Spectrometer
+2458  Bluegiga Technologies
+	0001  BLED112 Bluetooth 4.0 Single Mode Dongle
+245f  Chord Electronics Limited
+2464  Nest
+	0001  Learning Thermostat
+	0002  Learning Thermostat (2nd Generation)
+	0010  Protect : Smoke + Carbon Monoxide
+	0020  Heat Link
+2466  Fractal Audio Systems
+	8003  Axe-Fx II
+	8010  Axe-FX III
+2476  YEI Technology
+	1040  3-Space Embedded Sensor
 2478  Tripp-Lite
 	2008  U209-000-R Serial Port
+248a  Maxxter
+	8366  Wireless Optical Mouse ACT-MUSW-002
+	8367  Telink Wireless Receiver
+249c  M2Tech s.r.l.
+24a4  Primare AB
+	0002  I15_v1.06 [Primare Audio DAC]
+24ae  Shenzhen Rapoo Technology Co., Ltd.
+	0001  KX Keyboard
+	0197  meva Barcode Scanner
+	1813  E9260 Wireless Multi-mode Keyboard
+	2000  2.4G Wireless Device Serial
+	2001  5 GHz Wireless Receiver
+	2003  5GHz Wireless Transceiver
+	4110  Optical Gaming Mouse [V280]
+	6000  Wireless Audio
+24c0  Chaney Instrument
+	0003  Model 01036 weather center
+24c6  ThrustMaster, Inc.
+	5000  Razer Atrox Gaming Arcade Stick
+	5300  PowerA Mini ProEX Controller for Xbox 360
+	5303  Airflo Wired Controller for Xbox 360
+	530a  ProEX Controller for Xbox 360
+	531a  Pro Ex mini for XBOX
+	5397  FUS1ON Tournament Controller
+	541a  PowerA CPFA115320-01 [Mini Controller for Xbox One]
+	542a  Spectra for Xbox One
+	543a  PowerA Wired Controller for Xbox One
+	5500  Horipad EX2 Turbo
+	5501  Hori Real Arcade Pro.VX-SA for Xbox 360
+	5502  Hori Fighting Stick VX Alt for Xbox 360
+	5503  Hori Fighting Edge for Xbox 360
+	5506  Hori Soulcalibur V Stick for Xbox 360
+	550d  Hori Gem Controller for Xbox 360
+	550e  Real Arcade Pro V Kai for Xbox One / Xbox 360
+	551a  Fusion Pro Controller
+	561a  Fusion Controller for Xbox One
+	5b00  Ferrari 458 Italia Racing Wheel
+	5b02  GPX Controller
+	5d04  Sabertooth Elite
+	fa00  INF-8032385 Disney Infinity Reader
+	fafb  Aplay Controller
+	fafd  Afterglow Gamepad for Xbox 360
+	fafe  Rock Candy Gamepad for Xbox 360
+24cf  Lytro, Inc.
+	00a1  Light Field Camera
+24dc  Aladdin R.D.
+	0406  JaCarta SF GOST
+24e0  Yoctopuce Sarl
+24e1  Paratronic
+	3001  Adp-usb
+	3005  Radius
+24e3  K-Touch
+24ea  Meva
+	0197  Barcode Scanner
+24ed  Zen Group
+	044d  Chat Headset
+24f0  Metadot
+	0105  Das Keyboard 4
+	0140  Das Keyboard 4
+	2020  Das Keyboard 5Q
+24ff  Acroname Inc.
+2500  Ettus Research LLC
+	0020  USRP B210
+	0021  USRP B200-mini
+	0022  USRP B205-mini
+	0200  USRP B200
+2516  Cooler Master Co., Ltd.
+	0003  Storm Xornet
+	0004  Storm QuickFire Rapid Mechanical Keyboard
+	0006  Storm Recon
+	0007  Storm Sentinel Advance II
+	0009  Storm Quick Fire PRO
+	0011  Storm Quick Fire TK 6keys
+	0014  Storm Quick Fire TK Nkeys
+	0015  Storm QuickFire Pro/Ultimate keyboard
+	0017  CM Storm Quick Fire Stealth
+	001a  Storm Quick Fire XT
+	0020  QuickFire Rapid-i Keyboard
+	0027  CM Storm Coolermaster Novatouch TKL
+	002d  Alcor mouse
+	0042  Masterkeys Lite L Combo RGB Keyboard
+	0044  Masterkeys Lite L Combo RGB Mouse
+	0046  Masterkeys PRO L
+	0047  MasterKeys Pro L
+	0055  MasterKeys L
+	1006  MasterCase SL600M
+	9494  Sirus Headset
+2520  ANA-U GmbH
+	0001  EasyPrinter S3
+2527  Software Bisque
+	1388  Paramount 5
+2537  Norelsys
+	1066  NS1066
+	1068  NS1068/NS1068X SATA Bridge Controller
+2544  Energy Micro AS
+2546  Ravensburger
+	e301  TipToi Pen
+2548  Pulse-Eight
+	1001  CEC Adapter
+	1002  CEC Adapter
+254e  SHF Communication Technologies AG
+	e2b3  SHF 58035 A BiasBoard
+2554  ASSA ABLOY AB
+2555  Basis Science Inc.
+	0001  B1 Fitness Band
+255e  Beijing Bonxeon Technology Co., Ltd.
+	0001  Device
+	0002  Dual
+2560  e-con Systems
+	c152  See3CAM_CU51 5 Mpx monochrome camera
+2563  ShenZhen ShanWan Technology Co., Ltd.
+	031d  DXT Mouse
+	0523  BM0523 WirelessGamepad
+	0575  ZD-V+ Wired Gaming Controller
+256b  Perreaux Industries Ltd
+	0121  Audiant 80i
+256f  3Dconnexion
+	c62e  SpaceMouse Wireless (cabled)
+	c62f  SpaceMouse Wireless Receiver
+	c631  SpaceMouse Pro Wireless (cabled)
+	c632  SpaceMouse Pro Wireless Receiver
+	c633  SpaceMouse Enterprise
+	c635  SpaceMouse Compact
+	c651  CadMouse Wireless
+	c652  Universal Receiver
+	c654  CadMouse Pro Wireless
+	c657  CadMouse Pro Wireless Left
+2573  ESI Audiotechnik GmbH
+	0017  MAYA22
+2574  AVer Information, Inc.
+	0901  VC520
+	0910  CAM520
+	0920  VC320
+	0930  CAM530
+	0940  CAM340
+	0950  VC322
+	0960  VB342
+2575  Weida Hi-Tech Co., Ltd.
+2576  AFO Co., Ltd.
+	0003  TCM
+	0005  BL [Boot Loader]
+	0011  THM
+2578  Pluscom
+	4168  2.4GHZ Wireless Arc Folding Mouse
+2581  Plug-up
+	1807  Generic HID Smartcard
+	1808  WinUSB Smartcard
+	f1d0  FIDO U2F Security Key
+258d  Sequans Communications
+259a  TriQuint Semiconductor
+25a7  Areson Technology Corp
+	2410  Laser mouse
+	fa23  2.4G Receiver
+	fa61  Elecom Co., Ltd MR-K013 Multicard Reader
+25b5  FlatFrog
+	0002  Multitouch 3200
+25bb  Brunner Elektronik AG
+	0063  PRT.5105 [Yoke]
+	0064  PRT.5105 [reserved]
+	0065  PRT.5096 [Battery Management System]
+	0066  PRT.5096 [Battery Management System]
+	0067  PRT.5094
+	0068  PRT.5094
+	0069  PRT.5119 [Ethernet2CAN LC Gateway]
+	006a  PRT.5113 [CLS CANaerospace Gateway]
+	006b  PRT.5123
+	006c  PRT.5123 [reserved]
+	006d  PRT.5127
+	00ff  MSP430 HID Update Agent
+25bf  Elegant Invention
+	0001  Isostick
+	0002  Isostick updater
+25c4  ARCAM
+25c6  Vitus Audio (AVA Group A/S)
+25c8  Visual Planet Ltd
+	0014  Single User touchfoil(tm) (SU2-80)
+25da  Netatmo
+	0001  Weather Station
+25e3  Lumigon
+25f0  ShanWan
+	c131  Gioteck PS3 2.4G Wireless Controller
+25fb  Pentax Ricoh Imaging Co., Ltd
+	0102  K-5
+2604  Tenda
+	0012  U12
+2625  MilDef AB
+2626  Aruba Networks
+	ea60  UART Bridge Controller [cp210x]
+262a  SAVITECH Corp.
+	100e  SA9027 Audio Streaming Controller
+	10e0  SA9023 Audio Streaming Controller
+	9020  SA9020 audio controller
+	9023  SA9023 audio controller
+	9027  SA9027 audio controller
+	9226  SA9226 192KHz audio controller
+	9227  SA9227 384KHz audio controller
+	9228  SA9228 384KHz/DSD audio controller
 2632  TwinMOS
 	3209  7-in-1 Card Reader
+2639  Xsens
+	0001  MTi-10 IMU
+	0002  MTi-20 VRU
+	0003  MTi-30 AHRS
+	0011  MTi-100 IMU
+	0012  MTi-200 VRU
+	0013  MTi-300 AHRS
+	0017  MTi-G 7xx GNSS/INS
+	0100  Body Pack
+	0101  Awinda Station
+	0102  Awinda Dongle
+	0103  Sync Station
+	0200  MTw
+	0300  Motion Tracker Development Board
+	0301  MTi Converter
+	d00d  Wireless Receiver
+264a  Thermaltake
+	1004  Ventus
 2650  Electronics For Imaging, Inc. [hex]
+	1311  eBeam Classic [Luidia]
+2659  Sundtek
+	1101  TNT DVB-T/DAB/DAB+/FM
+	1201  FM Transmitter/Receiver
+	1202  MediaTV Analog/FM/DVB-T
+	1203  MediaTV Analog/FM/DVB-T MiniPCIe
+	1204  MediaTV Analog/FM/ATSC
+	1205  SkyTV Ultimate V
+	1206  MediaTV DVB-T MiniPCIe
+	1207  Sundtek HD Capture
+	1208  Sundtek SkyTV Ultimate III
+	1209  MediaTV Analog/FM/ATSC MiniPCIe
+	1210  MediaTV Pro III (EU)
+	1211  MediaTV Pro III (US)
+	1212  MediaTV Pro III MiniPCIe (EU)
+	1213  MediaTV Pro III MiniPCIe (US)
+2662  Moog Music Inc.
+266e  Silicon Integrated Systems
+2672  GoPro
+	0004  Hero 3
+	0006  HERO 3+ Silver Edition
+	0007  HERO 3+ Black
+	000e  HERO4 Black
+	0011  Hero 3+ Black
+2676  Basler AG
+	ba02  ace
+	ba03  ba03 dart Vision Caera
+	ba04  ba04 pulse Vision Camera
+	ba05  Vision Camera
+	ba06  Vision Camera
+	ba07  Vision Camera
+	ba08  Vision Camera
+	ba09  Vision Camera
+	ba0a  Vision Camera
+	ba0b  Vision Camera
+	ba0c  Vision Camera
+	ba0d  Vision Camera
+	ba0e  Vision Camera
+	ba0f  Vision Camera
+2685  Cardo Peripheral Systems LTD
+	0900  [Packtalk Bold Bluetooth Motorcycle Intercom]
+2687  Fitbit Inc.
+	fb01  Base Station
+2689  StepOver International GmbH
+	0601  naturaSign Pad POS
+	0901  naturaSign Pad Light
+	0ce1  Pad Vivid US
+	0cf1  Pad Biometric US 5.0
+	0d01  duraSign Pad US 10.0
+	0df1  duraSign Pad Biometric US 10.0
+268b  Dimension Engineering
+	0101  DELink 2
+	0201  Sabertooth 2x32
+	0405  Evolv DNA 200
+	0406  Evolv DNA 200
+	0407  Evolv DNA 200
+	0408  Evolv DNA 75
+	0409  Evolv DNA 250
+	0412  Evolv DNA 60
+	0413  Evolv DNA 200
+	0414  Evolv DNA 250
+	0415  Evolv DNA 75
+	0416  Evolv DNA 60
+	0417  Evolv DNA Go
+	0419  Evolv DNA 250 Color
+	0423  Evolv DNA 200
+	0424  Evolv DNA 250
+	0425  Evolv DNA 75
+	0426  Evolv DNA 60
+	8405  Evolv DNA 200 (recovery mode)
+	8406  Evolv DNA 200 (recovery mode)
+	8407  Evolv DNA 200 (recovery mode)
+	8408  Evolv DNA 75 (recovery mode)
+	8409  Evolv DNA 250 (recovery mode)
+	8412  Evolv DNA 60 (recovery mode)
+	8413  Evolv DNA 200 (recovery mode)
+	8414  Evolv DNA 250 (recovery mode)
+	8415  Evolv DNA 75 (recovery mode)
+	8416  Evolv DNA 60 (recovery mode)
+	8423  Evolv DNA 200 (recovery mode)
+	8424  Evolv DNA 250 (recovery mode)
+	8425  Evolv DNA 75 (recovery mode)
+	8426  Evolv DNA 60 (recovery mode)
+26a9  Research Industrial Systems Engineering
+	0001  Payment Terminal v1.0
+26aa  Yaesu Musen
+	0001  FT-1D
+	000e  FTA-550
+	000f  FTA-750
+26b5  Electrocompaniet
+	0002  ECD 2
+	0003  ECD 2 (Audio Class 1)
+	0004  PI 2D
+	0005  PI 2D (Audio Class 1)
+	0006  ECI 6
+	0007  ECI 6 (Audio Class 1)
+	0020  ECI 80
+26bd  Integral Memory
+	9917  Fusion Flash Drive
+26e2  Ingenieurbuero Dietzsch und Thiele, PartG
+26f2  Micromega
+	0200  MyDac
+2707  Bardac Corporation
+	0005  drive.web
+270d  Rosand Technologies
+	1001  R-Idge Bootloader
+	1002  R-Idge Router
+2717  Xiaomi Inc.
+	0011  100Mbps Network Card Adapter
+	0360  Mi3W
+	0368  Mi4 LTE
+	3801  Mi ANC & Type-C In-Ear Earphones
+	4106  MediaTek MT7601U [MI WiFi]
+	ff08  Redmi Note 3 (ADB Interface)
+	ff10  Mi/Redmi series (PTP)
+	ff18  Mi/Redmi series (PTP + ADB)
+	ff40  Mi/Redmi series (MTP)
+	ff48  Mi/Redmi series (MTP + ADB)
+	ff60  redmi prime 2
+	ff68  Mi-4c
+	ff80  Mi/Redmi series (RNDIS)
+	ff88  Mi/Redmi series (RNDIS + ADB)
+272a  StarLeaf Ltd.
+272c  Signum Systems
+	7d13  I-jet
+2730  Citizen
+	0fff  CT-S2000/4000/310/CLP-521/621/631/CL-S700 Series
+	1004  PPU-700
+	2002  CT-S2000 Thermal Printer (Parallel mode)
+	200f  CT-S310 Label printer
+2735  DigitalWay
+	0003  MPIO HS100
+	1001  MPIO FY200
+	1002  MPIO FL100
+	1003  MPIO FD100
+	1004  MPIO HD200
+	1005  MPIO HD300
+	1006  MPIO FG100
+	1007  MPIO FG130
+	1008  MPIO FY300
+	1009  MPIO FY400
+	100a  MPIO FL300
+	100b  MPIO HS200
+	100c  MPIO FL350
+	100d  MPIO FY500
+	100e  MPIO FY500
+	100f  MPIO FY600
+	1012  MPIO FL400
+	1013  MPIO HD400
+	1014  MPIO HD400
+	1016  MPIO FY700
+	1017  MPIO FY700
+	1018  MPIO FY800
+	1019  MPIO FY800
+	101a  MPIO FY900
+	101b  MPIO FY900
+	102b  MPIO FL500
+	102c  MPIO FL500
+	103f  MPIO FY570
+	1040  MPIO FY570
+	1041  MPIO FY670
+	1042  MPIO FY670
+	1043  HCT HMD-180A
+	1044  HCT HMD-180A
+273f  Hughski Limited
+	1000  ColorHug bootloader
+	1001  ColorHug
+	1002  ColorHug+
+	1003  ColorHug+ Bootloader
+	1004  ColorHug2
+	1005  ColorHug2 bootloader
+2756  Victor Hasselblad AB
+	0002  X1D Camera
+2759  Philip Morris Products S.A.
+	0003  IQOS Pocket Charger 2.4
+2765  Firstbeat Technologies, Ltd.
+	0004  Bodyguard 2
+2766  LifeScan
+	0000  OneTouch Verio
 2770  NHJ, Ltd
+	0a01  ScanJet 4600 series
 	905c  Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35
+	9060  A130
 	9120  Che-ez! Snap / iClick Tiny VGA Digital Camera
+	9130  TCG 501
 	913c  Argus DC-1730
+	9150  Mini Cam
 	9153  iClick 5X
+	915d  Cyberpix S-210S / Little Tikes My Real Digital Camera
+	930b  CCD Webcam(PC370R)
+	930c  CCD Webcam(PC370R)
+27a8  Square, Inc.
+	a120  Contactless + Chip Reader
+27b8  ThingM
+	01ed  blink(1)
+27bd  Codethink Ltd.
+	0001  Slab Node Manager
+	0002  Slab Node Manager JTAG
+27c0  Cadwell Laboratories, Inc.
+	0818  Paperlike HD-FT
+27c6  Shenzhen Goodix Technology Co.,Ltd.
+	5117  Fingerprint Reader
+	5201  Fingerprint Reader
+	5301  Fingerprint Reader
+	530c  Fingerprint Reader
+	532d  Fingerprint
+	5381  Fingerprint Reader
+	5385  Fingerprint Reader
+	538c  Fingerprint Reader
+	5395  Fingerprint Reader
+	5584  Fingerprint Reader
+	55b4  Fingerprint Reader
+	5740  Fingerprint Reader
+27d4  Blackstar Amplification Limited
+27dd  Mindeo
+	0002  Mindeo Virtual COM Port
+27f2  Softnautics LLP
+2803  StarLine LLC.
+	0001  Controller Area Network car alarm module [SLCAN-2]
+2806  SIMPASS
+	0001  N-PASS X1
+2817  Signal Hound, Inc.
+	0002  BB60C Spectrum Analyzer
+	0004  SM200A Spectrum Analyzer
+2818  Codex Digital Limited
+	0001  Transfer Drive Dock
+2821  ASUSTek Computer Inc.
+	0161  WL-161 802.11b Wireless Adapter [SiS 162U]
+	160f  WL-160g 802.11g Wireless Adapter [Envara WiND512]
+	3300  WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3]
+2822  REFLEXdigital
+2833  Oculus VR, Inc.
+	0001  Rift Developer Kit 1
+	0021  Rift DK2
+	0031  Rift CV1
+	0101  Latency Tester
+	0137  Quest Headset
+	0201  Camera DK2
+	0211  Rift CV1 Sensor
+	0330  Rift CV1 Audio
+	1031  Rift CV1
+	2021  Rift DK2
+	2031  Rift CV1
+	3031  Rift CV1
+2836  OUYA
+286b  STANEO SAS
+	0003  D6BB/D9 seismic digitizer
+2886  Seeed Technology Co., Ltd.
+	0002  Seeeduino Lite
+2890  Teknic, Inc
+	0213  ClearPath 4-axis Comm Hub
 2899  Toptronic Industrial Co., Ltd
+	012c  Camera Device
+289b  Dracal/Raphnet technologies
+	0001  Gamecube/N64 controller v2.2
+	0002  2nes2snes
+	0003  4nes4snes
+	0004  Gamecube/N64 controller v2.3
+	0005  Saturn (Joystick mode)
+	0006  Saturn (Mouse mode)
+	0007  Famicom controller
+	0008  Dreamcast (Joystick mode)
+	0009  Dreamcast (Mouse mode)
+	000a  Dreamcast (Keyboard mode)
+	000b  Gamecube/N64 controller v2.9 (Keyboard mode)
+	000c  Gamecube/N64 controller v2.9 (Joystick mode)
+	000e  VirtualBoy controller
+	0010  WUSBMote v1.2 (Joystick mode)
+	0011  WUSBMote v1.2 (Mouse mode)
+	0012  WUSBMote v1.2.1 (Joystick mode)
+	0013  WUSBMote v1.2.1 (Mouse mode)
+	0014  WUSBMote v1.3 (Joystick mode)
+	0015  WUSBMote v1.3 (Mouse mode)
+	0016  WUSBMote v1.3 (I2C interface mode)
+	0017  Gamecube/N64 controller v3.0
+	0018  Atari Jaguar controller
+	0019  MultiDB9joy v3
+	001a  MultiDB9joy v3 (multitap mode)
+	0100  Dual-relay board
+	0500  Energy meter
+	0502  Precision barometer
+289d  Seek Thermal, Inc.
+	0010  PIR206 Thermal Camera [Seek Compact]
+28bd  XP-Pen
+	0920  Star G960 Graphic Tablet
+28c7  Ultimaker B.V.
+	0001  3D printer serial interface
+28d4  Devialet
+	0008  120/200/250/400/800/D-Premier
+28de  Valve Software
+	1102  Wired Controller
+	1142  Wireless Steam Controller
+	2000  Lighthouse FPGA RX
+	2012  Virtual Reality Controller [VRC]
+	2101  Watchman Dongle
+	2500  Lighthouse Base Station
+28e0  PT. Prasimax Inovasi Teknologi
+	1001  BTS Monitoring Config for Prototype
+	5740  TRUMON TS-107
+	5741  TRUMON TS-108
+28e9  GDMicroelectronics
+	0189  GD32 DFU Bootloader (Longan Nano)
+28f3  Clover Network, Inc.
+	2000  Mobile Wi-Fi (C200)
+	3000  Mini
+	4000  Flex
+28f9  Profitap HQ BV
+	0001  Profishark 1G Black
+	0003  Profishark 1G+
+	0004  Profishark 1G
+	0005  Profishark 10G
+	0006  Profishark 100M
+290c  R. Hamilton & Co. Ltd.
+	4b4d  Mercury iPod Dock
+2912  Audioengine
+	20c8  D1 24-bit DAC
+	30c8  D1 24-bit DAC
+2916  Yota Devices
+2931  Jolla Oy
+	0a01  Jolla Phone MTP
+	0a02  Jolla Phone Developer
+	0a05  Jolla PC connection
+	0a07  Phone MTP
+	0afe  Jolla charging only
+2939  Zaber Technologies Inc.
+	4959  A-MCB2
+	495a  X-MCB1
+	495b  X-MCB2
+	49b1  X-MCB1
+	49b2  X-MCB2
+	49c1  X-MCC1
+	49c2  X-MCC2
+	49c3  X-MCC3
+	49c4  X-MCC4
+2957  Obsidian Research Corporation
+	0001  Management Console
+2961  Miselu
+	0001  C.24 keyboard
+296b  Xacti Corporation
+	3917  CX-WE100 Camera
+2972  FiiO Electronics Technology
+	0007  X3 2nd gen audio player / DAC
+298d  Next Biometrics
+	2020  NB-2020-U Fingerprint Reader
+29bd  Silicon Works
+	4101  Multi-touch Device
+29c1  Taztag
+	1105  M17-G903-1 [Tazpad]
+	1107  M17-G903-A [Tazpad] (CCID)
+29c2  Lewitt GmbH
+	0001  DGT 650
+	0003  DGT 450
+	0009  DGT 260
+	0011  Stream 4x5
+29c3  Noviga
+29e2  Huatune Technology (Shanghai) Co., Ltd.
+29e7  Brunel University
+29e8  4Links Limited
+29ea  Kinesis Corporation
+	0102  Advantage2 Keyboard
+29f1  Canaan Creative Co., Ltd
+	33f1  Avalon nano 1.0
+	33f2  Avalon USB2IIC Converter
+	33f3  Avalon nano 2.0
+	40f1  Avalon4 mini
+2a03  dog hunter AG
+	0001  Linino ONE (bootloader)
+	0036  Arduino Leonardo (bootloader)
+	0037  Arduino Micro (bootloader)
+	0038  Arduino Robot Control (bootloader)
+	0039  Arduino Robot Motor (bootloader)
+	003a  Arduino Micro ADK rev3 (bootloader)
+	003b  Arduino usb2serial
+	003c  Arduino Explora (bootloader)
+	003d  Arduino Due (usb2serial)
+	003e  Arduino Due
+	0041  Arduino Yun (bootloader)
+	0042  Arduino Mega 2560 Rev3
+	0043  Arduino Uno Rev3
+	004d  Arduino Zero Pro (bootloader)
+	8001  Linino ONE (CDC ACM)
+	8036  Arduino Leonardo (CDC ACM)
+	8037  Arduino Micro (CDC ACM)
+	8038  Arduino Robot Control (CDC ACM)
+	8039  Arduino Robot Motor (CDC ACM)
+	803a  Arduino Micro ADK rev3 (CDC ACM)
+	803c  Arduino Explora (CDC ACM)
+	8041  Arduino Yun (CDC ACM)
+	804d  Arduino Zero Pro (CDC ACM)
+2a0e  Shenzhen DreamSource Technology Co., Ltd.
+2a13  Grabba International
+	0000  S-Series data capture device
+2a19  Numato Systems Pvt. Ltd
+	1002  Mimas V2 Spartan6 FPGA Development Board
+	5440  TimVideos' HDMI2USB Opsis (FX2) - Unconfigured device
+	5441  TimVideos' HDMI2USB Opsis (FX2) - Firmware load/upgrade
+	5442  TimVideos' HDMI2USB Opsis (FX2) - HDMI/DVI Capture Device
+2a1d  Oxford Nanopore Technologies, Ltd
+	0000  MinION
+	0001  MinION
+	0010  VolTRAX
+	0011  VolTRAX
+	0020  GridION
+	0021  GridION
+2a37  RTD Embedded Technologies, Inc.
+	5110  UPS35110/UPS25110
+2a39  RME
+	3fb0  Babyface Pro (Class Compliant Mode)
+	3fc0  Babyface Pro
+	3fc1  Fireface UFX+
+	3fc2  Fireface UFX+
+	3fd1  Fireface UFX+
+2a3c  Trinamic Motion Control GmbH & Co KG
+	0100  Stepper Device
+	0200  BLDC/PMSM Device
+	0300  Motor Control Device
+	0400  Motor Control Device
+	0500  PANdrive(TM)
+	0600  motionCookie(TM)
+	0700  Evaluation Device
+	0800  Interface Device
+	0900  Generic Device
+2a45  Meizu Corp.
+	0001  MX Phone (BICR)
+	0c02  MX Phone (MTP & ADB)
+	0c03  MX Phone (BICR & ADB)
+	2008  MX Phone (MTP)
+	200a  MX Phone (MTP & ACM & ADB)
+	200b  MX Phone (PTP)
+	200c  MX Phone (PTP & ADB)
+	2012  MX Phone (MTP & ACM)
+2a47  Mundo Reader, S.L.
+	0c02  bq Aquaris E4.5
+	201d  Tablet Edison 3
+	903a  bq Aquaris U
+2a4b  EMULEX Corporation
+	0400  Pilot4 Integrated Hub
+2a62  Flymaster Avionics
+	b301  LiveSD
+	b302  NavSD
+2a6e  Bare Conductive
+	0003  Touch Board
+	8003  Touch Board
+2a70  OnePlus Technology (Shenzhen) Co., Ltd.
+	4ee7  ONEPLUS A3010 [OnePlus 3T] / A5010 [OnePlus 5T] / A6003 [OnePlus 6] (Charging + USB debugging modes)
+	904d  A3000 phone (PTP mode) [3T]
+	904e  A3000 phone (PTP mode, with debug) [3T]
+2a88  DFU Technology Ltd
+	ffff  DFU
+2a8d  Keysight Technologies, Inc.
+2ab6  T+A elektroakustik GmbH & Co KG, Germany
+	0001  PDP3000HV DAC
+	0002  MP1000E, MP2000R, MP2500R, MP3100HV
+	0003  TA HD AUDIO V2
+2ac7  Ultrahaptics Ltd.
+	0101  Evaluation Kit [Dragonfly]
+	0102  UHDK5
+	0104  Touchbase
+	0110  STRATOS Explore
+	0111  STRATOS Explore DFU
+	0112  STRATOS Inspire
+	0113  STRATOS Inspire DFU
+	ffff  DFU
+2ad1  Picotronic GmbH
+	7ab8  Turningtable
+2ae5  Fairphone B.V.
+	9015  2 (Mass storage & ADB)
+	9024  2 (RNDIS & ADB)
+	9039  2 (MTP & ADB)
+	904d  2 (PTP)
+	904e  2 (PTP & ADB)
+	90de  2 (Charging)
+	f000  2 (Mass storage)
+	f003  2 (MTP)
+	f005  2 (tethering)
+	f00e  2 (RNDIS)
+2aec  Ambiq Micro, Inc.
+	6011  Converter
+2af4  ROLI Ltd.
+	0100  Seaboard GRAND
+	0200  Seaboard RISE
+	0300  BlueWing Proto
+	0400  VOICE
+	0500  BLOCKS
+2b03  STEREOLABS
+	f580  ZED camera
+	f582  ZED camera
+	f680  ZED-M camera
+	f681  ZED-M HID Interface
+	f682  ZED-M camera
+	f683  ZED-M HID Interface
+	f684  ZED-M camera
+2b0e  LeEco
+	171b  Le2
+	171e  Le2 in USB tethering mode
+	1830  Le1 Pro
+	1844  Le Max2
+	2b0e  LeEco
+	6108  Lex720 [LePro 3] in connection sharing usb
+	610b  Lex720 [LePro 3] in Camera mode
+	610c  Lex720 [LePro 3]
+	610d  Lex720 [LePro 3] in debug
+2b23  Red Hat, Inc.
+	cafe  UsbDk (USB Development Kit)
+2b24  KeepKey LLC
+	0001  Bitcoin Wallet [KeepKey]
+	0002  Bitcoin Wallet
+2b3e  NewAE Technology Inc.
+	ace2  CW1173 [ChipWhisperer-Lite]
+2b4c  ZUK
+	1004  Z1 MTP
+2bc5  Orbbec 3D Technology International, Inc
+	0401  Astra
+	0403  Astra Pro
+	0407  Astra Mini S
+2bcc  InoTec GmbH Organisationssysteme
+2bd6  Coroware, Inc.
+	4201  RS-485 Controller and Interface [Cypress Semiconductor]
+2bd8  ROPEX Industrie-Elektronik GmbH
+2c02  Planex Communications
+	14ea  GW-US11H WLAN
+2c1a  Dolphin Peripherals
+	0000  Wireless Optical Mouse
+2c23  Supermicro Computer Incorporated
+	1b83  NIC
+2c4e  Mercucys INC
+	0100  MW300UM RTL8192EU wifi
+2c4f  Canon Electronic Business Machines Co., Ltd.
+	3003  PR Wireless Presenter
+2c55  Magic Leap, Inc.
+	a100  ML1 Lightpack (MLDB)
+	b100  ML1 Lightpack (fastboot)
+	c001  ML1 Control (COM)
+	c002  ML1 Control (Bootloader)
+2c7c  Quectel Wireless Solutions Co., Ltd.
+	0121  EC21 LTE modem
+	0125  EC25 LTE modem
+	0191  EG91 LTE modem
+	0195  EG95 LTE modem
+	0296  BG96 CAT-M1/NB-IoT modem
+	0306  EG06/EP06/EM06 LTE-A modem
+	0435  AG35 LTE modem
+2c97  Ledger
+	0000  Blue
+	0001  Nano S
+	0004  Nano X
+2c99  Prusa
+	0001  i3 MK2S
+2c9c  Vayyar Imaging Ltd.
+	1000  Walabot Makers Series
+	1020  Walabot DIY
+	1022  Walabot DIY Plus
+	1030  Walabot Home (vHC)
+	9100  VNAKit
+2c9d  Nod Inc
+	90a0  Goa
+	bac5  Backspin
+2ca3  DJI Technology Co., Ltd.
+	0008  Mavic Mini MR1SD25 Remote controller
+2cb7  Fibocom
+	0210  L830-EB-00 LTE WWAN Modem
+2cc0  Hangzhou Zero Zero Infinity Technology Co., Ltd.
+2cc2  Lautsprecher Teufel GmbH
+2ccf  Hypersecu
+	0880  HyperFIDO
+2cd9  Cambrionix Ltd
+	0804  PowerSync4 USBPD Hub
+2cdc  Sea & Sun Technology GmbH
+	f232  CTD48Mc CTD Probe
+2ce5  InX8 Inc [AKiTiO]
+	0014  Mass Storage [NT2 U31C]
+2cf0  Nuand LLC
+	5246  bladeRF
+	5250  bladeRF 2.0 micro
+2d1f  Wacom Taiwan Information Co. Ltd.
+2d25  Kronegger GmbH.
+2d2d  proxmark.org
+	504d  Proxmark3
+2d37  Zhuhai Poskey Technology Co.,Ltd
+2d6b  NetUP Inc.
+	7777  Joker TV universal DTV receiver
+2d81  Evollve Inc.
+	4f01  Ozobot Evo
+2d84  Zhuhai Poskey Technology Co.,Ltd
+	b806  DT-108B Thermal Label Printer
+2dc8  8BitDo
+	5006  M30 Bluetooth gamepad
+	5750  Bootloader
+	6000  SF30 Pro gamepad
+	6001  SN30/SF30 Pro gamepad
+	ab11  F30 gamepad
+	ab12  N30 gamepad
+	ab20  SN30/SF30 gamepad
+	ab21  SF30 gamepad
+2dcf  Dialog Semiconductor
+	c951  Audio Class 1.0 Devices
+	c952  Audio Class 2.0 Devices
+2def  Kirale Technologies
+	0000  KiNOS Boot DFU
+	0102  KTWM102 Module
+2df2  LIPS Corporation
+	0213  LIPSedge DL 3D ToF Camera
+	0215  LIPSedge DL RGB Camera
+	2102  LIPSedge 5 Megapixel RGB Camera
+2e04  HMD Global
+	0001  Nokia 3310 3G
+	0002  Nokia 3310 3G
+	0a14  Nokia 3310 3G
+	c008  Tethering Network Interface
+	c009  Nokia 1 (bootloader)
+	c025  Nokia 8 (MTP mode)
+	c026  Nokia Smartphone
+	c029  Nokia 8 (PTP mode)
+	c031  Nokia 1 (PTP)
+	c03f  Nokia 8 (MIDI mode)
+2e0e  Hatteland Display AS
+	0001  CAN Gateway
+2e24  Hyperkin
+	0652  Duke Xbox One controller
+	1688  X91 Xbox One controller
+2e3b  uSens Inc.
+2e57  MEGWARE Computer Vertrieb und Service GmbH
+	454d  SlideSX EnergyMeter
+	454e  SlideSX EnergyMeter DFU
+	5cba  SlideSX / ClustSafe Bus Adapter
+2e69  Swift Navigation
+	1001  Piksi Multi
+2e95  SCUF Gaming
+	7725  Controller
+2f76  KeyXentic Inc.
+	0905  KX905 Smart Terminal
+	0906  KX906 Smart Card Reader
+	1906  KX906 Smart Token (Mass Storage)
+2fad  Definium Technologies
+2fb0  Infocrypt
 2fb2  Fujitsu, Ltd
+2fc0  Sensidyne, LP
+	0001  Project Archer
+2fc6  Comtrue Inc.
+	6012  UAC2 Device GB
+2fe0  Xaptum, Inc.
+	8b01  XAP-RC-001 ENF Router Card
+	8b02  XAP-RW-001 ENF Router Card with WiFi
+	8bde  XAP-EA-002 ENF Access Card
+	8bee  XAP-EA-003 ENF Access Card
+2fe3  NordicSemiconductor
+2fe7  ELGIN S.A.
+	0001  SMART S@T
+2feb  Beijing Veikk E-Commerce Co., Ltd.
+	0004  Veikk A15 Pen Tablet
+2ff4  Quixant Plc
+3016  Boundary Devices, LLC
+	0001  Nitrogen Bootloader
+3036  Control iD
+	0001  Print iD
+	0002  iDBio
+3037  Beijing Chushifengmang Technology Development Co.,Ltd.
+3057  Kingsis Corporation
+	0002  ZOWIE Gaming mouse
+308f  Input Club
+	0000  Infinity 60% Bootloader
+	0001  Infinity 60% - Standard
+	0002  Infinity 60% - Hacker
+	0003  Infinity Ergodox Bootloader
+	0004  Infinity Ergodox
+	0005  WhiteFox Bootloader
+	0006  WhiteFox - Vanilla
+	0007  WhiteFox - ISO
+	0008  WhiteFox - Aria
+	0009  WhiteFox - Winkeyless
+	000a  WhiteFox - True Fox
+	000b  WhiteFox - Jack of All Trades
+	000c  Infinity 60% LED Bootloader
+	000d  Infinity 60% LED - Standard
+	000e  Infinity 60% LED - Hacker
+	000f  Infinity 60% LED - Alphabet
+	0010  K-Type Bootloader
+	0011  K-Type
+	0012  Kira Bootloader
+	0013  Kira
+	0014  Gemini Dawn/Dusk Bootloader
+	0015  Gemini Dawn/Dusk
+	0016  Re:Type Bootloader
+	0017  Re:Type
+	0018  Re:Type USB Hub
+	0019  WhiteFox (SAM4S) Bootloader
+	001a  WhiteFox (SAM4S) - Vanilla
+	001b  WhiteFox (SAM4S) - ISO
+	001c  WhiteFox (SAM4S) - Aria
+	001d  WhiteFox (SAM4S) - Winkeyless
+	001e  WhiteFox (SAM4S) - True Fox
+	001f  WhiteFox (SAM4S) - Jack of All Trades
+30a4  Blues Wireless
+	0001  Notecard
+30c2  UNPARALLEL Innovation, Lda
+	1388  SPL Meter
+30c9  Luxvisions Innotech Limited
+30ee  Fujitsu Connected Technologies Limited
+	1001  F-01L
+30f2  Varex Imaging
+3111  Hiperscan GmbH
+	0000  SGS-NT Microspectrometer
+3112  Meteca SA
+	0001  MBC-WB01 (CDC-ACM)
+	0002  MBC-WB01 (Bootloader)
+	0003  ABC (CDC ACM)
+	0004  ABC (Bootloader)
 3125  Eagletron
 	0001  TrackerPod Camera Stand
+3136  Navini Networks
+3145  SafeLogic Inc.
+3147  Tanvas, Inc.
+316c  SigmaSense, LLC
+316d  Purism, SPC
+	4c4b  Librem Key
+316e  SPECINFOSYSTEMS
+	0001  DIAMOND token
+3171  8086 Consultancy
+	0011  ClusterCTRL DA
+	0012  ClusterCTRL pHAT
+	0013  ClusterCTRL A+6
+	0014  ClusterCTRL Triple
+	0015  ClusterCTRL Single
 3176  Whanam Electronics Co., Ltd
+3195  Link Instruments
+	f190  MSO-19
+	f280  MSO-28
+	f281  MSO-28
+31c9  BeiJing LanXum Computer Technology Co., Ltd.
+	1001  Printer
+	1301  Black and White Laser Printer
+	1501  LaserPrint GA50 series
+3200  Alcatel-Lucent Enterprise
+	2100  ALE 8058s
+	2101  ALE 8068s
+	2102  8078s
+3219  Smak Tecnologia e Automacao LTDA
+	0044  SKO44 Optical Keyboard
+321c  Premio, Inc.
+324c  CUPRIS Ltd.
+326d  Agile Display Solutions Co., Ltd
+	0001  Avocor USB Camera
+3275  VidzMedia Pte Ltd
+	4fb1  MonsterTV P2H
+3293  Unhuman Inc.
+32b3  TEXA
+	d1a6  TXT Multihub
+	d1a7  TXT Multihub
+3310  MUDITA Sp. z o.o.
+	0100  Pure
+	0101  Pure tethering
+3333  InLine
+	3333  2 port KVM switch model 60652K
+3334  AEI
+	1701  Fast Ethernet
 3340  Yakumo
+	043a  Mio A701 DigiWalker PPCPhone
 	0e3a  Pocket PC 300 GPS SL / Typhoon MyGuide 3500
+	a0a3  deltaX 5 BT (D) PDA
+	ffff  Mio DigiWalker Sync
+3344  Leaguer Microelectronics (LME)
+	3744  OEM PC Remote
+3384  System76
+	0000  Thelio Io (thelio-io)
+	0001  Launch Configurable Keyboard (launch_1)
+348f  ISY
+	2322  Wireless Presenter
 3504  Micro Star
 	f110  Security Key
 3538  Power Quotient International Co., Ltd
 	0001  Travel Flash
+	0015  Mass Storge Device
+	0022  Hi-Speed Mass Storage Device
 	0042  Cool Drive U339 Flash Disk
+	0054  Flash Drive (2GB)
+	0901  Traveling Disk U273 (4GB)
 3579  DIVA
 	6901  Media Reader
+357d  Sharkoon
+	7788  JMicron JMS567 ATA/ATAPI Bridge
 3636  InVibro
+3767  Fanatec
+	0101  Speedster 3 Forceshock Wheel
 3838  WEM
 	0001  5-in-1 Card Reader
+	1031  2.4G Wireless Mouse
 3923  National Instruments Corp.
+	12c0  DAQPad-6020E
+	12d0  DAQPad-6507
+	12e0  NI 4350
+	12f0  NI 5102
+	1750  DAQPad-6508
+	17b0  USB-ISA-Bridge
+	1820  DAQPad-6020E (68 pin I/O)
+	1830  DAQPad-6020E (BNC)
+	1f00  DAQPad-6024E
+	1f10  DAQPad-6024E
+	1f20  DAQPad-6025E
+	1f30  DAQPad-6025E
+	1f40  DAQPad-6036E
+	1f50  DAQPad-6036E
+	2f80  DAQPad-6052E
+	2f90  DAQPad-6052E
+	702a  GPIB-USB-B
+	702b  GPIB-USB-B Initialization
 	703c  USB-485 RS485 Cable
+	709b  GPIB-USB-HS
+	7166  USB-8451
+	716e  USB-8451 Firmware Loader
+	717a  USB-6008
+	717b  USB-6009
+	71d6  USB-6008 OEM
+	71d7  USB-6009 OEM
+	71d8  USB-6009 OEM
+	7254  NI MIO (data acquisition card) firmware updater
+	729e  USB-6251 (OEM) data acquisition card
+	7346  USB-6229
+	755b  myDAQ
+	76af  USB-6000
+	76b0  USB-6000 OEM
+	76bf  USB-6001
+	76c0  USB-6001 OEM
+	76c4  USB-6002
+	76c5  USB-6002 OEM
+	76c6  USB-6003
+	76c7  USB-6003 OEM
+40bb  I-O Data
+	0a09  USB2.0-SCSI Bridge USB2-SC
+4101  i-rocks
+	1301  IR-2510 usb phone
 4102  iRiver, Ltd.
 	1001  iFP-100 series mp3 player
 	1003  iFP-300 series mp3 player
 	1005  iFP-500 series mp3 player
 	1007  iFP-700 series mp3/ogg vorbis player
 	1008  iFP-800 series mp3/ogg vorbis player
-	100A  iFP-1000 series mp3/ogg vorbis player
+	100a  iFP-1000 series mp3/ogg vorbis player
+	1014  T20 series mp3/ogg vorbis player (ums firmware)
+	1019  T30
+	1034  T60
+	1040  M1Player
+	1041  E100 (ums)
 	1101  iFP-100 series mp3 player (ums firmware)
 	1103  iFP-300 series mp3 player (ums firmware)
 	1105  iFP-500 series mp3 player (ums firmware)
 	1113  T10 (alternate)
 	1117  T10
 	1119  T30 series mp3/ogg/wma player
+	1141  E100 (mtp)
+	2002  H10 6GB
+	2101  H10 20GB (mtp)
+	2102  H10 5GB (mtp)
+	2105  H10 5/6GB (mtp)
 413c  Dell Computer Corp.
+	0000  DRAC 5 Virtual Keyboard and Mouse
+	0001  DRAC 5 Virtual Media
+	0058  Port Replicator
+	1001  Keyboard Hub
 	1002  Keyboard Hub
+	1003  Keyboard Hub
+	1005  Multimedia Pro Keyboard Hub
+	2001  Keyboard HID Support
 	2002  SK-8125 Keyboard
+	2003  Keyboard SK-8115
 	2005  RT7D50 Keyboard
+	2010  Keyboard
+	2011  Multimedia Pro Keyboard
 	2100  SK-3106 Keyboard
-	2101  SmartCard Reader Keyboard
+	2101  SK-3205 SmartCard Reader Keyboard
+	2105  Model L100 Keyboard
+	2106  QuietKey Keyboard
+	2107  KB212-B Quiet Key Keyboard
+	2113  KB216 Wired Keyboard
+	2134  Hub of E-Port Replicator
+	21d7  Dell Wireless 5560 HSPA+ Mobile Broadband Modem
 	2500  DRAC4 Remote Access Card
+	2501  Keyboard and mouse dongle
+	2513  internal USB Hub of E-Port Replicator
 	3010  Optical Wheel Mouse
+	3012  Optical Wheel Mouse
+	3016  Optical 5-Button Wheel Mouse
+	301a  Dell MS116 Optical Mouse
+	301b  Universal Bluetooth Receiver
+	3200  Mouse
 	4001  Axim X5
 	4002  Axim X3
 	4003  Axim X30
-	8100  TrueMobile 1180 802.11b Adapter
+	4004  Axim Sync
+	4005  Axim Sync
+	4006  Axim Sync
+	4007  Axim Sync
+	4008  Axim Sync
+	4009  Axim Sync
+	4011  Axim X51v
+	5103  AIO Printer A940
+	5105  AIO Printer A920
+	5107  AIO Printer A960
+	5109  Photo AIO Printer 922
+	5110  Photo AIO Printer 962
+	5111  Photo AIO Printer 942
+	5112  Photo AIO Printer 924
+	5113  Photo AIO Printer 944
+	5114  Photo AIO Printer 964
+	5115  Photo AIO Printer 926
+	5116  AIO Printer 946
+	5117  Photo AIO Printer 966
+	5118  AIO 810
+	5124  Laser MFP 1815
+	5128  Photo AIO 928
+	5133  968 AIO Printer
+	5200  Laser Printer
+	5202  Printing Support
+	5203  Printing Support
+	5210  Printing Support
+	5211  1110 Laser Printer
+	5220  Laser MFP 1600n
+	5225  Printing Support
+	5226  Printing Support
+	5228  Laser Printer 1720dn
+	5300  Laser Printer
+	5400  Laser Printer
+	5401  Laser Printer
+	5404  1250c Color Printer
+	5513  WLA3310 Wireless Adapter [Intersil ISL3887]
+	5534  Hub of E-Port Replicator
+	5601  Laser Printer 3100cn
+	5602  Laser Printer 3000cn
+	5607  MFP Color Laser Printer 3115cn
+	5631  Laser Printer 5100cn
+	564a  C1765 series Multifunction Color LaserPrinter, Scanner & Copier
+	5905  Printing Support
+	8000  BC02 Bluetooth Adapter
+	8010  TrueMobile Bluetooth Module in
+	8100  TrueMobile 1180 802.11b Adapter [Intersil PRISM 3]
+	8102  TrueMobile 1300 802.11g Wireless Adapter [Intersil ISL3880]
 	8103  Wireless 350 Bluetooth
+	8104  Wireless 1450 Dual-band (802.11a/b/g) Adapter [Intersil ISL3887]
+	8105  U2 in HID - Driver
+	8106  Wireless 350 Bluetooth Internal Card in
+	8110  Wireless 3xx Bluetooth Internal Card
+	8111  Wireless 3xx Bluetooth Internal Card in
+	8114  Wireless 5700 Mobile Broadband (CDMA EV-DO) Minicard Modem
+	8115  Wireless 5500 Mobile Broadband (3G HSDPA) Minicard Modem
+	8116  Wireless 5505 Mobile Broadband (3G HSDPA) Minicard Modem
+	8117  Wireless 5700 Mobile Broadband (CDMA EV-DO) Expresscard Modem
+	8118  Wireless 5510 Mobile Broadband (3G HSDPA) Expresscard Status Port
+	8120  Bluetooth adapter
+	8121  Eastfold in HID
+	8122  Eastfold in DFU
+	8123  eHome Infrared Receiver
+	8124  eHome Infrared Receiver
+	8126  Wireless 355 Bluetooth
+	8127  Wireless 355 Module with Bluetooth 2.0 + EDR Technology.
+	8128  Wireless 5700-Sprint Mobile Broadband (CDMA EV-DO) Mini-Card Status Port
+	8129  Wireless 5700-Telus Mobile Broadband (CDMA EV-DO) Mini-Card Status Port
+	8131  Wireless 360 Bluetooth 2.0 + EDR module.
+	8133  Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port
+	8134  Wireless 5720 Sprint Mobile Broadband (EVDO Rev-A) Minicard Status Port
+	8135  Wireless 5720 TELUS Mobile Broadband (EVDO Rev-A) Minicard Diagnostics Port
+	8136  Wireless 5520 Cingular Mobile Broadband (3G HSDPA) Minicard Diagnostics Port
+	8137  Wireless 5520 Voda L Mobile Broadband (3G HSDPA) Minicard Status Port
+	8138  Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard EAP-SIM Port
+	8140  Wireless 360 Bluetooth
+	8142  Mobile 360 in DFU
+	8143  Broadcom BCM20702A0 Bluetooth
+	8147  F3507g Mobile Broadband Module
+	8156  Wireless 370 Bluetooth Mini-card
+	8157  Integrated Keyboard
+	8158  Integrated Touchpad / Trackstick
+	8160  Wireless 365 Bluetooth
+	8161  Integrated Keyboard
+	8162  Integrated Touchpad [Synaptics]
+	8171  Gobi Wireless Modem (QDL mode)
+	8172  Gobi Wireless Modem
+	8183  F3607gw Mobile Broadband Module
+	8184  F3607gw v2 Mobile Broadband Module
+	8185  Gobi 2000 Wireless Modem (QDL mode)
+	8186  Gobi 2000 Wireless Modem
+	8187  DW375 Bluetooth Module
+	818e  DW5560 miniPCIe HSPA+ Mobile Broadband Modem
+	8197  BCM20702A0 Bluetooth Module
+	81a0  Wireless 5808 Mobile Broadband (Sierra Wireless MC7355 Mini PCIE, 4G UMTS,HSDPA,HSPA+,LTE,1xRTT,EVDO Rev A,GSM,GPRS)
+	81a3  Hub of E-Port Replicator
+	81a8  Wireless 5808 Mobile Broadband (Sierra Wireless Mini PCIE, 4G UMTS,HSDPA,HSPA+,LTE,1xRTT,EVDO Rev A,GSM,GPRS)
+	8501  Bluetooth Adapter
+	9001  ATA Bridge
+	9009  Portable Device
+	9500  USB CP210x UART Bridge Controller [DW700]
 	a001  Hub
+	a005  Internal 2.0 Hub
+	a101  Internal Dual SD Card module
+	a102  iDRAC Virtual NIC
+	a503  AC511 Sound Bar
 	a700  Hub (in 1905FP LCD Monitor)
-4242  USB Design by Example
-	4201  Buttons and Lights HID device
-	4220  Echo 1 Camera
+	b007  Streak 5 Android Tablet
 4146  USBest Technology
 	9281  Iomega Micro Mini 128MB Flash Drive
 	ba01  Intuix Flash Drive
+4168  Targus
+	1010  Wireless Compact Laser Mouse
+4242  USB Design by Example
+	4201  Buttons and Lights HID device
+	4220  Echo 1 Camera
+4255  GoPro
+	1000  9FF2 [Digital Photo Display]
+	2000  HD2-14 [Hero 2 Camera]
+4317  Broadcom Corp.
+	0700  U.S. Robotics USR5426 802.11g Adapter
+	0701  U.S. Robotics USR5425 Wireless MAXg Adapter
+	0711  Belkin F5D7051 v3000 802.11g
+	0720  Dynex DX-BUSB
+	0721  Dynex DX-EBUSB
+4348  WinChipHead
+	5523  USB->RS 232 adapter with Prolific PL 2303 chipset
+	5537  13.56Mhz RFID Card Reader and Writer
+	5584  CH34x printer adapter cable
 4572  Shuttle, Inc.
 	4572  Shuttle PN31 Remote
 4586  Panram
 	1026  Crystal Bar Flash Drive
 4670  EMS Production
 	9394  Game Cube USB Memory Adaptor 64M
+46f4  QEMU
+4752  Miditech
+	0011  Midistart-2
+4757  GW Instek
+	2009  PEL-2000 Series Electronic Load (CDC)
+	2010  PEL-2000 Series Electronic Load (CDC)
+4766  Aceeca
+	0001  MEZ1000 RDA
+4855  Memorex
+	7288  Ultra Traveldrive 160G 2.5" HDD
+4971  SimpleTech
+	1004  Hitachi LifeStudio Desk (3.5" HDD) [w/o flash key]
+	1013  Touro Desk Pro
+	1015  Touro Desk 3.0
+	8001  G-Tech G-DRIVE Mobile
+	cb01  SP-U25/120G
+	cd15  Simple Drive Mini (2.5" HDD)
+	ce07  SimpleDrive (3.5" HDD)
+	ce12  FV-U35
+	ce17  1TB SimpleDrive II USB External Hard Drive
+	ce18  (re)Drive
+	ce21  JMicron JM20329 SATA Bridge [eg. HITACHI SimpleDrive mini]
+	ce22  Hitachi SimpleTough (3.5" HDD)
+4d46  Musical Fidelity
+	0001  V-Link
+	0002  V-DAC II
 5032  Grandtec
 	0bb8  Grandtec USB1.1 DVB-T (cold)
 	0bb9  Grandtec USB1.1 DVB-T (warm)
 	0fa0  Grandtec USB1.1 DVB-T (cold)
 	0fa1  Grandtec USB1.1 DVB-T (warm)
-5041  Linksys (?)
-	2234  WUSB54G 802.11g Adapter
+50c2  Averatec (?)
+	4013  WLAN Adapter
+5131  MSR
+	2007  MSR-101U Mini HID magnetic card reader
+5173  Sweex
+	1809  ZD1211
+5219  I-Tetra
+	1001  Cetus CDC Device
+5332  Clearly Superior Technologies, Inc.
+	1300  CST2545-5W (L-Trac)
+5345  Owon
+	1234  PDS6062T Oscilloscope
+534c  SatoshiLabs
+	0001  Bitcoin Wallet [TREZOR]
+	0002  Bitcoin Wallet [TREZOR v2]
+534d  MacroSilicon
+	0021  MS210x Video Grabber [EasierCAP]
+	6021  VGA Display Adapter
+5354  Meyer Instruments (MIS)
+	0017  PAXcam2
 544d  Transmeta Corp.
 5543  UC-Logic Technology Corp.
 	0002  SuperPen WP3325U Tablet
-	0004  Genius MousePen 5x4 Tablet
+	0003  Tablet WP4030U
+	0004  Tablet WP5540U
+	0005  Tablet WP8060U
+	0041  Genius PenSketch 6x8 Tablet
+	0042  Tablet PF1209
+	004a  XP-Pen Artist 10S tablet
+	004d  Tablet Monitor MSP19U
+	0064  Aiptek HyperPen 10000U
+	3031  Graphics tablet [DrawImage G3, Ugee G3]
+5555  Epiphan Systems Inc.
+	1110  VGA2USB
+	1120  KVM2USB
+	2222  DVI2USB
+	3333  VGA2USB Pro
+	3337  KVM2USB Pro
+	3340  VGA2USB LR
+	3344  KVM2USB LR
+	3411  DVI2USB Solo
+	3422  DVI2USB Duo
+	3500  DVI2USB3
+	3501  DVI2USB3 Rev3
+	3510  DVI2USB3_ET
+	3520  SDI2USB3
 55aa  OnSpec Electronic, Inc.
+	0015  Hard Drive
+	0102  SuperDisk
+	0103  IDE Hard Drive
+	0201  DDI to Reader-19
 	1234  ATAPI Bridge
 	a103  Sandisk SDDR-55 SmartMedia Card Reader
+	b000  USB to CompactFlash Card Reader
+	b004  OnSpec MMC/SD Reader/Writer
+	b00b  USB to Memory Stick Card Reader
+	b00c  USB to SmartMedia Card Reader
 	b012  Mitsumi FA402M 8-in-2 Card Reader
+	b200  Compact Flash Reader
+	b204  MMC/ SD Reader
+	b207  Memory Stick Reader
+5654  Gotview
+	ca42  MasterHD 3
+5656  Uni-Trend Group Limited
+	0832  UT2000/UT3000 Digital Storage Oscilloscope
+595a  IRTOUCHSYSTEMS Co. Ltd.
+	0001  Touchscreen
+5986  Acer, Inc
+	0100  Orbicam
+	0101  USB2.0 Camera
+	0102  Crystal Eye Webcam
+	0137  HP Webcam
+	0141  BisonCam, NB Pro
+	0149  HP Webcam-101
+	014c  MSI Integrated Webcam
+	01a6  Lenovo Integrated Webcam
+	01a7  Lenovo Integrated Webcam
+	01a9  Lenovo Integrated Webcam
+	0200  OrbiCam
+	0202  Fujitsu Webcam
+	0203  BisonCam NB Pro 1300
+	0205  Lenovo EasyCamera
+	0217  Integrated Webcam
+	0241  BisonCam, NB Pro
+	0268  SunplusIT INC. Integrated Camera
+	026a  Integrated Camera
+	0292  Lenovo Integrated Webcam
+	0294  Lenovo Integrated Webcam
+	0295  Lenovo Integrated Webcam
+	0299  Lenovo Integrated Webcam
+	029c  Lenovo EasyCamera
+	02ac  HP TrueVision HD Webcam
+	02d0  Lenovo Integrated Webcam [R5U877]
+	02d2  ThinkPad Integrated Camera
+	02d5  Integrated Camera
+	03b3  Lenovo Integrated Webcam
+	03d0  Lenovo Integrated Webcam [R5U877]
+	0400  BisonCam, NB Pro
+	0535  Lenovo EasyCamera integrated webcam
+	055a  Lenovo Integrated Webcam
+	0652  Lenovo EasyCamera
+	0670  Lenovo EasyCamera
+	0671  Lenovo EasyCamera
+	0706  ThinkPad P50 Integrated Camera
+	2113  SunplusIT Integrated Camera
+	a002  Lenovo EasyCamera Integrated Webcam
+59e3  Nonolith Labs
+5a57  Zinwell
+	0260  RT2570
+	0280  802.11a/b/g/n USB Wireless LAN Card
+	0282  802.11b/g/n USB Wireless LAN Card
+	0283  802.11b/g/n USB Wireless LAN Card
+	0284  802.11a/b/g/n USB Wireless LAN Card
+	0290  ZW-N290 802.11n [Realtek RTL8192U]
+	5257  Metronic 495257 wifi 802.11ng
+6000  Beholder International Ltd.
+	0001  Trident TVBOX Video Grabber
+	dec0  TV Wander
+	dec1  TV Voyage
+601a  Ingenic Semiconductor Ltd.
+	4740  XBurst Jz4740 boot mode
+	4760  JZ4760 Boot Device
+6022  Xektek
+	0500  SuperPro Universal Device Programmer
+6189  Sitecom
+	182d  LN-029 10/100 Ethernet Adapter
+	2068  USB to serial cable (v2)
+6244  LightingSoft AG
+	0101  Intelligent Usb Dmx Interface SIUDI5A
+	0201  Intelligent Usb Dmx Interface SIUDI5C
+	0300  Intelligent Usb Dmx Interface SIUDI6 Firmware download
+	0301  Intelligent Usb Dmx Interface SIUDI6C
+	0302  Intelligent Usb Dmx Interface SIUDI6A
+	0303  Intelligent Usb Dmx Interface SIUDI6D
+	0400  Touch Sensitive Intelligent Control Keypad STICK1A
+	0401  Touch Sensitive Intelligent Control Keypad STICK1A
+	0410  Intelligent Usb Dmx Interface SIUDI7 Firmware Download
+	0411  Intelligent Usb Dmx Interface SIUDI7A
+	0420  Intelligent Usb Dmx Interface SIUDI8A Firmware Download
+	0421  Intelligent Usb Dmx Interface SIUDI8A
+	0430  Intelligent Usb Dmx Interface SIUDI8C Firmware Download
+	0431  Intelligent Usb Dmx Interface SIUDI8C
+	0440  Intelligent Usb Dmx Interface SIUDI9A Firmware Download
+	0441  Intelligent Usb Dmx Interface SIUDI9A
+	0450  Intelligent Usb Dmx Interface SIUDI9C Firmware Download
+	0451  Intelligent Usb Dmx Interface SIUDI9C
+	0460  Touch Sensitive Intelligent Control Keypad STICK2 Firmware download
+	0461  Touch Sensitive Intelligent Control Keypad STICK2
+	0470  Touch Sensitive Intelligent Control Keypad STICK1B Firmware download
+	0471  Touch Sensitive Intelligent Control Keypad STICK1B
+	0480  Touch Sensitive Intelligent Control Keypad STICK3 Firmware download
+	0481  Touch Sensitive Intelligent Control Keypad STICK3
+	0490  Intelligent Usb Dmx Interface SIUDI9D Firmware Download
+	0491  Intelligent Usb Dmx Interface SIUDI9D
+	0500  Touch Sensitive Intelligent Control Keypad STICK2B Firmware download
+	0501  Touch Sensitive Intelligent Control Keypad STICK2B
+	0520  Touch Sensitive Intelligent Control Keypad (STICK2C Firmware download, 32/64bits
+	0521  Touch Sensitive Intelligent Control Keypad (STICK2C, 32/64bits)
+	0540  Sunlite Universal Smart Handy Interface (SUSHI1A Firmware download, 32/64bits)
+	0541  Sunlite Universal Smart Handy Interface (SUSHI1A, 32/64bits)
+	0570  Touch Sensitive Intelligent Control Keypad (STICK4A Firmware download, 32/64bits)
+	0571  Touch Sensitive Intelligent Control Keypad (STICK4A, 32/64bits)
+	0580  Touch Sensitive Intelligent Control Keypad (STICK5A Firmware download, 32/64bits)
+	0581  Touch Sensitive Intelligent Control Keypad (STICK5A, 32/64bits)
+	0590  Intelligent Dmx Interface (SIUDI9S Firmware Download, 32/64bits)
+	0591  Intelligent Dmx Interface (SIUDI9S, 32/64bits)
+	0600  Intelligent Dmx Interface (SIUDI9M Firmware Download, 32/64bits)
+	0601  Intelligent Dmx Interface (SIUDI9M, 32/64bits)
+	0610  Intelligent Dmx Interface SIUDI10A Firmware Download
+	0611  Intelligent Dmx Interface SIUDI10A
+6253  TwinHan Technology Co., Ltd
+	0100  Ir reciver f. remote control
 636c  CoreLogic, Inc.
+6472  Sony Corp.
+	01c8  PlayStation Portable [Mass Storage]
+6547  Arkmicro Technologies Inc.
+	0232  ARK3116 Serial
+6557  Emtec
+	5500  Mass Storage Device
+	8005  Car Key
+6615  IRTOUCHSYSTEMS Co. Ltd.
+	0001  Touchscreen
+	0020  IRTOUCH InfraRed TouchScreen
+	0081  TouchScreen
 6666  Prototype product Vendor ID
-	0667  Smart Joy PSX, PS-PC Smart JoyPad
-6993  Freshtel
-	b001  FT-102 VoIP USB Phone
+	0667  WiseGroup Smart Joy PSX, PS-PC Smart JoyPad
+	1c40  TELEMIC 802.15.4 Sensor node (Bootloader)
+	1c41  TELEMIC 802.15.4 Sensor node
+	2667  JCOP BlueZ Smartcard reader
+	8802  SmartJoy Dual Plus PS2 converter
+	8804  WiseGroup SuperJoy Box 5
+6677  WiseGroup, Ltd.
+	8802  SmartJoy Dual Plus PS2 converter
+	8811  Deluxe Dance Mat
+675d  Humanscale
+	062a  Switch Mouse
+6891  3Com
+	a727  3CRUSB10075 802.11bg [ZyDAS ZD1211]
+695c  Opera1
+	3829  Opera1 DVB-S (warm state)
+6993  Yealink Network Technology Co., Ltd.
+	b001  VoIP Phone
 6a75  Shanghai Jujo Electronics Co., Ltd
+7104  CME (Central Music Co.)
+	2202  UF5/UF6/UF7/UF8 MIDI Master Keyboard
+726c  StackFoundry LLC
+	2149  EntropyKing Random Number Generator
+7302  Solinftec
+	0001  HUB 4X232
+734c  TBS Technologies China
+	5920  Q-Box II DVB-S2 HD
+	5928  Q-Box II DVB-S2 HD
+7373  Beijing STONE Technology Co. Ltd.
+	5740  Intelligent TFT-LCD Module
+7392  Edimax Technology Co., Ltd
+	7711  EW-7711UTn nLite Wireless Adapter [Ralink RT3070]
+	7717  EW-7717UN 802.11n Wireless Adapter [Ralink RT2770]
+	7718  EW-7718UN 802.11n Wireless Adapter [Ralink RT2870]
+	7722  EW-7722UTn 802.11n Wireless Adapter [Ralink RT3072]
+	7733  EW-7733UnD 802.11abgn 3x3:3 [Ralink RT3573]
+	7811  EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS]
+	7822  EW-7612UAn V2 802.11n Wireless Adapter [Realtek RTL8192CU]
+	a611  EW-7611ULB 802.11b/g/n and Bluetooth 4.0 Adapter
+	a711  EW-7711MAC 802.11ac Wireless Adapter
+	a811  EW-7811UTC 802.11ac Wireless Adapter
+	b711  EW-7722UAC 802.11a/b/g/n/ac (2x2) Wireless Adapter [MediaTek MT7612U]
+	b822  EW-7822ULC 802.11ac Wireless Adapter [Realtek RTL8812AU]
+73d8  Progeny Dental Equipment Specialists
+	0104  VetPro DR, Size 1
+	0105  VetPro DR, Size 2
+7669  Venable Instruments
+	350c  Model 350c, Frequency Response Analyzer
+	5140  Model 5140, Frequency Response Analyzer
+	6305  Model 6305, Frequency Response Analyzer
+	6320  Model 6320, Frequency Response Analyzer
+	6340  Model 6340, Frequency Response Analyzer
+	7405  Model 7405, Frequency Response Analyzer
+	7420  Model 7420, Frequency Response Analyzer
+	7440  Model 7440, Frequency Response Analyzer
+	8805  Model 8805, Frequency Response Analyzer
+	8820  Model 8820, Frequency Response Analyzer
+	8840  Model 8840, Frequency Response Analyzer
+7825  Other World Computing
+	a2a4  External SATA Hard Drive Adapter cable PA023U3
+	b0b3  miniStack MAX
+8070  ACCES I/O Products, Inc.
+	8003  USB-DIO-96
+	8070  USB-AO16-16A
 8086  Intel Corp.
+	0001  AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter
+	0044  CPU DRAM Controller
+	0046  HD Graphics
+	0100  Personal Audio Player 3000
+	0101  Personal Audio Player 3000
 	0110  Easy PC Camera
-	0431  Intel Pro Video PC Camera
+	0120  PC Camera CS120
+	0180  WiMAX Connection 2400m
+	0181  WiMAX Connection 2400m
+	0182  WiMAX Connection 2400m
+	0186  WiMAX Connection 2400m
+	0188  WiMAX Connection 2400m
+	0189  Centrino Advanced-N 6230 Bluetooth adapter
+	0200  AnyPoint(TM) Wireless II Network 11Mbps Adapter [Atmel AT76C503A]
+	0431  Pro Video PC Camera
 	0510  Digital Movie Creator
 	0630  Pocket PC Camera
+	0780  CS780 Microphone Input
 	07d3  BLOB boot loader firmware
-	1111  PRO/Wireless 2011B 802.11b Adapter
+	07dc  Bluetooth 4.0* Smart Ready (low energy)
+	0b07  RealSense D435
+	0dad  Cherry MiniatureCard Keyboard
+	1010  AnyPoint(TM) Home Network 10 Mbps Phoneline Adapter
+	110a  Bluetooth Controller from (Ericsson P4A)
+	110b  Bluetooth Controller from (Intel/CSR)
+	1110  PRO/Wireless LAN Module
+	1111  PRO/Wireless 2011B 802.11b Adapter [Intersil PRISM 2.5]
+	1122  Integrated Hub
+	1134  Hollister Mobile Monitor
+	1139  In-Target Probe (ITP)
+	1234  Prototype Reader/Writer
+	1403  WiMAX Connection 2400m
+	1405  WiMAX Connection 2400m
+	1406  WiMAX Connection 2400m
+	2448  82801 PCI Bridge
+	3100  PRO/DSL 3220 Modem - WAN
+	3101  PRO/DSL 3220 Modem
+	3240  AnyPoint® 3240 Modem - WAN
+	3241  AnyPoint® 3240 Modem
+	8602  Miniature Card Slot
+	8c26  8 Series/C220 Series  EHCI #1
+	8c2d  8 Series/C220 Series EHCI #2
+	8c31  eXtensible Host Controller
+	9303  8x930Hx Hub
+	9500  CE 9500 DVB-T
 	9890  82930 Test Board
+	beef  SCM Miniature Card Reader/Writer
 	c013  Wireless HID Station
+	dead  Galileo
+	f001  XScale PXA27x Bulverde flash
+	f1a5  Z-U130 [Value Solid State Drive]
+8087  Intel Corp.
+	0020  Integrated Rate Matching Hub
+	0024  Integrated Rate Matching Hub
+	0025  Wireless-AC 9260 Bluetooth Adapter
+	0029  AX200 Bluetooth
+	0716  Modem Flashloader
+	07da  Centrino Bluetooth Wireless Transceiver
+	07dc  Bluetooth wireless interface
+	07eb  Oaktrail tablet
+	0a2a  Bluetooth wireless interface
+	0a2b  Bluetooth wireless interface
+	0a9e  Edison
+	0aa7  Wireless-AC 3168 Bluetooth
+	0aaa  Bluetooth 9460/9560 Jefferson Peak (JfP)
+	0fff  Intel Android Bootloader Interface
+	8000  Integrated Rate Matching Hub
+	8001  Integrated Hub
+	8002  8 channel internal hub
+	8008  Integrated Rate Matching Hub
+	800a  Hub
+80ee  VirtualBox
+	0021  USB Tablet
+	0022  multitouch tablet
+8282  Keio
+	3201  Retro Adapter
+	3301  Retro Adapter Mouse
+8301  Hapurs
+	0089  HPBT05R 2.4 G Mini Wireless Touchpad Keyboard
 8341  EGO Systems, Inc.
 	2000  Flashdisk
+8564  Transcend Information, Inc.
+	1000  JetFlash
+	4000  microSD/SD/CF UHS-II Card Reader [RDF8, RDF9]
+	6000  digital photo frame PF830
+	6002  digital photo frame PF830
+	7000  StoreJet 25H3
+8644  Intenso GmbG
+	8003  Micro Line
+	800b  Micro Line (4GB)
+8e06  CH Products, Inc.
+	f700  DT225 Trackball
+8ea3  Doosl
+	a02c  Wireless Presenter Receiver
+9016  Sitecom
+	182d  WL-022 802.11b Adapter
+9022  TeVii Technology Ltd.
+	d630  DVB-S S630
+	d650  DVB-S2 S650
+	d660  DVB-S2 S660
+9148  GeoLab, Ltd
+# All of GeoLab's devices share the same ID 0004.
+	0004  R3 Compatible Device
+9516  Studiologic
 9710  MosChip Semiconductor
-	7705  Printer cable
-	7715  Printer cable
-	7780  MS7780 4Mbps Fast IRDA Adapter
+	7703  MCS7703 Serial Port Adapter
+	7705  MCS7705 Parallel port adapter
+	7715  MCS7715 Parallel and serial port adapter
+	7717  MCS7717 3-port hub with serial and parallel adapter
+	7720  MCS7720 Dual serial port adapter
+	7730  MCS7730 10/100 Mbps Ethernet adapter
+	7780  MCS7780 4Mbps Fast IrDA Adapter
+	7784  MCS7784 115.2Kb IrDA Adapter
+	7810  MCS7810 Serial Port Adapter
+	7820  MCS7820 Dual Serial Port Adapter
+	7830  MCS7830 10/100 Mbps Ethernet adapter
+	7832  MCS7832 10/100 Mbps Ethernet adapter
+	7840  MCS7820/MCS7840 2/4 port serial adapter
+	9990  MCS9990 PCIe Host Controller
+9849  Bestmedia CD Recordable GmbH & Co. KG
+	0701  Platinum MyDrive HP
+9886  Astro Gaming
+	0015  A50
+9999  Odeon
+	0001  JAF Mobile Phone Flasher Interface
+99fa  Grandtec
+	8988  V.cap Camera Device
+9ac4  J. Westhues
+	4b8f  ProxMark-3 RFID Instrument
+9e88  Marvell Semiconductor, Inc.
+	9e8f  Plug Computer Basic [SheevaPlug]
+a014  Insignia (Best Buy)
+	b014  Desktop Microphone NS-PAUM50
+a108  Ingenic Semiconductor Co.,Ltd
+	1000  X1000
+	4775  JZ4775 Boot Device
+a128  AnMo Electronics Corp. / Dino-Lite (?)
+	0610  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
+	0611  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
+	0612  Dino-Lite Digital Microscope (SN9C120 + HV7131R)
+	0613  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
+	0614  Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111)
+	0615  Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111)
+	0616  Dino-Lite Digital Microscope (SN9C120 + HV7131R)
+	0617  Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111)
+	0618  Dino-Lite Digital Microscope (SN9C201 + HV7131R)
+a168  AnMo Electronics Corporation
+	0610  Dino-Lite Digital Microscope
+	0611  Dino-Lite Digital Microscope
+	0613  Dino-Lite Digital Microscope
+	0614  Dino-Lite Pro Digital Microscope
+	0615  Dino-Lite Pro Digital Microscope
+	0617  Dino-Lite Pro Digital Microscope
+	0618  Dino-Lite Digital Microscope
+a466  Haikou Xingong Electronics Co.,Ltd
+	0a53  TL866II Plus Device Programmer [MiniPRO]
+a600  ASIX s.r.o.
+	5500  zuban H2OPS - GPS for canoeing
+	a000  SIGMA Logic Analyzer
+	a002  EMUSB interface pro MU Beta
+	c000  MREL Data Trap II
+	c001  VUTS DMU4
+	c002  Electrone MASH
+	c005  MREL HTU HandiTrap cable
+	c006  JRC COmeter
+	e110  OK1ZIA Davac 4.x
+	e112  OK1ZIA Antenna rotator
+	e113  OK1ZIA GPIO
+	e114  OK1ZIA HD&Keyb
+a727  3Com
+	6893  3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523]
+	6895  AR5523
+	6897  AR5523
+a88a  Clas Ohlsson
+	3003  PCFree Multimedia Remote Control PC
+aaaa  MXT
+	8815  microSD CardReader
+	8816  microSD CardReader
+ab12  aplic
+	34cd  JMICRON JMS578 SATA 6Gb/s bridge
+abcd  LogiLink
+	1234  UDisk flash drive
+	6104  PCCloneEX Lite+ SATA docking station [QP0017]
+	cdee  Petcam
+b58e  Blue Microphones
+	9e84  Yeti Stereo Microphone
+ba77  Clockmaker
+	7147  Agterbosch
+c216  Card Device Expert Co., LTD
+	0180  MSR90 MagStripe reader
 c251  Keil Software, Inc.
+	1705  MCB2300
 	2710  ULink
+	2723  ULink-ME
+c502  AGPTek
+	0029  Rocker
+cace  CACE Technologies Inc.
+	0002  AirPCAP Classic 802.11 packet capture adapter
+	0300  AirPcap NX [Atheros AR9170+AR9104]
+cd12  SMART TECHNOLOGY INDUSTRIAL LTD.
+d208  Ultimarc
+	0310  Mini-PAC Arcade Control Interface
+d209  Ultimarc
+	0301  I-PAC Arcade Control Interface
+	0501  Ultra-Stik Ultimarc Ultra-Stik Player 1
+	1571  A-PAC Arcade Control Interface
+d904  LogiLink
+	0003  Laser Mouse (ID0009A)
+e2b7  Jie Li
+	0811  CD002
+	0812  CD005 MP3 Player
+e4e4  Xorcom Ltd.
+	1130  Astribank series
+	1131  Astribank series
+	1132  Astribank series
+	1140  Astribank series
+	1141  Astribank series
+	1142  Astribank series
+	1150  Astribank series
+	1151  Astribank series
+	1152  Astribank series
+	1160  Astribank 2 series
+	1161  Astribank 2 series
+	1162  Astribank 2 series
+eb03  MakingThings
+	0920  Make Controller Kit
 eb1a  eMPIA Technology, Inc.
 	17de  KWorld V-Stream XPERT DTV - DVB-T USB cold
 	17df  KWorld V-Stream XPERT DTV - DVB-T USB warm
-	2710  SilverCrest WebCam
-	2750  ECS Elitegroup G220 integrated webcam
-	2800  Terratec Cinergy 200
-	2801  GrabBeeX+ Video Encoder
+	2571  M035 Compact Web Cam
+	2710  SilverCrest Webcam
+	2750  ECS Elitegroup G220 integrated Webcam
+	2761  EeePC 701 integrated Webcam
+	2776  Combined audio and video input device
+	2800  EM2800 Video Capture
+	2801  EM2801 Video Capture
+	2820  EM2820 Video Capture
+	2821  EM2820 Video Capture
+	2840  EM2840 Video Capture
+	2841  EM2840 Video Capture
+	2861  EasyCAP DC60+ [EM2861]
+	2863  Video Grabber
+	2870  Pinnacle PCTV Stick
+	2881  EM2881 Video Controller
+	50a3  Gadmei UTV380 TV Box
+	50a6  Gadmei UTV330 TV Box
+	5166  video grabber 28282
+	5184  VIDBOX NW06 [EM28281]
+	8179  Terratec Cinergy T2 Stick HD
+	e305  KWorld PlusTV Analog Stick
+	e355  KWorld DVB-T 355U Digital TV Dongle
+eb2a  KWorld
+ef18  SMART TECHNOLOGY INDUSTRIAL LTD.
+f003  Hewlett Packard
+	6002  PhotoSmart C500
+f007  Teslong
+	a999  Endoscope Camera
+	b999  Otoscope Camera
+f182  Leap Motion
+	0003  Controller
+f3f0  CCT, Inc
+	0740  multi-function device
+	1340  multi-function printer
+	1440  printer device
+	1921  printer
+f4ec  Atten Electronics / Siglent Technologies
+	ee38  Digital Storage Oscilloscope
+f4ed  Shenzhen Siglent Co., Ltd.
+	ee37  SDG1010 Waveform Generator
+	ee3a  SDG1010 Waveform Generator (TMC mode)
+f766  Hama
+	0001  PC-Gamepad "Greystorm"
+fa11  DyingLight
+	5afe  DyingLight
+fc08  Conrad Electronic SE
+	0101  MIDI Cable UA0037
+ff00  Power Delivery
+ffee  FNK Tech
+	0100  Card Reader Controller RTS5101/RTS5111/RTS5116
 
 # List of known device classes, subclasses and protocols
 
@@ -4770,7 +23384,7 @@ C 02  Communications
 	0b  OBEX
 	0c  Ethernet Emulation
 		07  Ethernet Emulation (EEM)
-C 03  Human Interface Devices
+C 03  Human Interface Device
 	00  No Subclass
 		00  None
 		01  Keyboard
@@ -4779,9 +23393,10 @@ C 03  Human Interface Devices
 		00  None
 		01  Keyboard
 		02  Mouse
+C 05  Physical Interface Device
 C 06  Imaging
 	01  Still Image Capture
-		01 Picture Transfer Protocol (PIMA 15470)
+		01  Picture Transfer Protocol (PIMA 15470)
 C 07  Printer
 	01  Printer
 		00  Reserved/Undefined
@@ -4793,18 +23408,18 @@ C 08  Mass Storage
 	01  RBC (typically Flash)
 		00  Control/Bulk/Interrupt
 		01  Control/Bulk
-		50  Bulk (Zip)
+		50  Bulk-Only
 	02  SFF-8020i, MMC-2 (ATAPI)
 	03  QIC-157
 	04  Floppy (UFI)
 		00  Control/Bulk/Interrupt
 		01  Control/Bulk
-		50  Bulk (Zip)
+		50  Bulk-Only
 	05  SFF-8070i
 	06  SCSI
 		00  Control/Bulk/Interrupt
 		01  Control/Bulk
-		50  Bulk (Zip)
+		50  Bulk-Only
 C 09  Hub
 	00  Unused
 		00  Full speed (or root) hub
@@ -4832,6 +23447,8 @@ C 0e  Video
 	01  Video Control
 	02  Video Streaming
 	03  Video Interface Collection
+C 58  Xbox
+	42  Controller
 C dc  Diagnostic
 	01  Reprogrammable Diagnostics
 		01  USB2 Compliance
@@ -4848,11 +23465,12 @@ C ef  Miscellaneous Device
 	01  ?
 		01  Microsoft ActiveSync
 		02  Palm Sync
-	02  Common Class
+	02  ?
 		01  Interface Association
 		02  Wire Adapter Multifunction Peripheral
 	03  ?
 		01  Cable Based Association
+	05  USB3 Vision
 C fe  Application Specific Interface
 	01  Device Firmware Update
 	02  IRDA Bridge
@@ -4940,38 +23558,33 @@ HID 23  Physical
 # Syntax:
 # R item_type  item_type_name
 
-# Main Items
-R 80  Input
-R 90  Output
-R b0  Feature
-R a0  Collection
-R c0  End Collection
-
-# Global Items
 R 04  Usage Page
+R 08  Usage
 R 14  Logical Minimum
+R 18  Usage Minimum
 R 24  Logical Maximum
+R 28  Usage Maximum
 R 34  Physical Minimum
+R 38  Designator Index
 R 44  Physical Maximum
+R 48  Designator Minimum
 R 54  Unit Exponent
+R 58  Designator Maximum
 R 64  Unit
 R 74  Report Size
-R 84  Report ID
-R 94  Report Count
-R a4  Push
-R b4  Pop
-
-# Local Items
-R 08  Usage
-R 18  Usage Minimum
-R 28  Usage Maximum
-R 38  Designator Index
-R 48  Designator Minimum
-R 58  Designator Maximum
 R 78  String Index
+R 80  Input
+R 84  Report ID
 R 88  String Minimum
+R 90  Output
+R 94  Report Count
 R 98  String Maximum
+R a0  Collection
+R a4  Push
 R a8  Delimiter
+R b0  Feature
+R b4  Pop
+R c0  End Collection
 
 # List of Physical Descriptor Bias Types
 
@@ -5166,9 +23779,9 @@ HUT 04  Sport Controls
 	034  Stick Face Angle
 	035  Stick Heel/Toe
 	036  Stick Follow Through
-	047  Stick Temp
 	038  Stick Type
 	039  Stick Height
+	047  Stick Temp
 	050  Putter
 	051  1 Iron
 	052  2 Iron
@@ -5816,6 +24429,14 @@ HUT 0d  Digitizer
 	044  Barrel Switch
 	045  Eraser
 	046  Tablet Pick
+	047  Confidence
+	048  Width
+	049  Height
+	051  Contact ID
+	052  Input Mode
+	053  Device Index
+	054  Contact Count
+	055  Maximum Contact Number
 HUT 0f  PID Page
 	000  Undefined
 	001  Physical Interface Device
@@ -6297,7 +24918,7 @@ L 0014  Norwegian
 	01  Bokmal
 	02  Nynorsk
 L 0015  Polish
-L 0016	Portuguese
+L 0016  Portuguese
 	01  Portuguese
 	02  Brazilian
 L 0017  forgotten
@@ -6427,4 +25048,3 @@ VT 0400  External Vendor Specific
 VT 0401  Composite Video
 VT 0402  S-Video
 VT 0403  Component Video
-
diff --git a/kcontrol/usbview/usbdb.cpp b/kcontrol/usbview/usbdb.cpp
index c786ca40e..be5f3b63a 100644
--- a/kcontrol/usbview/usbdb.cpp
+++ b/kcontrol/usbview/usbdb.cpp
@@ -22,16 +22,13 @@
 
 #include "usbdb.h"
 
-
 USBDB::USBDB()
 {
-#ifndef USBIDS_FILE
-  TQString db = "/usr/share/hwdata/usb.ids"; /* on Fedora */
-  if (!TQFile::exists(db))
-	db = locate("data", "kcmusb/usb.ids");
-#else
   TQString db = USBIDS_FILE;
-#endif
+  
+  if (!TQFile::exists(db))
+	TQString db = locate("data", "kcmusb/usb.ids");
+  
   if (db.isEmpty())
     return;
 
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 87f3a7ee5..896a47a47 100644
--- a/kcontrol/usbview/usbdevices.cpp
+++ b/kcontrol/usbview/usbdevices.cpp
@@ -30,6 +30,7 @@
 #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
 #include <sys/ioctl.h>
 #include <sys/param.h>
+#include <errno.h>
 #endif
 
 TQPtrList<USBDevice> USBDevice::_devices;
@@ -329,7 +330,7 @@ bool USBDevice::parseSys(TQString dname)
 void USBDevice::collectData(struct libusb20_backend *pbe,
     struct libusb20_device *pdev)
 #else
-void USBDevice::collectData( int fd, int leve, usb_device_info &di, int parent)
+void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent)
 #endif
 {
 #ifdef Q_OS_FREEBSD
@@ -412,7 +413,7 @@ void USBDevice::collectData( int fd, int leve, usb_device_info &di, int parent)
 			continue;
 
 		// Only add the device if we don't detect it, yet
-		if (!find( di2.udi_us, di2.udi_addr ) )
+		if (!find( di2.udi_bus, di2.udi_addr ) )
 		{
 			USBDevice *device = new USBDevice();
 			device->collectData( fd, level + 1, di2, di.udi_addr );
@@ -447,7 +448,7 @@ bool USBDevice::parse(TQString fname)
 
 	libusb20_be_free(pbe);
 #else
-	TQFile controller("?dev/usb0");
+	TQFile controller("/dev/usb0");
 	int i = 1;
 	while ( controller.exists() )
 	{
@@ -459,7 +460,7 @@ bool USBDevice::parse(TQString fname)
 				struct usb_device_info di;
 
 				di.udi_addr = addr;
-				if ( ioctl(controller.handle(), USB_DEVICEINFO, &d1) != -1)
+				if ( ioctl(controller.handle(), USB_DEVICEINFO, &di) != -1)
 				{
 					if (!find( di.udi_bus, di.udi_addr) )
 					{
@@ -469,17 +470,17 @@ bool USBDevice::parse(TQString fname)
 				}
 			}
 			controller.close();
-#ifndef Q_OS_NETBSD
 		} else {
-			error = true;
-#endif
+			if ( errno != ENXIO) {
+				error = true;
+			}
 		}
-		controller.setName( TQString::formLocal8Bit("/dev/usb%1".arg(i++) );
+		controller.setName( TQString::fromLocal8Bit("/dev/usb%1").arg(i++) );
 	}
 
 	if ( showErrorMessage && error ) {
-		showErroeMessage = false;
-		KMessageBox::error( 0, i18n("Could not open one or more USB controller, Make sure you have read access to all BSD controllers that shoudl be listed here."));
+		showErrorMessage = false;
+		KMessageBox::error( 0, i18n("Could not open one or more USB controller. Make sure you have read access to all USB controllers that should be listed here."));
 	}
 #endif
 
diff --git a/kcontrol/usbview/usbdevices.h b/kcontrol/usbview/usbdevices.h
index f655ef9a3..bc8eab4f6 100644
--- a/kcontrol/usbview/usbdevices.h
+++ b/kcontrol/usbview/usbdevices.h
@@ -70,7 +70,12 @@ private:
   unsigned int _vendorID, _prodID, _revMajor, _revMinor;
 
 #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#if defined(Q_OS_FREEBSD)
   void collectData(struct libusb20_backend *, struct libusb20_device *);
+#endif
+#if defined(Q_OS_NETBSD)
+  void collectData( int fd, int level, usb_device_info &di, int parent);
+#endif
   TQStringList _devnodes;
 #endif
 };
diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp
index 74bba77f2..a3815b90f 100644
--- a/kcontrol/view1394/view1394.cpp
+++ b/kcontrol/view1394/view1394.cpp
@@ -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);
       
@@ -221,7 +221,7 @@ void View1394::rescanBus()
          {
             TQString guidStr;
             char buf[32];
-            snprintf(buf, 32, "%"PRIX64, guid);
+            snprintf(buf, 32, "%" PRIX64, guid);
             guidStr=buf;
             guidStr="0x"+guidStr.rightJustify(16,'0');
             TQString local=((j | 0xffc0) == localNodeId)?"X":"";
diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h
index 6d015bce8..1a3da9735 100644
--- a/kcontrol/view1394/view1394.h
+++ b/kcontrol/view1394/view1394.h
@@ -45,7 +45,7 @@ class OuiDb
 
 class View1394: public TDECModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       View1394(TQWidget *parent = 0L, const char *name = 0L);
       virtual ~View1394();
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index d32adc1b8..2c0fd2bba 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);
@@ -223,7 +223,7 @@ TQWidget *KCMXinerama::indicator(int dpy) {
 	si->setFont(fnt);
 	si->setFrameStyle(TQFrame::Panel);
 	si->setFrameShadow(TQFrame::Plain);
-	si->setAlignment(Qt::AlignCenter);
+	si->setAlignment(TQt::AlignCenter);
 
 	TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center());
 	TQRect targetGeometry(TQPoint(0,0), si->sizeHint());
diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h
index 83fdf6de9..940fdaa32 100644
--- a/kcontrol/xinerama/kcmxinerama.h
+++ b/kcontrol/xinerama/kcmxinerama.h
@@ -31,7 +31,7 @@ class TDEConfig;
 class TQWidget;
 
 class KCMXinerama : public TDECModule {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KCMXinerama(TQWidget *parent = 0L, const char *name = 0L);
 	virtual ~KCMXinerama();
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/kdcop.cpp b/kdcop/kdcop.cpp
index 436a4a59a..018976eaa 100644
--- a/kdcop/kdcop.cpp
+++ b/kdcop/kdcop.cpp
@@ -8,6 +8,7 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 
+#include <dcopclient.h>
 #include "kdcopwindow.h"
 
 static const TDECmdLineOptions options[] =
@@ -31,6 +32,7 @@ int main( int argc, char ** argv )
 
   KDCOPWindow* kdcopwindow = new KDCOPWindow;
   a.setMainWidget( kdcopwindow );
+  a.dcopClient()->attach();
   kdcopwindow->show();
 
   return a.exec();
diff --git a/kdcop/kdcoplistview.h b/kdcop/kdcoplistview.h
index 8b537a152..e1bdef793 100644
--- a/kdcop/kdcoplistview.h
+++ b/kdcop/kdcoplistview.h
@@ -13,7 +13,7 @@ class TQDragObject;
 
 class KDCOPListView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
   	KDCOPListView ( TQWidget * parent = 0, const char * name = 0 );
@@ -48,7 +48,7 @@ class DCOPBrowserItem : public TQListViewItem
 
 class DCOPBrowserApplicationItem : public TQObject, public DCOPBrowserItem
 {
- Q_OBJECT
+ TQ_OBJECT
   public:
 
     DCOPBrowserApplicationItem(TQListView * parent, const TQCString & app);
diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui
index 50a13ec4f..4faf2d876 100644
--- a/kdcop/kdcopview.ui
+++ b/kdcop/kdcopview.ui
@@ -137,13 +137,11 @@
     </image>
 </images>
 <includes>
+    <include location="global" impldecl="in implementation">kdcoplistview.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">tdelistbox.h</include>
     <include location="global" impldecl="in implementation">tdelistviewsearchline.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kdcoplistview.h</includehint>
-</includehints>
 </UI>
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 9ace56c3c..0870432fc 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=kapp->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& )));
+		kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQ_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& )));
 	}
 }
 
@@ -158,7 +158,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
   void
 DCOPBrowserApplicationItem::populate()
 {
-  TDEApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(TQt::waitCursor);
 
   bool ok = false;
   bool isDefault = false;
@@ -192,7 +192,7 @@ void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCStri
 		{
 			TQByteArray data;
 			kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
-				this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
+				this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&)));
 		}
 	}
 }
@@ -241,7 +241,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
   void
 DCOPBrowserInterfaceItem::populate()
 {
-  TDEApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(TQt::waitCursor);
 
   bool ok = false;
 
@@ -284,7 +284,6 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
   : TDEMainWindow(parent, name)
 {
   dcopClient = kapp->dcopClient();
-  dcopClient->attach();
   resize( 377, 480 );
   statusBar()->message(i18n("Welcome to the TDE DCOP browser"));
   setIcon(TDEGlobal::iconLoader()->loadIcon("enhanced_browsing", TDEIcon::NoGroup, TDEIcon::SizeSmall));
@@ -298,18 +297,18 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name)
 //	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&)));
+  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
@@ -317,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"
     );
@@ -328,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);
@@ -340,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()));
 }
 
 
@@ -459,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" )
@@ -472,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 );
       }
@@ -485,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" )
@@ -497,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" )
       {
@@ -508,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"  )
       {
@@ -519,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" )
       {
@@ -530,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" )
       {
@@ -541,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" )
       {
@@ -893,7 +892,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
 
 void KDCOPWindow::slotFillApplications()
 {
-  TDEApplication::setOverrideCursor(tqwaitCursor);
+  TDEApplication::setOverrideCursor(TQt::waitCursor);
 
   QCStringList apps = dcopClient->registeredApplications();
   TQCString appId = dcopClient->appId();
@@ -1234,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/kdcop/kdcopwindow.h b/kdcop/kdcopwindow.h
index ddc5c2bb5..70ac865a5 100644
--- a/kdcop/kdcopwindow.h
+++ b/kdcop/kdcopwindow.h
@@ -22,7 +22,7 @@ class KDCOPListView;
 
 class KDCOPWindow : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index a4714ce59..ff0394f4b 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -81,13 +81,13 @@ tde_add_executable( kcheckrunning
 ##### kdesktop (tdeinit) ########################
 
 set( target kdesktop )
-set_property( SOURCE lockeng.cc APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
+set_property( SOURCE lockeng.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 set( ${target}_SRCS
-  main.cc krootwm.cc xautolock.cc kdiconview.cc init.cc
-  desktop.cc lockeng.cc KDesktopIface.skel bgmanager.cc
+  main.cpp krootwm.cpp xautolock.cpp kdiconview.cpp init.cpp
+  desktop.cpp lockeng.cpp KDesktopIface.skel bgmanager.cpp
   KScreensaverIface.skel minicli.cpp KBackgroundIface.skel
-  pixmapserver.cc kcustommenu.cc startupid.cpp minicli_ui.ui
+  pixmapserver.cpp kcustommenu.cpp startupid.cpp minicli_ui.ui
   xautolock_diy.c xautolock_engine.c kshadowengine.cpp
   kshadowsettings.cpp kdesktopshadowsettings.cpp
   tdefileividesktop.cpp kdesktopapp.cpp
@@ -97,7 +97,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK
     pthread kdesktopsettings-static bgnd-static dmctl-static
-    konq-shared tdeutils-shared tdesu-shared
+    konq-shared tdeutils-shared tdesu-shared ${TDEHW_LIBRARIES}
     ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES}
     ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES}
 )
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index b28d1ee66..b2d4c2b2c 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -17,10 +17,10 @@ libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined
 libkdesktopsettings_la_LIBADD = $(LIB_TDECORE)
 libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc tdelaunchsettings.kcfgc 
 
-kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
-	lockeng.cc KDesktopIface.skel \
-	bgmanager.cc init.cc KScreensaverIface.skel \
-	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
+kdesktop_la_SOURCES = main.cpp krootwm.cpp xautolock.cpp kdiconview.cpp desktop.cpp \
+	lockeng.cpp KDesktopIface.skel \
+	bgmanager.cpp init.cpp KScreensaverIface.skel \
+	minicli.cpp KBackgroundIface.skel pixmapserver.cpp kcustommenu.cpp \
 	startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \
 	kshadowengine.cpp kshadowsettings.cpp \
 	kdesktopshadowsettings.cpp tdefileividesktop.cpp \
@@ -59,7 +59,7 @@ startupid.lo: tdelaunchsettings.h
 
 messages: rc.cpp
 	$(EXTRACTRC) lock/*.ui >> rc.cpp
-	$(XGETTEXT) lock/*.cc *.cc *.cpp *.h -o $(podir)/kdesktop.pot
+	$(XGETTEXT) lock/*.cpp *.cpp *.h -o $(podir)/kdesktop.pot
 
 menu_DATA = kdesktop_custom_menu1 kdesktop_custom_menu2
 menudir = $(kde_confdir)
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cpp
index 7c641dd9d..a7078f12e 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
@@ -79,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 );
@@ -98,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->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( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
 #endif
 
     TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
@@ -339,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
 	}
     }
@@ -543,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
@@ -572,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();
 }
 
 /*
@@ -682,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;
         }
     }
@@ -1005,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()
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 43e57a372..d78ebebc3 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
@@ -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
 
@@ -54,7 +54,7 @@ class KBackgroundManager
     : public TQObject,
       public KBackgroundIface
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cpp
index 2732bff08..e7681b1f2 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cpp
@@ -79,13 +79,13 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
 {
      if (e->type() == TQEvent::MouseButtonPress)
      {
-       TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+       TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
        KRootWm::self()->mousePressed( me->globalPos(), me->button() );
        return true;
      }
      else if (e->type() == TQEvent::Wheel)
      {
-       TQWheelEvent *we = TQT_TQWHEELEVENT(e);
+       TQWheelEvent *we = static_cast<TQWheelEvent*>(e);
        emit wheelRolled(we->delta());
        return true;
      }
@@ -155,7 +155,7 @@ 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)",
@@ -165,7 +165,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
   m_bInit = true;
 
   // It's the child widget that gets the focus, not us
-  setFocusPolicy( TQ_NoFocus );
+  setFocusPolicy( TQWidget::NoFocus );
 
   if ( x_root_hack )
   {
@@ -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( kapp, TQ_SIGNAL( shutDown() ),
+           this, TQ_SLOT( slotShutdown() ) );
 
-  connect(kapp, TQT_SIGNAL(settingsChanged(int)),
-          this, TQT_SLOT(slotSettingsChanged(int)));
+  connect(kapp, TQ_SIGNAL(settingsChanged(int)),
+          this, TQ_SLOT(slotSettingsChanged(int)));
   kapp->addKipcEventMask(KIPC::SettingsChanged);
 
   kapp->addKipcEventMask(KIPC::IconChanged);
-  connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int)));
+  connect(kapp, 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( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 }
 
@@ -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,24 +263,24 @@ 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 ) ) );
-
-     // All the QScrollView/QWidget-specific stuff should go here, so that we can use
+     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
      m_pIconView->setVScrollBarMode( TQScrollView::AlwaysOff );
      m_pIconView->setHScrollBarMode( TQScrollView::AlwaysOff );
      m_pIconView->setDragAutoScroll( false );
      m_pIconView->setFrameStyle( TQFrame::NoFrame );
      m_pIconView->viewport()->setBackgroundMode( X11ParentRelative );
-     m_pIconView->setFocusPolicy( TQ_StrongFocus );
-     m_pIconView->viewport()->setFocusPolicy( TQ_StrongFocus );
+     m_pIconView->setFocusPolicy( TQWidget::StrongFocus );
+     m_pIconView->viewport()->setFocusPolicy( TQWidget::StrongFocus );
      m_pIconView->setGeometry( geometry() );
      m_pIconView->show();
 
@@ -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 );
@@ -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,7 +359,7 @@ 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 );
 
@@ -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(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
 
-  TQTimer::singleShot(300, this, TQT_SLOT( slotUpAndRunning() ));
+  TQTimer::singleShot(300, this, TQ_SLOT( slotUpAndRunning() ));
 }
 
 void
@@ -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();
@@ -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;
     }
 
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index c6a208f07..c85e8b577 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -44,7 +44,7 @@ class SaverEngine;
 
 class KRootWidget : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
    KRootWidget();
    bool eventFilter( TQObject *, TQEvent * e );
@@ -63,7 +63,7 @@ signals:
 class KDesktop : public TQWidget,
                  public KDesktopIface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kdesktop/init.cc b/kdesktop/init.cpp
index 6bf87f333..6bf87f333 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cpp
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cpp
index 2e825c0d9..cd1287d3d 100644
--- a/kdesktop/kcustommenu.cc
+++ 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()
diff --git a/kdesktop/kcustommenu.h b/kdesktop/kcustommenu.h
index 93b8d671f..a8f2cf5c4 100644
--- a/kdesktop/kcustommenu.h
+++ b/kdesktop/kcustommenu.h
@@ -29,7 +29,7 @@
  */
 class KCustomMenu : public TQPopupMenu
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    /**
     * Create a custome menu described by @p configfile.
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 53a1cc781..183fcc417 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -52,7 +52,7 @@
       <default>true</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- init.cc:138 -->
+      <!-- init.cpp:138 -->
       <!--     if (!config->readBoolEntry("CopyDesktopLinks", true)) -->
     </entry>
     <entry key="AutoLineUpIcons" type="Bool">
@@ -64,9 +64,9 @@
       <default>false</default>
       <label>Sort directories first</label>
       <whatsthis></whatsthis>
-      <!-- krootwm.cc:251 -->
+      <!-- krootwm.cpp:251 -->
       <!--         aSortDirsFirst->setChecked( tdeconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
-      <!-- krootwm.cc:496 -->
+      <!-- krootwm.cpp:496 -->
       <!--     config->writeEntry( "SortDirectoriesFirst", b ); -->
     </entry>
 		<entry key="TerminalApplication" type="Path">
@@ -85,7 +85,7 @@
       <default>Forward</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- desktop.cc:397 -->
+      <!-- desktop.cpp:397 -->
       <!--             (config->readEntry("WheelDirection", default_dir_string) == forward_string) ? Forward : Reverse; -->
     </entry>
     <entry key="Left" type="String">
@@ -123,7 +123,7 @@
   </group>
   <group name="FMSettings"> 
     <entry key="NormalTextColor" type="Color"> <!--SHARED-->
-      <default>Qt::white</default>
+      <default>TQt::white</default>
       <label>Normal text color used for icon labels</label>
       <whatsthis></whatsthis>
     </entry>
@@ -155,6 +155,16 @@
       <label>Align direction</label>
       <whatsthis>If this is enabled, icons are aligned vertically, otherwise horizontally.</whatsthis>
     </entry>
+    <entry key="IconSpacing" type="Int">
+      <default>5</default>
+      <label>Icon spacing</label>
+      <whatsthis><p>This is the minimal distance (in pixels) between the icons on your desktop.</p></whatsthis>
+    </entry>
+    <entry key="SpacingCtrlScroll" type="Bool">
+      <default>false</default>
+      <label>Change spacing by Ctrl+Mouse Scroll</label>
+      <whatsthis><p>If this is enabled, you can change desktop icon spacing by pressing Ctrl and scrolling on the desktop background.</p></whatsthis>
+    </entry>
     <entry key="Preview" type="StringList">
       <default></default>
       <label>Show Icon Previews For</label>
@@ -190,7 +200,7 @@
       <default></default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:254 -->
+      <!-- kdiconview.cpp:254 -->
       <!--     m_itemsAlwaysFirst = config->readListEntry("AlwaysFirstItems"); // Distributor plug-in -->
     </entry>
   </group>
@@ -199,14 +209,14 @@
       <default>true</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:258 -->
+      <!-- kdiconview.cpp:258 -->
       <!--         m_enableMedia=config->readBoolEntry("enabled",false); -->
     </entry>
     <entry key="exclude" type="String">
       <default>media/nfs_mounted,media/nfs_unmounted,media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted</default>
       <label>Device Types to exclude</label>
       <whatsthis>The device types which you do not want to see on the desktop.</whatsthis>
-      <!-- kdiconview.cc:261 -->
+      <!-- kdiconview.cpp:261 -->
       <!--     TQString tmpList=config->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); -->
     </entry>
     <entry name="MediaFreeSpaceDisplayEnabled" key="FreeSpaceDisplayEnabled" type="Bool">
diff --git a/kdesktop/kdesktopSetAsBackground.desktop b/kdesktop/kdesktopSetAsBackground.desktop
index a7ba4f14a..3bc655803 100644
--- a/kdesktop/kdesktopSetAsBackground.desktop
+++ b/kdesktop/kdesktopSetAsBackground.desktop
@@ -1,14 +1,44 @@
 [Desktop Entry]
 X-TDE-ServiceTypes=image/*
-Actions=setAsBackground;tileAsBackground;
+Actions=centeredAsBackground;tiledAsBackground;centeredTiledAsBackground;centeredMaxpectAsBackground;tiledMaxpectAsBackground;scaledAsBackground;centeredAutoFitAsBackground;scaleAndCropAsBackground
 X-TDE-Submenu=Set as Background
 
-[Desktop Action setAsBackground]
+[Desktop Action centeredAsBackground]
 Name=Centered
 Icon=background
-Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 1
 
-[Desktop Action tileAsBackground]
+[Desktop Action tiledAsBackground]
 Name=Tiled
 Icon=background
 Exec=dcop kdesktop KBackgroundIface setWallpaper %u 2
+
+[Desktop Action centeredTiledAsBackground]
+Name=Center Tiled
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 3
+
+[Desktop Action centeredMaxpectAsBackground]
+Name=Centered Maxpect
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 4
+
+[Desktop Action tiledMaxpectAsBackground]
+Name=Tiled Maxpect
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 5
+
+[Desktop Action scaledAsBackground]
+Name=Scaled
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+
+[Desktop Action centeredAutoFitAsBackground]
+Name=Centered Auto Fit
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 7
+
+[Desktop Action scaleAndCropAsBackground]
+Name=Scale & Crop
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 8
diff --git a/kdesktop/kdesktopapp.cpp b/kdesktop/kdesktopapp.cpp
index ba05dc655..35f763f9c 100644
--- a/kdesktop/kdesktopapp.cpp
+++ b/kdesktop/kdesktopapp.cpp
@@ -27,7 +27,7 @@ KUniqueApplication()
 #endif
 }
 
-KDesktopApp::KDesktopApp(Display * dpy, Qt::HANDLE visual, Qt::HANDLE colormap):
+KDesktopApp::KDesktopApp(Display * dpy, TQt::HANDLE visual, TQt::HANDLE colormap):
 KUniqueApplication(dpy, visual, colormap)
 {
 #ifdef COMPOSITE
diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h
index 94cdd1d33..1f45ec0a3 100644
--- a/kdesktop/kdesktopapp.h
+++ b/kdesktop/kdesktopapp.h
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <kuniqueapplication.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
 
@@ -35,11 +35,11 @@
 
 class KDesktopApp : public KUniqueApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KDesktopApp();
-        KDesktopApp(Display * dpy, Qt::HANDLE visual = 0,
-                    Qt::HANDLE colormap = 0);
+        KDesktopApp(Display * dpy, TQt::HANDLE visual = 0,
+                    TQt::HANDLE colormap = 0);
 
 #ifdef COMPOSITE
         bool x11EventFilter (XEvent *);
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index 91bddb5b3..17b27fc65 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
@@ -17,34 +17,34 @@
 	if (kapp->authorize("run_command"))
 	{
 #endif
-		DEF( I18N_NOOP("Run Command"), ALT+Qt::Key_F2, WIN+Qt::Key_Return, slotExecuteCommand() );
+		DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() );
 #ifndef NOSLOTS
 	}
 #endif
-	DEF( I18N_NOOP("Show Taskmanager"), CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Pause, slotShowTaskManager() );
-	DEF( I18N_NOOP("Show Window List"), ALT+Qt::Key_F5, WIN+Qt::Key_0, slotShowWindowList() );
-	DEF( I18N_NOOP("Switch User"), ALT+CTRL+Qt::Key_Insert, WIN+Qt::Key_Insert, slotSwitchUser() );
+	DEF( I18N_NOOP("Show Taskmanager"), CTRL+TQt::Key_Escape, WIN+CTRL+TQt::Key_Pause, slotShowTaskManager() );
+	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"))
 	{
 #endif
-		DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+Qt::Key_L, WIN+Qt::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"))
 	{
 #endif
-		DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+Qt::Key_S, WIN+Qt::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"))
 	{
 #endif
-		DEF( I18N_NOOP("Log Out"), ALT+CTRL+Qt::Key_Delete, WIN+Qt::Key_Escape, slotLogout() );
-		DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_Delete, WIN+SHIFT+Qt::Key_Escape, slotLogoutNoCnf() );
-		DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageDown, WIN+CTRL+SHIFT+Qt::Key_PageDown, slotHaltNoCnf() );
-		DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageUp, WIN+CTRL+SHIFT+Qt::Key_PageUp, slotRebootNoCnf() );
+		DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() );
+		DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_Delete, WIN+SHIFT+TQt::Key_Escape, slotLogoutNoCnf() );
+		DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageDown, WIN+CTRL+SHIFT+TQt::Key_PageDown, slotHaltNoCnf() );
+		DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageUp, WIN+CTRL+SHIFT+TQt::Key_PageUp, slotRebootNoCnf() );
 #ifndef NOSLOTS
 	}
 #endif
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cpp
index c8c5a1fe6..7d79d12cf 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cpp
@@ -162,44 +162,42 @@ 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)
     {
-       setItemsMovable(false);
-       setAcceptDrops(false);
-       viewport()->setAcceptDrops(false);
+      setIconsLocked(true);
     }
 }
 
 KDIconView::~KDIconView()
 {
-    if (m_dotDirectory && !m_bEditableDesktopIcons) {
+    if (m_dotDirectory && !m_bEditableDesktopIcons || m_iconsLocked) {
       m_dotDirectory->rollback(false); // Don't save positions
     }
 
@@ -296,6 +294,7 @@ void KDIconView::initConfig( bool init )
     m_bVertAlign = KDesktopSettings::vertAlign();
     TQStringList oldPreview = previewSettings();
     setPreviewSettings( KDesktopSettings::preview() );
+    setSpacing( KDesktopSettings::iconSpacing() );
 
     // read arrange configuration
     m_eSortCriterion  = (SortCriterion)KDesktopSettings::sortCriterion();
@@ -371,12 +370,12 @@ 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 );
@@ -421,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();
@@ -486,6 +485,30 @@ void KDIconView::lineupIcons()
     saveIconPositions();
 }
 
+void KDIconView::incIconSpacing()
+{
+    if ( m_autoAlign && !KDesktopSettings::lockIcons() && KDesktopSettings::spacingCtrlScroll() )
+    {
+        setSpacing( ( spacing() + 1 ) );
+        lineupIcons();
+
+        KDesktopSettings::setIconSpacing( spacing() );
+        KDesktopSettings::writeConfig();
+    }
+}
+
+void KDIconView::decIconSpacing()
+{
+    if ( m_autoAlign && !KDesktopSettings::lockIcons() && KDesktopSettings::spacingCtrlScroll() && spacing() > 5 )
+    {
+        setSpacing( ( spacing() - 1 ) );
+        lineupIcons();
+
+        KDesktopSettings::setIconSpacing( spacing() );
+        KDesktopSettings::writeConfig();
+    }
+}
+
 void KDIconView::setAutoAlign( bool b )
 {
     m_autoAlign = b;
@@ -503,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
@@ -512,11 +535,20 @@ 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() ) );
     }
 }
 
+void KDIconView::setIconsLocked( bool lock )
+{
+  m_iconsLocked = lock;
+
+  setItemsMovable(!lock);
+  setAcceptDrops(!lock);
+  viewport()->setAcceptDrops(!lock);
+}
+
 void KDIconView::startDirLister()
 {
     // if desktop is resized before start() is called (XRandr)
@@ -618,7 +650,7 @@ void KDIconView::contentsMousePressEvent( TQMouseEvent *e )
     if (!m_dirLister) return;
     //kdDebug(1204) << "KDIconView::contentsMousePressEvent" << endl;
     // TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background
-    if ( e->button() == Qt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
+    if ( e->button() == TQt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
     {
         TQIconViewItem *item = findItem( e->pos() );
         if ( !item )
@@ -644,7 +676,22 @@ void KDIconView::wheelEvent( TQWheelEvent* e )
     TQIconViewItem *item = findItem( e->pos() );
     if ( !item )
     {
-      emit wheelRolled( e->delta() );
+      TQWheelEvent *we = static_cast<TQWheelEvent*>(e);
+
+      if ( we->state() == ControlButton )
+      {
+        if ( we->delta() >= 0 )
+          incIconSpacing();
+        else
+          decIconSpacing();
+
+        we->accept();
+      }
+      else
+      {
+        emit wheelRolled( e->delta() );
+      }
+
       return;
     }
 
@@ -684,7 +731,7 @@ void KDIconView::slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _it
 {
     if (!m_dirLister) return;
     //kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl;
-    if ( _item && _button == Qt::MidButton ) {
+    if ( _item && _button == TQt::MidButton ) {
         slotExecuted(_item);
     }
 }
@@ -1399,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);
         }
@@ -1419,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....
        }
@@ -1620,7 +1667,7 @@ void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::
            saveIconPosition(m_dotDirectory, m_lastDropPos.x(), m_lastDropPos.y());
            int dX = m_lastDropPos.x() - m_dropPos.x();
            int dY = m_lastDropPos.y() - m_dropPos.y();
-           if ((QABS(dX) > QABS(dY)) || (m_lastDropPos.x() + 2*gridX > width()))
+           if ((TQABS(dX) > TQABS(dY)) || (m_lastDropPos.x() + 2*gridX > width()))
               m_lastDropPos = TQPoint(m_dropPos.x(), m_lastDropPos.y() + gridY);
            else
               m_lastDropPos = TQPoint(m_lastDropPos.x() + gridX, m_lastDropPos.y());
@@ -1726,25 +1773,25 @@ void KDIconView::viewportWheelEvent( TQWheelEvent * e )
 void KDIconView::updateWorkArea( const TQRect &wr )
 {
 	m_gotIconsArea = true;  // now we have it!
-	
+
 	if (( iconArea() == wr ) && (m_needDesktopAlign == false)) {
 		// nothing changed; avoid repaint/saveIconPosition ...
 		return;
 	}
-	
+
 	TQRect oldArea = iconArea();
 	setIconArea( wr );
-	
+
 	kdDebug(1204) << "KDIconView::updateWorkArea wr: " << wr.x() << "," << wr.y() << " " << wr.width() << "x" << wr.height() << endl;
 	kdDebug(1204) << "  oldArea:                     " << oldArea.x() << "," << oldArea.y() << " " << oldArea.width() << "x" << oldArea.height() << endl;
-	
+
 	bool needRepaint = false;
 	TQIconViewItem* item;
 	int dx, dy;
-	
+
 	dx = wr.left() - oldArea.left();
 	dy = wr.top() - oldArea.top();
-	
+
 	if ( dx != 0 || dy != 0 ) {
 		if ( (dx > 0) || (dy > 0) ) {
 			// the iconArea was shifted right/down; less space now
@@ -1762,14 +1809,14 @@ void KDIconView::updateWorkArea( const TQRect &wr )
 			// the iconArea was shifted left/up; more space now - use it
 			needRepaint = true;
 		}
-	
+
 		if ( needRepaint ) {
 			for ( item = firstItem(); item; item = item->nextItem() ) {
 				item->moveBy( dx, dy );
 			}
 		}
 	}
-	
+
 	for ( item = firstItem(); item; item = item->nextItem() ) {
 		TQRect r( item->rect() );
 		int dx = 0, dy = 0;
@@ -1789,7 +1836,7 @@ void KDIconView::updateWorkArea( const TQRect &wr )
 		repaint( FALSE );
 		saveIconPositions();
 	}
-	
+
 	m_needDesktopAlign = false;
 	lineupIcons();
 }
@@ -1861,18 +1908,18 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect &curre
 	if (!area.contains(r, FALSE)) {
 		return false;
 	}
-	
+
 	TQIconViewItem *it = firstItem();
 	for (; it; it = it->nextItem() ) {
 		if ( !it->rect().isValid() || it == item ) {
 			continue;
 		}
-		
+
 		if ( it->intersects( r ) ) {
 			return false;
 		}
 	}
-	
+
 	return true;
 }
 
@@ -1891,12 +1938,12 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect& rect,
 		if ( !rect.isValid() || it == item ) {
 			continue;
 		}
-		
+
 		if ( it->intersects( rect ) ) {
 			return false;
 		}
 	}
-	
+
 	return true;
 }
 
@@ -1921,12 +1968,12 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item, const TQRect &currentI
 		m_lastDeletedIconPos = TQPoint();
 		return;
 	}
-	
+
 	//try to find a free place to put the item, honouring the m_bVertAlign property
 	TQRect rect=item->rect();
 	if (m_bVertAlign) {
 		kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl;
-	
+
 		rect.moveTopLeft(TQPoint(currentIconArea.x()+spacing(),currentIconArea.y()+spacing()));
 		do {
 			success=false;
@@ -1939,7 +1986,7 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item, const TQRect &currentI
 					break;
 				}
 			}
-		
+
 			if (!success) {
 				rect.moveTopLeft(TQPoint(rect.right()+spacing(),spacing()));
 			}
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 7b20e1817..61d35560a 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -48,7 +48,7 @@ class KDesktopShadowSettings;
  */
 class KDIconView : public KonqIconViewWidget, public KDirNotify
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KDIconView( TQWidget *parent, const char* name = 0L );
@@ -75,6 +75,7 @@ public:
 
     void lineupIcons(TQIconView::Arrangement);
 
+    void setIconsLocked( bool b );
     void setAutoAlign( bool b );
 
     TQStringList selectedURLs();
@@ -165,6 +166,9 @@ public slots:
     void slotClear();
     void refreshIcons();
 
+    void incIconSpacing();
+    void decIconSpacing();
+
 protected slots:
     void slotFreeSpaceOverlayStart();
     void slotFreeSpaceOverlayFinished();
@@ -214,6 +218,7 @@ private:
 
     bool m_bNeedRepaint;
     bool m_bNeedSave;
+    bool m_iconsLocked;
     bool m_autoAlign;
 
     /** true if even one icon has an icon-position entry in the .directory */
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cpp
index 9c68fc740..b33ef60d4 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cpp
@@ -1,5 +1,5 @@
 /*
- * krootwm.cc Part of the KDE project.
+ * krootwm.cpp Part of the KDE project.
  *
  * Copyright (C) 1997 Matthias Ettrich
  *           (C) 1997 Torben Weis, weis@kde.org
@@ -89,10 +89,10 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
   if (m_bDesktopEnabled && kapp->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"))
@@ -109,13 +109,13 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
      bookmarks = 0;
      bookmarkMenu = 0;
   }
-  
+
   // The windowList and desktop menus can be part of a menubar (Mac style)
   // 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
@@ -134,80 +134,80 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
 
   if (kapp->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"))
   {
-     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"))
   {
-      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"))
   {
       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())
   {
       new TDEAction(i18n("Start New Session"), "fork", 0, this,
-                  TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
+                  TQ_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
       if (kapp->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" );
       }
   }
 
@@ -250,7 +250,7 @@ void KRootWm::initConfig()
   if ( m_bDesktopEnabled ) {
     m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
     if ( kapp->authorize( "editable_desktop_icons" ) ) {
-        m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() );
+        m_pDesktop->iconView()->setIconsLocked( KDesktopSettings::lockIcons() );
         TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
         if (aLockIcons)
             aLockIcons->setChecked( KDesktopSettings::lockIcons()  );
@@ -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) {
@@ -450,7 +450,7 @@ void KRootWm::buildMenus()
     TQPopupMenu* pWindowOperationsMenu = new TQPopupMenu;
     m_actionCollection->action("cascade")->plug( pWindowOperationsMenu );
     m_actionCollection->action("unclutter")->plug( pWindowOperationsMenu );
-    desktopMenu->insertItem(SmallIconSet("window_list"), i18n("Windows"), pWindowOperationsMenu);
+    desktopMenu->insertItem(SmallIconSet("window_duplicate"), i18n("Windows"), pWindowOperationsMenu);
 
     if (m_bDesktopEnabled)
     {
@@ -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);
@@ -609,15 +609,15 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
 {
     if (!desktopMenu) return; // initialisation not yet done
     switch ( _button ) {
-    case Qt::LeftButton:
+    case TQt::LeftButton:
         if ( m_bShowMenuBar && menuBar )
             menuBar->raise();
         activateMenu( leftButtonChoice, _global );
         break;
-    case Qt::MidButton:
+    case TQt::MidButton:
         activateMenu( middleButtonChoice, _global );
         break;
-    case Qt::RightButton:
+    case TQt::RightButton:
         if (!kapp->authorize("action/kdesktop_rmb")) return;
         activateMenu( rightButtonChoice, _global );
         break;
@@ -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()
@@ -732,12 +732,24 @@ void KRootWm::slotLineupIcons() {
 
 void KRootWm::slotToggleLockIcons( bool lock )
 {
-    if (m_bDesktopEnabled)
-    {
-        m_pDesktop->iconView()->setItemsMovable( !lock );
-        KDesktopSettings::setLockIcons( lock );
-        KDesktopSettings::writeConfig();
-    }
+   KDesktopSettings::setLockIcons( lock );
+   KDesktopSettings::writeConfig();
+
+   // Also save it globally...
+   int desktop = TDEApplication::desktop()->primaryScreen();
+   TQCString cfilename;
+   if (desktop == 0)
+       cfilename = "kdesktoprc";
+   else
+       cfilename.sprintf("kdesktop-screen-%drc", desktop);
+
+   TDEConfig *kdg_config = new TDEConfig(cfilename, false, false);
+   kdg_config->setGroup( "General" );
+   kdg_config->writeEntry( "LockIcons", lock );
+   kdg_config->sync();
+   delete kdg_config;
+
+   m_pDesktop->iconView()->setIconsLocked( lock );
 }
 
 void KRootWm::slotRefreshDesktop() {
@@ -774,7 +786,7 @@ 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)
diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index 8fb5af8b9..efdd64c3e 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -64,7 +64,7 @@ class KRootWmThreadHelperObject;
  * This class is the handler for the menus (root popup menu and desktop menubar)
  */
 class KRootWm: public TQObject {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KRootWm(SaverEngine*, KDesktop*);
@@ -80,7 +80,7 @@ public:
   static KRootWm * self() { return s_rootWm; }
 
   /**
-   * share this with desktop.cc
+   * share this with desktop.cpp
    */
   KNewMenu * newMenu() const { return menuNew; }
 
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 1e2499ea2..67a55192f 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 )
@@ -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/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index 2641378cf..686e40297 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -28,7 +28,7 @@ namespace TDEIO { class Job; }
 
 class KWebDesktop : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KWebDesktop( TQObject* parent, const TQCString & imageFile, int width, int height )
         : TQObject( parent ),
@@ -51,9 +51,9 @@ private:
 };
 
 
-class KWebDesktopRun : public QObject
+class KWebDesktopRun : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url );
     ~KWebDesktopRun() {}
diff --git a/kdesktop/kwebdesktop/kwebdesktop.kcfg b/kdesktop/kwebdesktop/kwebdesktop.kcfg
index b0920f410..b9a1edbb5 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.kcfg
+++ b/kdesktop/kwebdesktop/kwebdesktop.kcfg
@@ -11,7 +11,7 @@
       <default>http://www.kde.org/</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:1103 -->
+      <!-- kdiconview.cpp:1103 -->
       <!--                  cfg.readEntry( "URL" ) == "trash:/" ) { -->
     </entry>
   </group>
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 05e14e938..8f3e49e16 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -34,14 +34,14 @@ link_directories(
 set( target kdesktop_lock )
 
 set( ${target}_SRCS
-  lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc
-  securedlg.cc autologout.cc main.cc
+  lockprocess.cpp lockdlg.cpp infodlg.cpp querydlg.cpp sakdlg.cpp
+  securedlg.cpp autologout.cpp main.cpp
 )
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdesktopsettings-static dmctl-static tdeio-shared Xext
-    pthread ${GL_LIBRARIES} ${LIBTDELDAP_LIBRARIES}
+  LINK kdesktopsettings-static dmctl-static tdeio-shared Xext ${TDEHW_LIBRARIES}
+    pthread ${GL_LIBRARIES}
     "${LINKER_IMMEDIATE_BINDING_FLAGS}"
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index c686e3ea9..4c2fb22a8 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -8,7 +8,7 @@ kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LI
 
 bin_PROGRAMS = kdesktop_lock
 
-kdesktop_lock_SOURCES = lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc autologout.cc main.cc
+kdesktop_lock_SOURCES = lockprocess.cpp lockdlg.cpp infodlg.cpp querydlg.cpp autologout.cpp main.cpp
 
 noinst_HEADERS = lockprocess.h lockdlg.h infodlg.h querydlg.h autologout.h main.h
 
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cpp
index 6e05c439d..ee1d8e1db 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cpp
@@ -67,7 +67,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
 	unlockDialogLayout->addWidget( frame );
 	
 	frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint());
-	frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop);
+	frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, TQt::AlignCenter | TQt::AlignTop);
 	frameLayout->addWidget(greetLabel, 0, 1);
 	frameLayout->addWidget(mStatusLabel, 1, 1);
 	frameLayout->addWidget(infoLabel, 2, 1);
@@ -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/autologout.h b/kdesktop/lock/autologout.h
index 89cbb880e..834f4fd0e 100644
--- a/kdesktop/lock/autologout.h
+++ b/kdesktop/lock/autologout.h
@@ -22,7 +22,7 @@ class TQProgressBar;
 
 class AutoLogout : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		AutoLogout(LockProcess *parent);
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cpp
index 3efaf060d..6fc604b43 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cpp
@@ -97,7 +97,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
 	layStatus->addWidget( mStatusLabel );
 
 	frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-	frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
+	frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop );
 	frameLayout->addLayout( layStatus, 1, 1 );
 
 	installEventFilter(this);
@@ -111,7 +111,7 @@ InfoDlg::~InfoDlg()
 
 void InfoDlg::updateLabel(TQString &txt)
 {
-	mStatusLabel->setPaletteForegroundColor(Qt::black);
+	mStatusLabel->setPaletteForegroundColor(TQt::black);
 	mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h
index 3daf4d2ce..ec5569748 100644
--- a/kdesktop/lock/infodlg.h
+++ b/kdesktop/lock/infodlg.h
@@ -26,7 +26,7 @@ class TQListView;
 //
 class InfoDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		InfoDlg(LockProcess *parent);
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cpp
index d4b456a9e..c8d82e8d9 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cpp
@@ -21,6 +21,7 @@
 #include <kpushbutton.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
+#include <ksimpleconfig.h>
 #include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
@@ -43,7 +44,10 @@
 #include <tqlistview.h>
 #include <tqheader.h>
 #include <tqcheckbox.h>
+#ifdef WITH_TDEHWLIB
 #include <tqfile.h>
+#include <tdecryptographiccarddevice.h>
+#endif
 
 #include <ctype.h>
 #include <unistd.h>
@@ -58,9 +62,6 @@
 #include <X11/Xatom.h>
 #include <fixx11h.h>
 
-#ifdef HAVE_KRB5
-#include <libtdeldap.h>
-#endif
 
 #ifndef AF_LOCAL
 # define AF_LOCAL	AF_UNIX
@@ -101,6 +102,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin, TQDat
 	mPlugin( plugin ),
 	mCapsLocked(-1),
 	mUnlockingFailed(false),
+	validUserCardInserted(false),
 	showInfoMessages(true),
 	mCardLoginInProgress(false)
 {
@@ -198,7 +200,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 
 		if (!m_lockStartDT.isNull()) {
 			frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-			frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop );
+			frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop );
 			frameLayout->addWidget( greetLabel, 1, 1 );
 			frameLayout->addWidget( lockDTLabel, 2, 1 );
 			frameLayout->addItem( greet->getLayoutItem(), 3, 1 );
@@ -208,7 +210,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 		}
 		else {
 			frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-			frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop );
+			frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop );
 			frameLayout->addWidget( greetLabel, 1, 1 );
 			frameLayout->addItem( greet->getLayoutItem(), 2, 1 );
 			frameLayout->addLayout( layStatus, 3, 1 );
@@ -218,7 +220,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
 	}
 	else {
 		frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-		frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, Qt::AlignTop );
+		frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, TQt::AlignTop );
 		frameLayout->addWidget( greetLabel, 0, 1 );
 		frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
 		frameLayout->addLayout( layStatus, 2, 1 );
@@ -235,12 +237,12 @@ 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")) {
 		mNewSessButton->hide();
@@ -251,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();
@@ -327,12 +329,12 @@ void PasswordDlg::setLayoutText( const TQString &txt )
 void PasswordDlg::updateLabel()
 {
 	if (mUnlockingFailed) {
-		mStatusLabel->setPaletteForegroundColor(Qt::black);
+		mStatusLabel->setPaletteForegroundColor(TQt::black);
 		mStatusLabel->setText(i18n("<b>Unlocking failed</b>"));
 // 		mStatusLabel->show();
 	}
 	else if (mCapsLocked) {
-		mStatusLabel->setPaletteForegroundColor(Qt::red);
+		mStatusLabel->setPaletteForegroundColor(TQt::red);
 		mStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>"));
 // 		mStatusLabel->show();
 	}
@@ -479,6 +481,7 @@ void PasswordDlg::reapVerify()
 			switch (WEXITSTATUS(status)) {
 			case AuthOk:
 				{
+#ifdef WITH_TDEHWLIB
 					KUser userinfo;
 					TQString fileName = userinfo.homeDir() + "/.tde_card_login_state";
 					TQFile flagFile(fileName);
@@ -493,6 +496,7 @@ void PasswordDlg::reapVerify()
 						// Card was not used to log in
 						flagFile.remove();
 					}
+#endif
 
 					// Signal success
 					greet->succeeded();
@@ -555,6 +559,7 @@ void PasswordDlg::handleVerify()
 				setFixedSize( sizeHint().width(), sizeHint().height() + 1 );
 				setFixedSize( sizeHint() );
 
+#ifdef WITH_TDEHWLIB
 				// Check if cryptographic card login is being used
 				if (mCardLoginInProgress) {
 					// Attempt authentication if configured
@@ -563,11 +568,12 @@ 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;
 				}
+#endif
 			}
 			else {
 				greet->textPrompt( arr, false, false );
@@ -706,12 +712,12 @@ 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, Qt::AlignCenter );
-	grid->addWidget( label2, 0, 1, Qt::AlignCenter );
-	grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+	grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+	grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
 
 	static_cast< LockProcess* >(parent())->execDialog( &dialog );
 }
@@ -777,16 +783,16 @@ 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() );
 
 	TQGridLayout *grid = new TQGridLayout( mbox, 2, 2, 2 * KDialog::spacingHint() );
 	grid->setMargin( KDialog::marginHint() );
-	grid->addWidget( label1, 0, 0, Qt::AlignCenter );
-	grid->addWidget( label2, 0, 1, Qt::AlignCenter );
+	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+	grid->addWidget( label2, 0, 1, TQt::AlignCenter );
 	TQCheckBox *cb = new TQCheckBox( i18n("&Do not ask again"), winFrame );
 	grid->addMultiCellWidget( cb, 1,1, 0,1 );
 
@@ -895,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") );
@@ -927,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) {
 		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 );
@@ -944,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() );
@@ -974,16 +980,22 @@ void PasswordDlg::capsLocked()
 }
 
 void PasswordDlg::attemptCardLogin() {
-#ifdef HAVE_KRB5
-	// Make sure card logins are enabled before attempting one
-	if (!LDAPManager::pkcsLoginEnabled()) {
-		return;
-	}
-#else
+#ifdef WITH_TDEHWLIB
+#ifndef HAVE_KRB5
 	// Don't enable card-based logins if Kerberos integration was disabled
 	return;
 #endif
 
+	// Make sure card logins are enabled before attempting one
+	KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	systemconfig->setGroup(NULL);
+	bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false);
+	delete systemconfig;
+	if (!enabled)
+	{
+		return;
+	}
+
 	if (mCardLoginInProgress) {
 		return;
 	}
@@ -1003,10 +1015,12 @@ 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
 }
 
 void PasswordDlg::resetCardLogin() {
+#ifdef WITH_TDEHWLIB
 	validUserCardInserted = false;
 	greet->abort();
 	greet->clear();
@@ -1019,9 +1033,10 @@ void PasswordDlg::resetCardLogin() {
 	setFixedSize(sizeHint());
 
 	// Restore information message display settings
-        greet->setInfoMessageDisplay(showInfoMessages);
+  greet->setInfoMessageDisplay(showInfoMessages);
 
 	mCardLoginInProgress = false;
+#endif
 }
 
 #include "lockdlg.moc"
diff --git a/kdesktop/lock/lockdlg.h b/kdesktop/lock/lockdlg.h
index 571d825fa..3f8500a42 100644
--- a/kdesktop/lock/lockdlg.h
+++ b/kdesktop/lock/lockdlg.h
@@ -33,7 +33,7 @@ class TQListView;
 //
 class PasswordDlg : public TQDialog, public KGreeterPluginHandler
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin);
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cpp
index fdde3fc9e..0a343d88e 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cpp
@@ -17,6 +17,14 @@
 //some image will be corrupted).
 
 #include <config.h>
+#include <tdeglobal.h>
+
+#ifdef WITH_TDEHWLIB
+#include <ksslcertificate.h>
+#include <kuser.h>
+#include <tdehardwaredevices.h>
+#include <tdecryptographiccarddevice.h>
+#endif
 
 #include "lockprocess.h"
 #include "lockdlg.h"
@@ -34,7 +42,6 @@
 #include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
-#include <kuser.h>
 #include <tdemessagebox.h>
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
@@ -249,7 +256,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();
 	}
@@ -291,18 +298,20 @@ LockProcess::LockProcess()
 		}
 	}
 
+#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, 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);
 	}
+#endif
 
 #ifdef KEEP_MOUSE_UNGRABBED
 	setEnabled(false);
@@ -379,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
@@ -394,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);
@@ -404,7 +413,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()));
+	connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 
 	if (!trinity_desktop_lock_use_system_modal_dialogs) {
@@ -426,8 +435,8 @@ 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();
 }
 
@@ -524,8 +533,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()));
 }
 
 
@@ -568,7 +577,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();
@@ -589,7 +598,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;
 	}
@@ -609,7 +618,7 @@ void LockProcess::quitSaver()
 {
 	DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
 	if (closeCurrentWindow()) {
-		TQTimer::singleShot( 0, this, SLOT(quitSaver()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(quitSaver()) );
 		return;
 	}
 	stopSaver();
@@ -620,7 +629,7 @@ void LockProcess::quitSaver()
 void LockProcess::startSecureDialog()
 {
 	if ((backingPixmap.isNull()) && (mBackingStartupDelayTimer < 100)) {
-		TQTimer::singleShot(10, this, TQT_SLOT(startSecureDialog()));
+		TQTimer::singleShot(10, this, TQ_SLOT(startSecureDialog()));
 		mBackingStartupDelayTimer++;
 		return;
 	}
@@ -652,14 +661,14 @@ void LockProcess::startSecureDialog()
 		mBusy = true;
 		trinity_desktop_lock_forced = true;
 		// Make sure the cursor is not showing busy status
-		setCursor( tqarrowCursor );
+		setCursor( TQt::arrowCursor );
 		if (startLock())
 		{
 			if (trinity_desktop_lock_delay_screensaver_start) {
 				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
@@ -719,7 +728,7 @@ bool LockProcess::runSecureDialog()
 	mInSecureDialog = true;
 	if (startSaver()) {
 		mBackingStartupDelayTimer = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(startSecureDialog()));
+		TQTimer::singleShot(0, this, TQ_SLOT(startSecureDialog()));
 		return true;
 	}
 	else {
@@ -1031,7 +1040,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);
 	}
@@ -1054,7 +1063,7 @@ 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
 }
@@ -1066,7 +1075,7 @@ void LockProcess::doDesktopResizeFinish()
 	}
 	mDialogControlLock = true;
 	if (closeCurrentWindow()) {
-		TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(doDesktopResizeFinish()) );
 		mDialogControlLock = false;
 		return;
 	}
@@ -1234,10 +1243,10 @@ bool LockProcess::grabMouse()
 {
 	HANDLE cursorHandle;
 	if (mHackActive) {
-		cursorHandle = TQCursor(tqblankCursor).handle();
+		cursorHandle = TQCursor(TQt::blankCursor).handle();
 	}
 	else {
-		cursorHandle = TQCursor(tqbusyCursor).handle();
+		cursorHandle = TQCursor(TQt::busyCursor).handle();
 	}
 	int rv = XGrabPointer( tqt_xdisplay(), TQApplication::desktop()->winId(),
 		True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None,
@@ -1344,8 +1353,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);
@@ -1533,7 +1542,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);
@@ -1593,8 +1602,8 @@ bool LockProcess::startHack()
 		return false;
 	}
 
-	setCursor( tqblankCursor );
-	XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime);
+	setCursor( TQt::blankCursor );
+	XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime);
 
 	if (mSaverExec.isEmpty()) {
 		return false;
@@ -1650,7 +1659,7 @@ bool LockProcess::startHack()
 				mSuspended = false;
 			}
 
-			XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime);
+			XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime);
 			if (mHackProc.start() == true) {
 #ifdef HAVE_SETPRIORITY
 				setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority);
@@ -1660,7 +1669,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; }
@@ -1724,7 +1733,7 @@ void LockProcess::stopHack()
 			mHackProc.kill(SIGKILL);
 		}
 	}
-	setCursor( tqarrowCursor );
+	setCursor( TQt::arrowCursor );
 
 	mHackActive = FALSE;
 }
@@ -1980,7 +1989,7 @@ int LockProcess::execDialog( TQDialog *dlg )
 
 	if (mDialogs.isEmpty()) {
 		suspend();
-		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime);
+		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime);
 	}
 	mDialogs.prepend( dlg );
 	fakeFocusIn( dlg->winId());
@@ -2007,17 +2016,17 @@ int LockProcess::execDialog( TQDialog *dlg )
 	if( mDialogs.isEmpty() ) {
 		HANDLE cursorHandle;
 		if (mHackActive) {
-			cursorHandle = TQCursor(tqblankCursor).handle();
+			cursorHandle = TQCursor(TQt::blankCursor).handle();
 		}
 		else {
-			cursorHandle = TQCursor(tqbusyCursor).handle();
+			cursorHandle = TQCursor(TQt::busyCursor).handle();
 		}
 		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, cursorHandle, CurrentTime);
 		if (trinity_desktop_lock_use_system_modal_dialogs) {
 			// 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 );
@@ -2037,7 +2046,7 @@ int LockProcess::execDialog( TQDialog *dlg )
 void LockProcess::slotForcePaintBackground()
 {
 	TQPixmap blankPixmap(mRootWidth, mRootHeight);
-	blankPixmap.fill(Qt::black);
+	blankPixmap.fill(TQt::black);
 	slotPaintBackground(blankPixmap);
 	printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner.  High system load or possibly a TDE bug!\n"); fflush(stdout);
 }
@@ -2056,7 +2065,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!
@@ -2118,7 +2127,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);
@@ -2158,7 +2167,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
@@ -2167,7 +2176,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;
 		}
 	}
@@ -2433,14 +2442,14 @@ 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 );
 	TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
-	grid->addWidget( label1, 0, 0, Qt::AlignCenter );
-	grid->addWidget( label2, 0, 1, Qt::AlignCenter );
-	grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+	grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+	grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
 
 	execDialog( &box );
 }
@@ -2449,19 +2458,13 @@ static int run_vkbd = -1;
 void LockProcess::showVkbd()
 {
 	if( run_vkbd == - 1 ) {
-#ifdef WITH_HAL
-		int status = system( "hal-find-by-property --key system.formfactor.subtype --string tabletpc" );
-// 		status = 0; // enable for testing
-		run_vkbd = ( WIFEXITED( status ) && WEXITSTATUS( status ) == 0 && !TDEStandardDirs::findExe( "xvkbd" ).isEmpty()) ? 1 : 0;
-#else // WITH_HAL
 		run_vkbd = (!TDEStandardDirs::findExe( "xvkbd" ).isEmpty());
-#endif // WITH_HAL
 	}
 	if( run_vkbd ) {
 		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();
@@ -2567,7 +2570,7 @@ bool LockProcess::forwardVkbdEvent( XEvent* event )
 	}
 	// vkbd windows are kept topmost, so just find the first one in the position
 	for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin(); it != mVkbdWindows.end(); ++it ) {
-		if( TQT_TQRECT_OBJECT((*it).rect).contains( pos )) {
+		if( (*it).rect.contains( pos )) {
 			// Find the subwindow where the event should actually go.
 			// Not exactly cheap in the number of X roundtrips but oh well.
 			Window window = (*it).id;
@@ -2692,7 +2695,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
 			m_dialogPrevY = oldPoint.y();
 			m_mousePrevX = be->x_root;
 			m_mousePrevY = be->y_root;
-			XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqsizeAllCursor).handle(), CurrentTime);
+			XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::sizeAllCursor).handle(), CurrentTime);
 		}
 	}
 
@@ -2712,7 +2715,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
 
 	if (event->type == ButtonRelease) {
 		m_mouseDown = 0;
-		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime);
+		XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime);
 	}
 }
 
@@ -2823,6 +2826,7 @@ void LockProcess::processInputPipeCommand(TQString inputcommand) {
 }
 
 void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
 	TQString login_name = TQString::null;
 	X509CertificatePtrList certList = cdevice->cardX509Certificates();
 	if (certList.count() > 0) {
@@ -2845,31 +2849,36 @@ 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();
 			}
 		}
 	}
+#endif
 }
 
 void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
 	PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
 	if (passDlg) {
 		passDlg->resetCardLogin();
 	}
 	else {
 		m_loginCardDevice = NULL;
-		TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
+		TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort()));
 	}
+#endif
 }
 
-void LockProcess::signalPassDlgToAttemptCardLogin() {
+void LockProcess::signalPassDlgToAttemptCardLogin()
+{
+#ifdef WITH_TDEHWLIB
 	PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
 	if (passDlg && m_loginCardDevice) {
 		passDlg->attemptCardLogin();
@@ -2877,12 +2886,15 @@ 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
 }
 
-void LockProcess::signalPassDlgToAttemptCardAbort() {
+void LockProcess::signalPassDlgToAttemptCardAbort()
+{
+#ifdef WITH_TDEHWLIB
 	PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
 	if (passDlg) {
 		passDlg->resetCardLogin();
@@ -2890,12 +2902,15 @@ void LockProcess::signalPassDlgToAttemptCardAbort() {
 	else {
 		if (currentDialog) {
 			// Try again later
-			TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
+			TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort()));
 		}
 	}
+#endif
 }
 
-void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) {
+void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice)
+{
+#ifdef WITH_TDEHWLIB
 	TQCString password;
 	TQString pin_entry;
 
@@ -2911,10 +2926,16 @@ void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographi
 	else {
 		cdevice->setProvidedPin(TQString::null);
 	}
+#endif
 }
 
-TDECryptographicCardDevice* LockProcess::cryptographicCardDevice() {
+TDECryptographicCardDevice* LockProcess::cryptographicCardDevice()
+{
+#ifdef WITH_TDEHWLIB
 	return m_loginCardDevice;
+#else
+	return NULL;
+#endif
 }
 
 void LockProcess::fullyOnline() {
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 4dc2d8bab..bfe1fe420 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -10,13 +10,7 @@
 #ifndef __LOCKENG_H__
 #define __LOCKENG_H__
 
-#include <ksslcertificate.h>
-
-#include <tdehardwaredevices.h>
-#include <tdecryptographiccarddevice.h>
-
 #include <kgreeterplugin.h>
-
 #include <kprocess.h>
 #include <kpixmap.h>
 #include <krootpixmap.h>
@@ -35,6 +29,11 @@ class KLibrary;
 class KWinModule;
 class KSMModalDialog;
 class LockProcess;
+#ifdef WITH_TDEHWLIB
+class TDECryptographicCardDevice;
+#else
+#define TDECryptographicCardDevice void
+#endif
 
 struct GreeterPluginHandle {
 	KLibrary *library;
@@ -53,7 +52,7 @@ typedef TQValueList<Window> TQXLibWindowList;
 //
 class ControlPipeHandlerObject : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ControlPipeHandlerObject();
@@ -82,7 +81,7 @@ class ControlPipeHandlerObject : public TQObject
 //
 class LockProcess : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		LockProcess();
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cpp
index f1407070c..f80f406a1 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cpp
@@ -40,7 +40,7 @@
 
 #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
 
diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h
index fd19c6183..162542555 100644
--- a/kdesktop/lock/main.h
+++ b/kdesktop/lock/main.h
@@ -25,10 +25,10 @@
 #include <time.h>
 
 class MyApp : public TDEApplication {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		MyApp() : TDEApplication(), lastTick( 0 ) {}
-		MyApp(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
+		MyApp(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
 
 	protected:
 		bool x11EventFilter( XEvent * );
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cpp
index 1fc5d260c..edab1fd97 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cpp
@@ -111,13 +111,13 @@ QueryDlg::QueryDlg(LockProcess *parent)
 	layButtons->addWidget( ok );
 
 	frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
-	frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
+	frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop );
 	frameLayout->addLayout( layStatus, 0, 1 );
 	frameLayout->addLayout( layPin, 2, 1 );
 	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() );
@@ -140,7 +140,7 @@ TQString QueryDlg::getEntry()
 
 void QueryDlg::updateLabel(TQString &txt)
 {
-	mStatusLabel->setPaletteForegroundColor(Qt::black);
+	mStatusLabel->setPaletteForegroundColor(TQt::black);
 	mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h
index d5c4f7f33..0b3e55aa8 100644
--- a/kdesktop/lock/querydlg.h
+++ b/kdesktop/lock/querydlg.h
@@ -28,7 +28,7 @@ class TQListView;
 //
 class QueryDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		QueryDlg(LockProcess *parent);
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cpp
index 803c77919..a9bb25f40 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cpp
@@ -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();
 }
 
@@ -142,7 +142,7 @@ void SAKDlg::reject()
 
 void SAKDlg::updateLabel(TQString &txt)
 {
-	mStatusLabel->setPaletteForegroundColor(Qt::black);
+	mStatusLabel->setPaletteForegroundColor(TQt::black);
 	mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
diff --git a/kdesktop/lock/sakdlg.h b/kdesktop/lock/sakdlg.h
index faded4b6e..12d80b8cb 100644
--- a/kdesktop/lock/sakdlg.h
+++ b/kdesktop/lock/sakdlg.h
@@ -26,7 +26,7 @@ class TQListView;
 //
 class SAKDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		SAKDlg(LockProcess *parent);
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cpp
index fca79a707..5be274660 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cpp
@@ -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/lock/securedlg.h b/kdesktop/lock/securedlg.h
index 9ad0ac1da..c6c9fa7fe 100644
--- a/kdesktop/lock/securedlg.h
+++ b/kdesktop/lock/securedlg.h
@@ -27,7 +27,7 @@ class TQListView;
 //
 class SecureDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		SecureDlg(LockProcess *parent);
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cpp
index f02e51440..e121daaa1 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cpp
@@ -11,18 +11,20 @@
 
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <tdeglobal.h>
 
+#ifdef WITH_TDEHWLIB
 #include <ksslcertificate.h>
-
+#include <kuser.h>
 #include <tdehardwaredevices.h>
 #include <tdecryptographiccarddevice.h>
+#endif
 
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
-#include <kuser.h>
 #include <tdelocale.h>
 #include <tqfile.h>
 #include <tqtimer.h>
@@ -132,12 +134,12 @@ SaverEngine::SaverEngine()
 	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(this, TQ_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQ_SLOT(terminateThread()));
+	connect(m_threadHelperObject, TQ_SIGNAL(lockProcessWaiting()), this, TQ_SLOT(lockProcessWaiting()));
+	connect(m_threadHelperObject, TQ_SIGNAL(lockProcessFullyActivated()), this, TQ_SLOT(lockProcessFullyActivated()));
 
-	connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)),
-						TQT_SLOT(lockProcessExited()));
+	connect(&mLockProcess, TQ_SIGNAL(processExited(TDEProcess *)),
+						TQ_SLOT(lockProcessExited()));
 
 	configure();
 
@@ -158,8 +160,8 @@ SaverEngine::SaverEngine()
 	if (useSAKProcess) {
 		mSAKProcess = new TDEProcess;
 		*mSAKProcess << "tdmtsak";
-		connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
-		TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
+		connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
+		TQTimer::singleShot( 0, this, TQ_SLOT(handleSecureDialog()) );
 	}
 
 	mLockProcess.clearArguments();
@@ -198,14 +200,15 @@ SaverEngine::SaverEngine()
 	delete config;
 	config = NULL;
 
+#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*)));
+		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);
 	}
 
@@ -217,10 +220,11 @@ SaverEngine::SaverEngine()
 		TQTextStream stream(&flagFile);
 		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();
 	}
+#endif
 
 	dBusConnect();
 }
@@ -261,6 +265,7 @@ void SaverEngine::cardStartupTimeout() {
 }
 
 void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
 	TQString login_name = TQString::null;
 	X509CertificatePtrList certList = cdevice->cardX509Certificates();
 	if (certList.count() > 0) {
@@ -282,9 +287,11 @@ void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice)
 			mValidCryptoCardInserted = true;
 		}
 	}
+#endif
 }
 
 void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
 	if (mValidCryptoCardInserted) {
 		mValidCryptoCardInserted = false;
 
@@ -294,6 +301,7 @@ void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice)
 		// Force lock
 		lockScreen();
 	}
+#endif
 }
 
 //---------------------------------------------------------------------------
@@ -401,7 +409,7 @@ bool SaverEngine::enable( bool e )
 	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);
@@ -437,7 +445,7 @@ bool SaverEngine::isBlanked()
 
 void SaverEngine::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	kdDebug(270) << k_lineinfo << "activating background exports.\n";
 	DCOPClient *client = kapp->dcopClient();
 	if (!client->isAttached()) {
@@ -694,7 +702,7 @@ void SaverEngine::lockProcessExited()
 		// PROBABLE HACKING ATTEMPT DETECTED
 		restartDesktopLockProcess();
 		mState = Waiting;
-		TQTimer::singleShot( 100, this, SLOT(recoverFromHackingAttempt()) );
+		TQTimer::singleShot( 100, this, TQ_SLOT(recoverFromHackingAttempt()) );
 	}
 	else {
 		// Restart the lock process
@@ -841,19 +849,19 @@ bool SaverEngine::dBusConnect() {
 	dBusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus, DBUS_CONN_NAME);
 	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);
@@ -887,8 +895,8 @@ void SaverEngine::onDBusServiceRegistered(const TQString& service) {
 		// wather for systemd session signals
 		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;
 	}
@@ -916,7 +924,7 @@ void SaverEngine::handleDBusSignal(const TQT_DBusMessage& msg) {
 	 && msg.interface() == DBUS_INTERFACE_LOCAL
 	 && msg.member() == "Disconnected" ) {
 		dBusClose();
-		TQTimer::singleShot(1000, this, TQT_SLOT(dBusReconnect()));
+		TQTimer::singleShot(1000, this, TQ_SLOT(dBusReconnect()));
 		return;
 	}
 
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
index 11f751db8..c50361bc0 100644
--- a/kdesktop/lockeng.h
+++ b/kdesktop/lockeng.h
@@ -18,14 +18,18 @@
 
 #include <tqdbusconnection.h>
 
+#ifdef WITH_TDEHWLIB
 class TDECryptographicCardDevice;
+#else
+#define TDECryptographicCardDevice void
+#endif
 class DCOPClientTransaction;
 class TQT_DBusMessage;
 class TQT_DBusProxy;
 
 class SaverEngineThreadHelperObject : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public slots:
 	void terminateThread();
@@ -44,7 +48,7 @@ signals:
  */
 class SaverEngine : public TQWidget, public KScreensaverIface
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SaverEngine();
 	~SaverEngine();
diff --git a/kdesktop/main.cc b/kdesktop/main.cpp
index b54c03cb7..7435acd62 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cpp
@@ -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
 
@@ -247,7 +247,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
             *qt_no_foreign_hack = true;
         // else argb_visual = false ... ? *shrug*
         if( argb_visual )
-            myApp = new KDesktopApp( dpy, Qt::HANDLE( visual ), 0 );
+            myApp = new KDesktopApp( dpy, TQt::HANDLE( visual ), 0 );
         else
             XCloseDisplay( dpy );
     }
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 769c49849..1192a0292 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -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);
 
@@ -375,7 +375,7 @@ void Minicli::reset()
 
 void Minicli::keyPressEvent( TQKeyEvent* e )
 {
-  if ( e->key() == Qt::Key_Escape )
+  if ( e->key() == TQt::Key_Escape )
   {
     e->accept();
     m_dlg->pbCancel->animateClick();
@@ -877,7 +877,7 @@ void Minicli::setIcon ()
       {
         TQBitmap mask = *icon.mask();
         bitBlt( &mask, x, y,
-                overlay.mask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(overlay.mask())) : &overlay,
+                overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay,
                 0, 0, overlay.width(), overlay.height(),
                 overlay.mask() ? OrROP : SetROP );
         icon.setMask(mask);
@@ -1094,6 +1094,3 @@ void Minicli::fontChange( const TQFont & )
 {
    adjustSize();
 }
-
-// vim: set et ts=2 sts=2 sw=2:
-
diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h
index 9d92825c7..c3974a13b 100644
--- a/kdesktop/minicli.h
+++ b/kdesktop/minicli.h
@@ -46,7 +46,7 @@ class KURIFilterData;
 
 class Minicli : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   Minicli( TQWidget *parent=0, const char *name=0 );
diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui
index 13d3b9736..93c95c8f0 100644
--- a/kdesktop/minicli_ui.ui
+++ b/kdesktop/minicli_ui.ui
@@ -640,21 +640,14 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">fixx11h.h</include>
+    <include location="local" impldecl="in implementation">kcombobox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">kiconloader.h</include>
-    <include location="local" impldecl="in implementation">kpassdlg.h</include>
-    <include location="local" impldecl="in implementation">kcombobox.h</include>
     <include location="local" impldecl="in implementation">klineedit.h</include>
+    <include location="local" impldecl="in implementation">kpassdlg.h</include>
     <include location="local" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <pixmapfunction>BarIcon</pixmapfunction>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpassdlg.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cpp
index 7a480cdb6..56224f37a 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index 3084cd0a3..661d531ad 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module kdesktop.
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -24,7 +24,7 @@
 
 struct KPixmapInode 
 {
-    Qt::HANDLE handle;
+    TQt::HANDLE handle;
     Atom selection;
 };
 
@@ -37,7 +37,7 @@ struct KPixmapData
 
 struct TDESelectionInode
 {
-    Qt::HANDLE handle;
+    TQt::HANDLE handle;
     TQString name;
 };
 
@@ -50,7 +50,7 @@ struct TDESelectionInode
  */
 class KPixmapServer: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KPixmapServer();
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 4027b7e9a..7d448c089 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -56,16 +56,16 @@ StartupId::StartupId( TQWidget* parent, const char* name )
         XSelectInput( tqt_xdisplay(), tqt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask);
         kapp->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;
     }
@@ -176,7 +176,7 @@ void StartupId::start_startupid( const TQString& icon_P )
     {
 
     const TQColor startup_colors[ StartupId::NUM_BLINKING_PIXMAPS ]
-    = { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
+    = { TQt::black, TQt::darkGray, TQt::lightGray, TQt::white, TQt::white };
 
 
     TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0,
diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h
index 893d0b8db..27345d598 100644
--- a/kdesktop/startupid.h
+++ b/kdesktop/startupid.h
@@ -34,7 +34,7 @@ class TQStyle;
 class StartupId
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         StartupId( TQWidget* parent = 0, const char* name = 0 );
         virtual ~StartupId();
diff --git a/kdesktop/tdefileividesktop.h b/kdesktop/tdefileividesktop.h
index 46f77f636..0434a706e 100644
--- a/kdesktop/tdefileividesktop.h
+++ b/kdesktop/tdefileividesktop.h
@@ -33,7 +33,7 @@
 /*
  * The dither flags used to display the shadow image
  */
-#define DITHER_FLAGS (Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::AvoidDither)
+#define DITHER_FLAGS (TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::AvoidDither)
 
 
 class TQFont;
diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cpp
index 3c7e62670..3c7e62670 100644
--- a/kdesktop/xautolock.cc
+++ b/kdesktop/xautolock.cpp
diff --git a/kdesktop/xautolock.h b/kdesktop/xautolock.h
index 5684ce6ef..a30405339 100644
--- a/kdesktop/xautolock.h
+++ b/kdesktop/xautolock.h
@@ -19,7 +19,7 @@
 //
 class XAutoLock : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     XAutoLock();
     ~XAutoLock();
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index fa2512077..47320d0b0 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[] =
 {
@@ -125,10 +125,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
@@ -301,11 +301,11 @@ 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() ) );
+	TQObject::connect( timer, TQ_SIGNAL( timeout() ), kapp, TQ_SLOT( quit() ) );
+	TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
 	timer->start( duration, TRUE );
 
-#ifdef Q_WS_X11	
+#ifdef TQ_WS_X11	
 	if ( ! kapp->geometryArgument().isEmpty()) {
 	    int x, y;
 	    int w, h;
@@ -525,7 +525,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
diff --git a/kdialog/progressdialog.h b/kdialog/progressdialog.h
index cdfca1ccb..1cf090081 100644
--- a/kdialog/progressdialog.h
+++ b/kdialog/progressdialog.h
@@ -24,7 +24,7 @@
 
 class ProgressDialog : public KProgressDialog, virtual public ProgressDialogIface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
       ProgressDialog(TQWidget* parent = 0, const TQString& caption = TQString::null, const TQString& text = TQString::null, int totalSteps = 100);
diff --git a/kdialog/tdelistboxdialog.h b/kdialog/tdelistboxdialog.h
index a93e7d002..3ade107f0 100644
--- a/kdialog/tdelistboxdialog.h
+++ b/kdialog/tdelistboxdialog.h
@@ -25,7 +25,7 @@
 
 class TDEListBoxDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index f68acfe4f..126eeec22 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -35,13 +35,13 @@
 #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
+#ifdef TQ_WS_X11
     if ( ! kapp->geometryArgument().isEmpty()) {
 	int x, y;
 	int w, h;
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index 869753c5b..4e44f6c91 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -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()
@@ -84,9 +84,9 @@ void KDateCombo::dateEnteredEvent(TQDate newDate)
 
 void KDateCombo::mousePressEvent (TQMouseEvent * e)
 {
-  if (e->button() & Qt::LeftButton)
+  if (e->button() & TQt::LeftButton)
   {
-    if  (TQT_TQRECT_OBJECT(rect()).contains( e->pos()))
+    if  (rect().contains( e->pos()))
     {
       TQDate tempDate;
       getDate(& tempDate);
@@ -103,9 +103,9 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
   {
       TQMouseEvent *me = (TQMouseEvent *)e;
       TQPoint p = mapFromGlobal( me->globalPos() );
-      if (TQT_TQRECT_OBJECT(rect()).contains( p ) )
+      if (rect().contains( p ) )
       {
-        TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent()));
+        TQTimer::singleShot(10, this, TQ_SLOT(dateEnteredEvent()));
         return true;
       }
   }
@@ -113,12 +113,12 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
   {
       TQKeyEvent *k = (TQKeyEvent *)e;
       //Press return == pick selected date and close the combo
-      if((k->key()==Qt::Key_Return)||(k->key()==Qt::Key_Enter))
+      if((k->key()==TQt::Key_Return)||(k->key()==TQt::Key_Enter))
       {
         dateEnteredEvent(datePicker->date());
         return true;
       }
-      else if (k->key()==Qt::Key_Escape)
+      else if (k->key()==TQt::Key_Escape)
       {
         popupFrame->hide();
         return true;
diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h
index d1aa3ecdc..3a3f8d194 100644
--- a/kfind/kdatecombo.h
+++ b/kfind/kdatecombo.h
@@ -19,7 +19,7 @@ class KDatePicker;
 class TDEPopupFrame;
 
 class KDateCombo : public TQComboBox  {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
 	KDateCombo(TQWidget *parent=0, const char *name=0);
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/kfind.h b/kfind/kfind.h
index fda0028ca..ec2b84542 100644
--- a/kfind/kfind.h
+++ b/kfind/kfind.h
@@ -20,7 +20,7 @@ class KfindTabWidget;
 
 class Kfind: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Kfind(TQWidget * parent = 0, const char * name = 0);
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index 29e3010b4..f26710ce2 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -31,7 +31,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
 	KStdGuiItem::saveAs())
 {
   TQWidget::setCaption( i18n("Find Files/Folders" ) );
-  setButtonBoxOrientation(Qt::Vertical);
+  setButtonBoxOrientation(TQt::Vertical);
 
   enableButton(Apply, true); // Enable "Find"
   enableButton(User1, false); // Disable "Stop"
@@ -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/kfinddlg.h b/kfind/kfinddlg.h
index d8080ec46..829a3da8f 100644
--- a/kfind/kfinddlg.h
+++ b/kfind/kfinddlg.h
@@ -22,7 +22,7 @@ class KStatusBar;
 
 class KfindDlg: public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
   KfindDlg(const KURL & url, TQWidget * parent = 0, const char * name = 0);
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 54de01e9b..8fb99fdac 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -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.h b/kfind/kfindpart.h
index 3ec83970a..b07705645 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -41,7 +41,7 @@ class IconViewBrowserExtension;
 class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
 {
   friend class KFindPartBrowserExtension;
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool showsResult READ showsResult )
 public:
     KFindPart( TQWidget * parentWidget, const char *widgetName, 
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index c2df7aa67..3820eaead 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -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
 
@@ -212,7 +212,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     grid1->addWidget(rb[0], 1, 1 );
     grid1->addWidget(fromDate, 1, 2 );
-    grid1->addWidget(andL, 1, 3, Qt::AlignHCenter );
+    grid1->addWidget(andL, 1, 3, TQt::AlignHCenter );
     grid1->addWidget(toDate, 1, 4 );
 
     grid1->addWidget(rb[1], 2, 1 );
@@ -235,9 +235,9 @@ 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
@@ -250,7 +250,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     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();
@@ -330,7 +330,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     grid2->addWidget( textMetaKey, 4, 0 );
     grid2->addWidget( metainfokeyEdit, 4, 1 );
-    grid2->addWidget( textMetaInfo, 4, 2, Qt::AlignHCenter  );
+    grid2->addWidget( textMetaInfo, 4, 2, TQt::AlignHCenter  );
     grid2->addWidget( metainfoEdit, 4, 3 );
 
     metainfokeyEdit->setText("*");
@@ -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 )
@@ -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/kftabdlg.h b/kfind/kftabdlg.h
index c080c44d4..6cb1455b2 100644
--- a/kfind/kftabdlg.h
+++ b/kfind/kftabdlg.h
@@ -31,7 +31,7 @@ class KfDirDialog;
 
 class KfindTabWidget: public TQTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KfindTabWidget(TQWidget * parent = 0, const char *name=0);
@@ -121,7 +121,7 @@ private:
 
 class KDigitValidator : public TQValidator
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KDigitValidator(TQWidget * parent, const char *name = 0 );
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index f068d031e..c4a19cf94 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -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);
 
 }
@@ -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/kfwin.h b/kfind/kfwin.h
index 5a019a382..76837c4a0 100644
--- a/kfind/kfwin.h
+++ b/kfind/kfwin.h
@@ -31,7 +31,7 @@ class KfFileLVI : public TQListViewItem
 
 class KfindWindow: public   TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KfindWindow( TQWidget * parent = 0, const char * name = 0 );
 
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 1e3617c70..44fc2a97d 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -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 )
diff --git a/kfind/kquery.h b/kfind/kquery.h
index 8f12e782c..34ed16457 100644
--- a/kfind/kquery.h
+++ b/kfind/kquery.h
@@ -17,7 +17,7 @@ class KFileItem;
 
 class KQuery : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
   KQuery(TQObject *parent = 0, const char * name = 0);
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index 68d762a53..f2e11d0cf 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -384,7 +384,7 @@ protocol == "help") by itself and otherwise use the plain URL.
 ## mode.
 
 # Hmm yes, that should be possible. Take the toplevel widget, use
-# QObject::children() and iterate over all children, use QToolTip::textFor() to
+# TQObject::children() and iterate over all children, use QToolTip::textFor() to
 # check whether the given qwidget has a tooltip and if so, use QToolTip::tip()
 # to show the tooltip.
 # One could probably add a standard dcop call to TDEMainWindow, like
@@ -429,5 +429,3 @@ Font Configuration
 
 # FWIW I added a simple font configuration facility a while back, which should
 # IMHO be sufficient for the vast majority of users.
-
-// vim:tw=78
diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp
index 631818dfa..cb9f17abb 100644
--- a/khelpcenter/application.cpp
+++ b/khelpcenter/application.cpp
@@ -86,5 +86,3 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
 
   return app.exec();
 }
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/application.h b/khelpcenter/application.h
index 642f4dfda..b908e2b09 100644
--- a/khelpcenter/application.h
+++ b/khelpcenter/application.h
@@ -42,4 +42,3 @@ class Application : public KUniqueApplication
 extern "C" { int kdemain(int argc, char **argv); }
 
 #endif // APPLICATION_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 220ed0f93..eba2fda2d 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -345,4 +345,3 @@ void DocEntry::dump() const
   kdDebug() << "    <documenttype>" << mDocumentType << "</documenttype>" << endl; 
   kdDebug() << "  </docentry>" << endl;
 }
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docentry.h b/khelpcenter/docentry.h
index d86cde9d2..bca2b1d74 100644
--- a/khelpcenter/docentry.h
+++ b/khelpcenter/docentry.h
@@ -114,4 +114,3 @@ class DocEntry
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docentrytraverser.cpp b/khelpcenter/docentrytraverser.cpp
index d6335d232..f89d1cf8f 100644
--- a/khelpcenter/docentrytraverser.cpp
+++ b/khelpcenter/docentrytraverser.cpp
@@ -46,4 +46,3 @@ DocEntry *DocEntryTraverser::parentEntry()
 {
   return mParentEntry;
 }
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docentrytraverser.h b/khelpcenter/docentrytraverser.h
index d8c8cb15e..84ec7d21b 100644
--- a/khelpcenter/docentrytraverser.h
+++ b/khelpcenter/docentrytraverser.h
@@ -41,4 +41,3 @@ class DocEntryTraverser
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 8e254d909..e56062a07 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -284,4 +284,3 @@ void DocMetaInfo::endTraverseEntries( DocEntryTraverser *traverser )
 
   traverser->finishTraversal();
 }
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/docmetainfo.h b/khelpcenter/docmetainfo.h
index 9b6871fa7..657dad27b 100644
--- a/khelpcenter/docmetainfo.h
+++ b/khelpcenter/docmetainfo.h
@@ -77,4 +77,3 @@ class DocMetaInfo
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 1f0cc8f68..7acac556d 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -209,4 +209,3 @@ void FontDialog::save()
 }
 
 #include "fontdialog.moc"
-// vim:ts=4:sw=4:noet
diff --git a/khelpcenter/fontdialog.h b/khelpcenter/fontdialog.h
index ef06f2b84..c95004540 100644
--- a/khelpcenter/fontdialog.h
+++ b/khelpcenter/fontdialog.h
@@ -33,7 +33,7 @@ namespace KHC {
 
 class FontDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		FontDialog( TQWidget *parent, const char *name = 0 );
 
@@ -63,4 +63,3 @@ class FontDialog : public KDialogBase
 }
 
 #endif // FONTDIALOG_H
-// vim:ts=4:sw=4:noet
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index 21e2abb27..c42aaaece 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -218,5 +218,3 @@ TQString Formatter::title( const TQString &title )
 {
   return "<h2>" + title + "</h2>";
 }
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/formatter.h b/khelpcenter/formatter.h
index 9710a0dca..126215584 100644
--- a/khelpcenter/formatter.h
+++ b/khelpcenter/formatter.h
@@ -51,5 +51,3 @@ class Formatter
 }
 
 #endif
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 5a2170256..8675466a6 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -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 );
@@ -147,8 +147,8 @@ void Glossary::rebuildGlossaryCache()
 	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;
@@ -319,4 +319,3 @@ void Glossary::slotSelectGlossEntry( const TQString &id )
 }
 
 #include "glossary.moc"
-// vim:ts=4:sw=4:et
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index 616c51b86..d9893abbf 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -99,7 +99,7 @@ inline TQDataStream &operator>>( TQDataStream &stream, GlossaryEntry &e )
 
 class Glossary : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		Glossary( TQWidget *parent );
 		virtual ~Glossary();
@@ -143,4 +143,3 @@ class Glossary : public TDEListView
 }
 
 #endif // KHC_GLOSSARY_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 0f0085a02..69e6521ae 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()
@@ -348,4 +348,3 @@ bool History::canGoForward() const
 }
 
 #include "history.moc"
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/history.h b/khelpcenter/history.h
index c7c4c9532..21f41fa09 100644
--- a/khelpcenter/history.h
+++ b/khelpcenter/history.h
@@ -36,7 +36,7 @@ class View;
 
 class History : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     friend class foo; // to make gcc shut up
     struct Entry
@@ -104,4 +104,3 @@ class History : public TQObject
 }
 
 #endif // HISTORY_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/htmlsearch.cpp b/khelpcenter/htmlsearch.cpp
index 72eaa432d..0598ae896 100644
--- a/khelpcenter/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch.cpp
@@ -57,5 +57,3 @@ TQString HTMLSearch::defaultIndexTestFile( KHC::DocEntry *entry )
 {
   return entry->identifier() + ".exists";
 }
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/htmlsearch.h b/khelpcenter/htmlsearch.h
index 1ca97488f..355e8932f 100644
--- a/khelpcenter/htmlsearch.h
+++ b/khelpcenter/htmlsearch.h
@@ -10,9 +10,9 @@ namespace KHC {
 
 class DocEntry;
 
-class HTMLSearch : public QObject
+class HTMLSearch : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     HTMLSearch();
     ~HTMLSearch();
@@ -30,4 +30,3 @@ class HTMLSearch : public QObject
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index 5fd0f4640..ee8cb5bd4 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -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;
 
@@ -340,8 +340,8 @@ 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;
 
@@ -444,10 +444,10 @@ 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 = "";
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index 37d9bf39f..e0c533f81 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -16,9 +16,9 @@ class TDEProcess;
 class ProgressDialog;
 
 
-class HTMLSearch : public QObject
+class HTMLSearch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 3db9c9895..cd4e56021 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -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();
 
@@ -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);
 
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 28445437a..72ae1c396 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -35,7 +35,7 @@ class KURLRequester;
 
 class TDEHTMLSearchConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/khelpcenter/htmlsearch/klangcombo.h b/khelpcenter/htmlsearch/klangcombo.h
index 4ca6e2f3b..7b07fee03 100644
--- a/khelpcenter/htmlsearch/klangcombo.h
+++ b/khelpcenter/htmlsearch/klangcombo.h
@@ -34,7 +34,7 @@
  */
 class KLanguageCombo : public KTagComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KLanguageCombo(TQWidget *parent=0, const char *name=0);
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/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h
index df58120ce..c28336f21 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.h
+++ b/khelpcenter/htmlsearch/ktagcombobox.h
@@ -37,7 +37,7 @@ class TQPopupMenu;
  */
 class KTagComboBox : public QComboBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KTagComboBox(TQWidget *parent=0, const char *name=0);
diff --git a/khelpcenter/htmlsearch/progressdialog.h b/khelpcenter/htmlsearch/progressdialog.h
index 9ab5660d9..f39a0d83e 100644
--- a/khelpcenter/htmlsearch/progressdialog.h
+++ b/khelpcenter/htmlsearch/progressdialog.h
@@ -12,7 +12,7 @@ class KProgress;
 class ProgressDialog : public KDialogBase
 {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index a9eef3b41..d7af38c07 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -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 );
@@ -148,4 +148,3 @@ void HtmlSearchConfig::urlClicked(const TQString &url)
 }
 
 } // End namespace KHC
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/htmlsearchconfig.h b/khelpcenter/htmlsearchconfig.h
index 7f5742b1e..7cb5fc00a 100644
--- a/khelpcenter/htmlsearchconfig.h
+++ b/khelpcenter/htmlsearchconfig.h
@@ -30,7 +30,7 @@ namespace KHC {
 
 class HtmlSearchConfig : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     HtmlSearchConfig(TQWidget *parent = 0L, const char *name = 0L);
     virtual ~HtmlSearchConfig();
@@ -55,4 +55,3 @@ class HtmlSearchConfig : public TQWidget
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index c0c5a9d9e..2c71d2bbe 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -181,4 +181,3 @@ void InfoTree::parseInfoDirFile( const TQString &infoDirFileName )
 }
 
 #include "infotree.moc"
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/infotree.h b/khelpcenter/infotree.h
index ab1911818..e4fc4fd44 100644
--- a/khelpcenter/infotree.h
+++ b/khelpcenter/infotree.h
@@ -29,7 +29,7 @@ namespace KHC
   class NavigatorItem;
   class InfoTree : public TreeBuilder
   {
-    Q_OBJECT
+    TQ_OBJECT
     public:
       InfoTree( TQObject *parent, const char *name = 0 );
 
@@ -45,4 +45,3 @@ namespace KHC
 }
 
 #endif // KHC_INFOTREE_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index df8f1b36e..e5b2d0937 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -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 );
@@ -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."
@@ -683,5 +683,3 @@ void KCMHelpCenter::findWriteableIndexDir()
     Prefs::setIndexDirectory( TDEGlobal::dirs()->saveLocation("data", "khelpcenter/index/") );
 }
 #include "kcmhelpcenter.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index 0212a22c5..0a28f5f98 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -47,7 +47,7 @@ class SearchEngine;
 
 class IndexDirDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     IndexDirDialog( TQWidget *parent );
 
@@ -60,7 +60,7 @@ class IndexDirDialog : public KDialogBase
 
 class IndexProgressDialog : public KDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     IndexProgressDialog( TQWidget *parent );
     ~IndexProgressDialog();
@@ -105,7 +105,7 @@ class KCMHelpCenterIface : virtual public DCOPObject
 
 class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     KCMHelpCenter( KHC::SearchEngine *, TQWidget *parent = 0,
       const char *name = 0 );
@@ -182,4 +182,3 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
 };
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 9c605687b..dd0ee5811 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -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 );
 
@@ -211,11 +211,9 @@ 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();
 }
 
 #include "khc_indexbuilder.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/khc_indexbuilder.h b/khelpcenter/khc_indexbuilder.h
index 5eb849419..8cbaf6b00 100644
--- a/khelpcenter/khc_indexbuilder.h
+++ b/khelpcenter/khc_indexbuilder.h
@@ -30,9 +30,9 @@ class TDEProcess;
 
 namespace KHC {
 
-class IndexBuilder : public QObject
+class IndexBuilder : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     IndexBuilder(const TQString& cmdFile);
 
@@ -57,5 +57,3 @@ class IndexBuilder : public QObject
 }
 
 #endif
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index c2246232a..0bfc80118 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);
@@ -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();
 }
@@ -463,5 +463,3 @@ void MainWindow::slotConfigureFonts()
 }
 
 #include "mainwindow.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 795b6e13c..22b07cdca 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -24,7 +24,7 @@ class View;
 
 class MainWindow : public TDEMainWindow, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
   public:
     MainWindow();
@@ -105,4 +105,3 @@ private:
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 9590ea54d..8b10688cd 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -85,8 +85,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
     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( QWidget * ) ),
-             TQT_SLOT( slotTabChanged( QWidget * ) ) );
+    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" ) );
 }
 
@@ -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 );
 }
 
@@ -556,7 +556,7 @@ void Navigator::slotSearch()
 
   // disable search Button during searches
   mSearchButton->setEnabled(false);
-  TQApplication::setOverrideCursor(tqwaitCursor);
+  TQApplication::setOverrideCursor(TQt::waitCursor);
 
   if ( !mSearchEngine->search( words, method, pages, scope ) ) {
     slotSearchFinished();
@@ -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();
@@ -678,5 +678,3 @@ void Navigator::clearSearch()
 }
 
 #include "navigator.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index f91de4327..798f71101 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -54,7 +54,7 @@ class Formatter;
 
 class Navigator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     Navigator(View *, TQWidget *parent=0, const char *name=0);
     virtual ~Navigator();
@@ -150,4 +150,3 @@ class Navigator : public TQWidget
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatorappitem.cpp b/khelpcenter/navigatorappitem.cpp
index 42f98e09d..b4992ea3d 100644
--- a/khelpcenter/navigatorappitem.cpp
+++ b/khelpcenter/navigatorappitem.cpp
@@ -172,5 +172,3 @@ TQString NavigatorAppItem::documentationURL( KService *s )
   
   return TQString( "help:/" ) + docPath;
 }
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatorappitem.h b/khelpcenter/navigatorappitem.h
index c89e1de77..e751251b4 100644
--- a/khelpcenter/navigatorappitem.h
+++ b/khelpcenter/navigatorappitem.h
@@ -56,4 +56,3 @@ class NavigatorAppItem : public NavigatorItem
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatoritem.cpp b/khelpcenter/navigatoritem.cpp
index ad464bacb..45760f0bc 100644
--- a/khelpcenter/navigatoritem.cpp
+++ b/khelpcenter/navigatoritem.cpp
@@ -106,5 +106,3 @@ TQString NavigatorItem::key( int column, bool ascending ) const
 {
   return text( column ).lower();
 }
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/navigatoritem.h b/khelpcenter/navigatoritem.h
index 7808b9cda..4c0f8fedd 100644
--- a/khelpcenter/navigatoritem.h
+++ b/khelpcenter/navigatoritem.h
@@ -66,5 +66,3 @@ class NavigatorItem : public TQListViewItem
 }
 
 #endif
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/plugins/CMakeLists.txt b/khelpcenter/plugins/CMakeLists.txt
index 54b806127..da976193a 100644
--- a/khelpcenter/plugins/CMakeLists.txt
+++ b/khelpcenter/plugins/CMakeLists.txt
@@ -18,7 +18,8 @@ tde_create_translated_desktop(
     applets.desktop contact.desktop faq.desktop info.desktop
     links.desktop support.desktop userguide.desktop welcome.desktop
     hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop
-    tdeioslaves.desktop quickstart.desktop visualdict.desktop adminguide.desktop
+    tdeioslaves.desktop quickstart.desktop releasenotes.desktop
+    visualdict.desktop adminguide.desktop
   DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins
   PO_DIR khelpcenter-desktops
 )
diff --git a/khelpcenter/plugins/Makefile.am b/khelpcenter/plugins/Makefile.am
index f9c4f477a..979be4a92 100644
--- a/khelpcenter/plugins/Makefile.am
+++ b/khelpcenter/plugins/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = Applications Manpages
 plugin_DATA = applets.desktop contact.desktop faq.desktop info.desktop \
   links.desktop support.desktop userguide.desktop welcome.desktop \
   kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop \
-  tdeioslaves.desktop quickstart.desktop visualdict.desktop adminguide.desktop
+  tdeioslaves.desktop quickstart.desktop releasenotes.desktop \
+  visualdict.desktop adminguide.desktop
 
 plugindir = $(kde_datadir)/khelpcenter/plugins
diff --git a/khelpcenter/plugins/releasenotes.desktop b/khelpcenter/plugins/releasenotes.desktop
new file mode 100644
index 000000000..e834fad6c
--- /dev/null
+++ b/khelpcenter/plugins/releasenotes.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+X-DocPath=help:/khelpcenter/releasenotes
+X-DOC-Weight=-1800
+Icon=kmenu
+
+Name=TDE Release Notes
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index ca33664df..80c2e33cb 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -112,5 +112,3 @@ DocEntryTraverser *PluginTraverser::createChild( DocEntry * /*entry*/ )
   kdDebug( 1400 ) << "ERROR! mCurrentItem is not set." << endl;
   return 0;
 }
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/plugintraverser.h b/khelpcenter/plugintraverser.h
index 93b48003c..697b8a44d 100644
--- a/khelpcenter/plugintraverser.h
+++ b/khelpcenter/plugintraverser.h
@@ -49,4 +49,3 @@ namespace KHC {
 }
 
 #endif // KHC_PLUGINTRAVERSER_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/scopeitem.h b/khelpcenter/scopeitem.h
index cabbab76e..873ee5a76 100644
--- a/khelpcenter/scopeitem.h
+++ b/khelpcenter/scopeitem.h
@@ -47,4 +47,3 @@ class ScopeItem : public TQCheckListItem
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index f96ab3f5d..7d54f0f63 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -61,7 +61,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent,
   KProcIO proc;
   proc << "scrollkeeper-get-content-list";
   proc << lang;
-  connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *)));
+  connect(&proc,TQ_SIGNAL(readReady(KProcIO *)),TQ_SLOT(getContentsList(KProcIO *)));
   if (!proc.start(TDEProcess::Block)) {
     kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl;
     return 0;
@@ -197,4 +197,3 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
 }
 
 #include "scrollkeepertreebuilder.moc"
-// vim:sw=2:ts=2:et
diff --git a/khelpcenter/scrollkeepertreebuilder.h b/khelpcenter/scrollkeepertreebuilder.h
index 2761a10bf..cca8a2c22 100644
--- a/khelpcenter/scrollkeepertreebuilder.h
+++ b/khelpcenter/scrollkeepertreebuilder.h
@@ -33,7 +33,7 @@ namespace KHC {
 
 class ScrollKeeperTreeBuilder : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     ScrollKeeperTreeBuilder( TQObject *parent, const char *name = 0 );
 
@@ -56,4 +56,3 @@ class ScrollKeeperTreeBuilder : public TQObject
 }
 
 #endif // KHC_SCROLLKEEPERTREEBUILDER_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 56b6e635c..6dde748a9 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -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 = "";
@@ -498,5 +498,3 @@ bool SearchEngine::needsIndex( DocEntry *entry )
 }
 
 #include "searchengine.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index ac31a9e0a..268954618 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -24,7 +24,7 @@ class SearchHandler;
 
 class SearchTraverser : public TQObject, public DocEntryTraverser
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     SearchTraverser( SearchEngine *engine, int level );
     ~SearchTraverser();
@@ -66,7 +66,7 @@ class SearchTraverser : public TQObject, public DocEntryTraverser
 
 class SearchEngine : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     enum Operation { And, Or };
 
@@ -148,4 +148,3 @@ class SearchEngine : public TQObject
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 54a0a9a38..a2eab853d 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -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/searchhandler.h b/khelpcenter/searchhandler.h
index 31c3adb1f..b580d0ebb 100644
--- a/khelpcenter/searchhandler.h
+++ b/khelpcenter/searchhandler.h
@@ -47,9 +47,9 @@ class SearchJob
     TQString mError;
 };
 
-class SearchHandler : public QObject
+class SearchHandler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     static SearchHandler *initFromFile( const TQString &filename );
 
diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp
index 5040a7d81..176db92c7 100644
--- a/khelpcenter/searchwidget.cpp
+++ b/khelpcenter/searchwidget.cpp
@@ -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 * ) ) );
 }
 
 
@@ -388,5 +388,3 @@ int SearchWidget::scopeCount() const
 }
 
 #include "searchwidget.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/searchwidget.h b/khelpcenter/searchwidget.h
index 14801223b..d6cd68729 100644
--- a/khelpcenter/searchwidget.h
+++ b/khelpcenter/searchwidget.h
@@ -44,7 +44,7 @@ class SearchEngine;
 
 class SearchWidget : public TQWidget, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
   k_dcop:
@@ -104,4 +104,3 @@ class SearchWidget : public TQWidget, public DCOPObject
 }
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp
index 2f77ff766..260ea77d0 100644
--- a/khelpcenter/testmetainfo.cpp
+++ b/khelpcenter/testmetainfo.cpp
@@ -116,4 +116,3 @@ int main(int argc,char **argv)
   DocMetaInfo::self()->startTraverseEntries( &a );
   kdDebug() << "Async TRAVERSE end" << endl;
 }
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index abd8019fe..e1aaf10aa 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -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" );
@@ -268,4 +268,3 @@ TQString TOCSectionItem::url()
 }
 
 #include "toc.moc"
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index 0a38c2ad5..dba0921fc 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -30,9 +30,9 @@ class TDEProcess;
 
 namespace KHC {
 
-class TOC : public QObject
+class TOC : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		TOC( NavigatorItem *parentItem );
 
@@ -69,4 +69,3 @@ class TOC : public QObject
 }
 
 #endif // KHC_TOC_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/treebuilder.cpp b/khelpcenter/treebuilder.cpp
index b8a0096d9..5463652d9 100644
--- a/khelpcenter/treebuilder.cpp
+++ b/khelpcenter/treebuilder.cpp
@@ -31,5 +31,3 @@ void TreeBuilder::selectURL( const TQString & )
 }
 
 #include "treebuilder.moc"
-
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/treebuilder.h b/khelpcenter/treebuilder.h
index 443444691..2e788e317 100644
--- a/khelpcenter/treebuilder.h
+++ b/khelpcenter/treebuilder.h
@@ -30,7 +30,7 @@ namespace KHC
 class NavigatorItem;
 class TreeBuilder : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		TreeBuilder( TQObject *parent, const char *name = 0 );
 
@@ -46,4 +46,3 @@ class TreeBuilder : public TQObject
 }
 
 #endif // TREEBUILDER_H
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/version.h b/khelpcenter/version.h
index b8623dbf6..f9dd26a8c 100644
--- a/khelpcenter/version.h
+++ b/khelpcenter/version.h
@@ -4,4 +4,3 @@
 #define HELPCENTER_VERSION TDE_VERSION_STRING
 
 #endif
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index cf6f90f66..49135e0b0 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -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())
@@ -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();
   }
 	
@@ -329,7 +329,7 @@ bool View::eventFilter( TQObject *o, TQEvent *e )
        htmlDocument().links().length() == 0 )
     return TDEHTMLPart::eventFilter( o, e );
 
-  TQKeyEvent *ke = TQT_TQKEYEVENT( e );
+  TQKeyEvent *ke = static_cast<TQKeyEvent*>( e );
   if ( ke->state() & TQt::ShiftButton && ke->key() == Key_Space ) {
     // If we're on the first page, it does not make sense to go back.
     if ( baseURL().path().endsWith( "/index.html" ) )
@@ -385,4 +385,3 @@ void View::slotReload( const KURL &url )
 }
 
 #include "view.moc"
-// vim:ts=2:sw=2:et
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 2ad17af6b..04b5af5e5 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -18,7 +18,7 @@ class Formatter;
 
 class View : public TDEHTMLPart
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     View( TQWidget *parentWidget, const char *widgetName,
           TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof,
@@ -90,5 +90,3 @@ class View : public TDEHTMLPart
 }
 
 #endif
-
-// vim:ts=2:sw=2:et
diff --git a/khotkeys/README b/khotkeys/README
index 933ebc210..78d9d1014 100644
--- a/khotkeys/README
+++ b/khotkeys/README
@@ -97,7 +97,7 @@
     a .desktop file from the TDE Menu to execute (e.g. 'System/konsole.desktop')
   - DCOP call tab settings - enter the application, object, DCOP method and
     arguments (e.g. 'kdesktop', 'KBackgroundIface',
-    'setWallpaper(QString,int)' and '"/some/pic.jpg" 1')
+    'setWallpaper(TQString,int)' and '"/some/pic.jpg" 1')
   - Keyboard input tab settings - enter the keyboard input you want to be
     simulated ( no, sorry, the 'Edit' button doesn't really work yet ).
     The "keypresses" are separated by a colon ( ':' ) and are written
diff --git a/khotkeys/app/app.h b/khotkeys/app/app.h
index e23edfcb1..e0b3566ab 100644
--- a/khotkeys/app/app.h
+++ b/khotkeys/app/app.h
@@ -21,7 +21,7 @@ class Action_data_group;
 class KHotKeysApp
     : public KUniqueApplication
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     k_dcop:
         ASYNC reread_configuration();
diff --git a/khotkeys/app/kded.h b/khotkeys/app/kded.h
index c0a1526ee..b2740a3a1 100644
--- a/khotkeys/app/kded.h
+++ b/khotkeys/app/kded.h
@@ -22,7 +22,7 @@ class Action_data_group;
 class KHotKeysModule
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     k_dcop:
         ASYNC reread_configuration();
diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp
index 0fdc48ab9..22732fa97 100644
--- a/khotkeys/arts/soundrecorder_arts.cpp
+++ b/khotkeys/arts/soundrecorder_arts.cpp
@@ -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/soundrecorder_arts.h b/khotkeys/arts/soundrecorder_arts.h
index 72e901832..7e279f9ee 100644
--- a/khotkeys/arts/soundrecorder_arts.h
+++ b/khotkeys/arts/soundrecorder_arts.h
@@ -38,7 +38,7 @@ namespace KHotKeys
 */
 class SoundRecorderArts : public SoundRecorder
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     SoundRecorderArts(TQObject *parent = 0, const char *name = 0);
     virtual ~SoundRecorderArts();
diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt
index 5028763ce..902c5a0e6 100644
--- a/khotkeys/kcontrol/CMakeLists.txt
+++ b/khotkeys/kcontrol/CMakeLists.txt
@@ -37,7 +37,7 @@ tde_create_translated_desktop( khotkeys.desktop )
 tde_add_kpart( kcm_khotkeys AUTOMOC
   SOURCES
     menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp
-    actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp
+    actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp waiting_widget.cpp
     action_group_tab.cpp kcmkhotkeys.cpp command_url_widget.cpp windowdef_list_widget.cpp
     windowdef_simple_widget.cpp triggers_tab.cpp dcop_widget.cpp info_tab.cpp
     action_list_widget.cpp keyboard_input_widget.cpp condition_list_widget.cpp
diff --git a/khotkeys/kcontrol/Makefile.am b/khotkeys/kcontrol/Makefile.am
index 7eb3f2f6d..03a728ae3 100644
--- a/khotkeys/kcontrol/Makefile.am
+++ b/khotkeys/kcontrol/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_khotkeys.la kcm_khotkeys_init.la
 
 kcm_khotkeys_la_SOURCES = \
     menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp \
-    actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp \
+    actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp waiting_widget.cpp \
     action_group_tab.cpp kcmkhotkeys.cpp command_url_widget.cpp windowdef_list_widget.cpp \
     windowdef_simple_widget.cpp triggers_tab.cpp dcop_widget.cpp info_tab.cpp \
     action_list_widget.cpp keyboard_input_widget.cpp condition_list_widget.cpp \
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_group_tab.h b/khotkeys/kcontrol/action_group_tab.h
index 970f16379..5b1435346 100644
--- a/khotkeys/kcontrol/action_group_tab.h
+++ b/khotkeys/kcontrol/action_group_tab.h
@@ -23,7 +23,7 @@ class Windowdef_list;
 class Action_group_tab
     : public Action_group_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Action_group_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Action_data_group* data_P );
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index 79744a09e..2f87132d8 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -32,6 +32,7 @@
 #include "dcop_widget.h"
 #include "keyboard_input_widget.h"
 #include "activate_window_widget.h"
+#include "waiting_widget.h"
 #include "kcmkhotkeys.h"
 
 namespace KHotKeys
@@ -48,7 +49,8 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
     popup->insertItem( i18n( "DCOP Call..." ), TYPE_DCOP_ACTION );
     popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION );
     popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION );
-    connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int )));
+    popup->insertItem( i18n( "Waiting..." ), TYPE_WAITING_ACTION );
+    connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int )));
     new_button->setPopup( popup );
     actions_listview->header()->hide();
     actions_listview->addColumn( "" );
@@ -58,20 +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( 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()
@@ -132,6 +131,9 @@ void Action_list_widget::new_selected( int type_P )
         case TYPE_ACTIVATE_WINDOW_ACTION: // Activate_window_action_dialog
             dlg = new Activate_window_action_dialog( NULL );
           break;
+        case TYPE_WAITING_ACTION: // Waiting_action_dialog
+            dlg = new Waiting_action_dialog( NULL );
+          break;
         default:
           assert( false );
         }
@@ -148,24 +150,81 @@ void Action_list_widget::new_selected( int type_P )
 
 void Action_list_widget::copy_pressed()
     {
-        if ( !selected_item )
-            return;
+    if ( !selected_item )
+      {
+      return;
+      }
+
     actions_listview->setSelected( create_listview_item( selected_item->action(),
-        selected_item->parent() ? NULL : actions_listview, selected_item->parent(),
-        selected_item, true ), true );
+    selected_item->parent() ? NULL : actions_listview, selected_item->parent(),
+    selected_item, true ), true );
     }
 
 void Action_list_widget::delete_pressed()
     {
-    delete selected_item; // CHECKME snad vyvola signaly pro enable()
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Action_list_item *nextItem = static_cast< Action_list_item* >(selected_item->nextSibling());
+    delete selected_item;
     selected_item = NULL;
+    if (!nextItem)
+        {
+        // If the last item of the list was deleted, get the new last item
+        nextItem = static_cast< Action_list_item* >(actions_listview->lastItem());
+        }
+    if (nextItem)
+        {
+        actions_listview->setSelected(nextItem, true);
+        current_changed(nextItem);
+        }
     }
 
 void Action_list_widget::modify_pressed()
     {
-        if ( !selected_item )
-            return;
-        edit_listview_item( selected_item );
+    if ( !selected_item )
+        {
+        return;
+        }
+    edit_listview_item( selected_item );
+    }
+
+void Action_list_widget::move_up_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Action_list_item *prevItem = nullptr;
+    TQListViewItem *currItem = actions_listview->firstChild();
+    while (currItem != selected_item)
+        {
+        prevItem = static_cast< Action_list_item* >(currItem);
+        currItem = currItem->nextSibling();
+        }
+    if (prevItem)
+        {
+        prevItem->moveItem(selected_item);
+        current_changed(selected_item);
+        }
+    }
+
+void Action_list_widget::move_down_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Action_list_item *nextItem = static_cast< Action_list_item* >(selected_item->nextSibling());
+    if (nextItem)
+        {
+        selected_item->moveItem(nextItem);
+        current_changed(selected_item);
+        }
     }
 
 void Action_list_widget::current_changed( TQListViewItem* item_P )
@@ -177,6 +236,8 @@ void Action_list_widget::current_changed( TQListViewItem* item_P )
     copy_button->setEnabled( item_P != NULL );
     modify_button->setEnabled( item_P != NULL );
     delete_button->setEnabled( item_P != NULL );
+    move_up_button->setEnabled(selected_item != actions_listview->firstChild());
+    move_down_button->setEnabled(selected_item != actions_listview->lastChild());
     }
 
 Action_list_item* Action_list_widget::create_listview_item( Action* action_P,
@@ -215,6 +276,8 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P )
     else if( Activate_window_action* action
         = dynamic_cast< Activate_window_action* >( item_P->action()))
         dlg = new Activate_window_action_dialog( action );
+    else if( Waiting_action* action = dynamic_cast< Waiting_action* >( item_P->action()))
+        dlg = new Waiting_action_dialog( action );
     else // CHECKME TODO pridat dalsi
         assert( false );
     Action* new_action = dlg->edit_action();
@@ -349,6 +412,28 @@ void Activate_window_action_dialog::accept()
     action = new Activate_window_action( NULL, widget->get_data()); // CHECKME NULL ?
     }
 
+// Waiting_action_dialog
+
+Waiting_action_dialog::Waiting_action_dialog( Waiting_action* action_P )
+    : KDialogBase( NULL, NULL, true, "", Ok | Cancel ), action( NULL )
+    {
+    widget = new Waiting_widget( this );
+    widget->set_data( action_P );
+    setMainWidget( widget );
+    }
+
+Action* Waiting_action_dialog::edit_action()
+    {
+    exec();
+    return action;
+    }
+
+void Waiting_action_dialog::accept()
+    {
+    KDialogBase::accept();
+    action = widget->get_data( NULL );
+    }
+
 } // namespace KHotKeys
 
 #include "action_list_widget.moc"
diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h
index c2f32477e..eb3ca7995 100644
--- a/khotkeys/kcontrol/action_list_widget.h
+++ b/khotkeys/kcontrol/action_list_widget.h
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #ifndef _ACTION_LIST_WIDGET_H_
@@ -28,13 +28,14 @@ class Command_url_widget;
 class Menuentry_widget;
 class Dcop_widget;
 class Keyboard_input_widget;
+class Waiting_widget;
 
 class Action_list_item;
 
 class Action_list_widget
     : public Action_list_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Action_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         virtual ~Action_list_widget();
@@ -47,12 +48,14 @@ class Action_list_widget
             TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P );
         void edit_listview_item( Action_list_item* item_P );
         enum type_t { TYPE_COMMAND_URL_ACTION, TYPE_MENUENTRY_ACTION, TYPE_DCOP_ACTION,
-            TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION };
+            TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION, TYPE_WAITING_ACTION };
     protected slots:
         void new_selected( int type_P );
         virtual void copy_pressed();
         virtual void delete_pressed();
         virtual void modify_pressed();
+        virtual void move_up_pressed();
+        virtual void move_down_pressed();
         virtual void current_changed( TQListViewItem* item_P );
     protected:
         Action_list_item* selected_item;
@@ -75,18 +78,18 @@ class Action_list_item
     protected:
         Action* _action; // owns it
     };
-        
+
 class Action_dialog
     {
     public:
         virtual Action* edit_action() = 0;
         virtual ~Action_dialog();
     };
-    
+
 class Command_url_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Command_url_action_dialog( Command_url_action* action_P );
         virtual Action* edit_action();
@@ -95,11 +98,11 @@ class Command_url_action_dialog
         Command_url_widget* widget;
         Command_url_action* action;
     };
-        
+
 class Menuentry_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Menuentry_action_dialog( Menuentry_action* action_P );
         virtual Action* edit_action();
@@ -108,11 +111,11 @@ class Menuentry_action_dialog
         Menuentry_widget* widget;
         Menuentry_action* action;
     };
-        
+
 class Dcop_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Dcop_action_dialog( Dcop_action* action_P );
         virtual Action* edit_action();
@@ -121,11 +124,11 @@ class Dcop_action_dialog
         Dcop_widget* widget;
         Dcop_action* action;
     };
-        
+
 class Keyboard_input_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Keyboard_input_action_dialog( Keyboard_input_action* action_P );
         virtual Action* edit_action();
@@ -134,11 +137,11 @@ class Keyboard_input_action_dialog
         Keyboard_input_widget* widget;
         Keyboard_input_action* action;
     };
-        
+
 class Activate_window_action_dialog
     : public KDialogBase, public Action_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Activate_window_action_dialog( Activate_window_action* action_P );
         virtual Action* edit_action();
@@ -147,7 +150,20 @@ class Activate_window_action_dialog
         Activate_window_widget* widget;
         Activate_window_action* action;
     };
-        
+
+class Waiting_action_dialog
+    : public KDialogBase, public Action_dialog
+    {
+    TQ_OBJECT
+    public:
+        Waiting_action_dialog( Waiting_action* action_P );
+        virtual Action* edit_action();
+    protected:
+        virtual void accept();
+        Waiting_widget* widget;
+        Waiting_action* action;
+    };
+
 //***************************************************************************
 // Inline
 //***************************************************************************
@@ -159,7 +175,7 @@ Action_list_item::Action_list_item( TQListView* parent_P, Action* action_P )
     : TQListViewItem( parent_P ), _action( action_P )
     {
     }
-    
+
 inline
 Action_list_item::Action_list_item( TQListViewItem* parent_P, Action* action_P )
     : TQListViewItem( parent_P ), _action( action_P )
@@ -185,7 +201,7 @@ Action* Action_list_item::action() const
     {
     return _action;
     }
-    
+
 inline
 void Action_list_item::set_action( Action* action_P )
     {
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index e528005ed..9fe4716c2 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #define _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()
     }
 
@@ -138,7 +138,7 @@ void Actions_listview_widget::build_up()
     {
     build_up_recursively( module->actions_root(), NULL );
     }
-    
+
 void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P,
     Action_listview_item* item_parent_P )
     {
@@ -147,13 +147,13 @@ void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P,
          it;
          ++it )
         {
-        prev = create_item( item_parent_P, prev, ( *it )); 
+        prev = create_item( item_parent_P, prev, ( *it ));
         Action_data_group* grp = dynamic_cast< Action_data_group* >( *it );
         if( grp != NULL )
             build_up_recursively( grp, prev );
         }
     }
-    
+
 Action_listview_item* Actions_listview_widget::create_item( TQListViewItem* parent_P,
     TQListViewItem* after_P, Action_data_base* data_P )
     {
diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h
index 0f3a632f4..cfad501f5 100644
--- a/khotkeys/kcontrol/actions_listview_widget.h
+++ b/khotkeys/kcontrol/actions_listview_widget.h
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #ifndef _ACTIONS_LISTVIEW_WIDGET_H_
@@ -27,13 +27,13 @@ class Action_data_base;
 
 class Actions_listview_widget
     : public Actions_listview_widget_ui
-    { 
-    Q_OBJECT
+    {
+    TQ_OBJECT
     public:
         Actions_listview_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         Action_listview_item* current_action() const;
         void set_current_action( Action_listview_item* item );
-        Action_data_base* current_action_data() const; 
+        Action_data_base* current_action_data() const;
         void set_action_data( Action_data_base* data_P, bool recent_action_P = false );
         void action_name_changed( const TQString& name_P );
         void clear();
@@ -54,9 +54,9 @@ class Actions_listview_widget
     };
 
 class Actions_listview
-    : public KHListView    
+    : public KHListView
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Actions_listview( TQWidget* parent_P = NULL, const char* name_P = NULL );
         Actions_listview_widget* widget();
@@ -78,7 +78,7 @@ class Action_listview_item
             Action_data_base* data_P );
     protected:
         Action_data_base* _data; // CHECKME doesn't own !!!
-    };    
+    };
 
 //***************************************************************************
 // Inline
@@ -113,7 +113,7 @@ Actions_listview_widget* Actions_listview::widget()
     {
     return _widget;
     }
-    
+
 // Action_listview_item
 
 inline
@@ -139,7 +139,7 @@ Action_data_base* Action_listview_item::data() const
     {
     return _data;
     }
-    
+
 inline
 void Action_listview_item::set_data( Action_data_base* data_P )
     {
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/command_url_widget.h b/khotkeys/kcontrol/command_url_widget.h
index af9a9dc2a..3465bfa96 100644
--- a/khotkeys/kcontrol/command_url_widget.h
+++ b/khotkeys/kcontrol/command_url_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Command_url_widget
     : public Command_url_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Command_url_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Command_url_action* data_P );
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index ba3be5e71..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( "" );
@@ -62,18 +62,18 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na
     copy_button->setEnabled( false );
     modify_button->setEnabled( false );
     delete_button->setEnabled( false );
+    move_up_button->setEnabled( false );
+    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( 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()
@@ -213,8 +213,11 @@ void Condition_list_widget::new_selected( int type_P )
 
 void Condition_list_widget::copy_pressed()
     {
-        if ( !selected_item )
-            return;
+    if ( !selected_item )
+      {
+      return;
+      }
+
     conditions_listview->setSelected( create_listview_item(
         selected_item->condition()->copy( selected_item->condition()->parent()),
         selected_item->parent() ? NULL : conditions_listview,
@@ -223,22 +226,72 @@ void Condition_list_widget::copy_pressed()
     }
 
 void Condition_list_widget::delete_pressed()
-{
-    if ( selected_item )
     {
-        conditions.remove( selected_item->condition()); // we own it
-        delete selected_item; // CHECKME snad vyvola signaly pro enable()
-        selected_item = NULL;
+    if ( !selected_item )
+        {
+        return;
+        }
+    Condition_list_item *nextItem = static_cast< Condition_list_item* >(selected_item->nextSibling());
+    conditions.remove( selected_item->condition()); // we own it
+    delete selected_item;
+    selected_item = NULL;
+    if (!nextItem)
+        {
+        // If the last item of the list was deleted, get the new last item
+        nextItem = static_cast< Condition_list_item* >(conditions_listview->lastItem());
+        }
+    if (nextItem)
+        {
+        conditions_listview->setSelected(nextItem, true);
+        current_changed(nextItem);
+        }
     }
-}
 
 void Condition_list_widget::modify_pressed()
     {
-        if ( !selected_item )
-            return;
+    if ( !selected_item )
+        {
+        return;
+        }
     edit_listview_item( selected_item );
     }
 
+void Condition_list_widget::move_up_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Condition_list_item *prevItem = nullptr;
+    TQListViewItem *currItem = conditions_listview->firstChild();
+    while (currItem != selected_item)
+        {
+        prevItem = static_cast< Condition_list_item* >(currItem);
+        currItem = currItem->nextSibling();
+        }
+    if (prevItem)
+        {
+        prevItem->moveItem(selected_item);
+        current_changed(selected_item);
+        }
+    }
+
+void Condition_list_widget::move_down_pressed()
+    {
+    if ( !selected_item )
+        {
+        return;
+        }
+
+    Condition_list_item *nextItem = static_cast< Condition_list_item* >(selected_item->nextSibling());
+    if (nextItem)
+        {
+        selected_item->moveItem(nextItem);
+        current_changed(selected_item);
+        }
+    }
+
 void Condition_list_widget::current_changed( TQListViewItem* item_P )
     {
 //    if( item_P == selected_item )
@@ -260,6 +313,8 @@ void Condition_list_widget::current_changed( TQListViewItem* item_P )
         }
     else
         modify_button->setEnabled( false );
+    move_up_button->setEnabled(selected_item != conditions_listview->firstChild());
+    move_down_button->setEnabled(selected_item != conditions_listview->lastChild());
     }
 
 Condition_list_item* Condition_list_widget::create_listview_item( Condition* condition_P,
@@ -268,7 +323,7 @@ Condition_list_item* Condition_list_widget::create_listview_item( Condition* con
 #ifdef KHOTKEYS_DEBUG
     kdDebug( 1217 ) << "Condition_list_widget::create_listview_item():" << endl;
     Condition::debug_list( conditions );
-	kdDebug( 1217 ) << kdBacktrace() << endl;
+  kdDebug( 1217 ) << kdBacktrace() << endl;
 #endif
     Condition* new_cond = copy_P ? condition_P->copy( parent2_P
         ? static_cast< Condition_list_base* >( parent2_P->condition()) : NULL ) : condition_P;
diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h
index 0c99fd46c..35f401205 100644
--- a/khotkeys/kcontrol/condition_list_widget.h
+++ b/khotkeys/kcontrol/condition_list_widget.h
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #ifndef _CONDITIONS_LIST_WIDGET_H_
@@ -30,7 +30,7 @@ class Condition_list_item;
 class Condition_list_widget
     : public Condition_list_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Condition_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         virtual ~Condition_list_widget();
@@ -48,6 +48,8 @@ class Condition_list_widget
         virtual void copy_pressed();
         virtual void delete_pressed();
         virtual void modify_pressed();
+        virtual void move_up_pressed();
+        virtual void move_down_pressed();
         virtual void current_changed( TQListViewItem* item_P );
     private:
         void insert_listview_items( const Condition_list_base* parent_P,
@@ -74,18 +76,18 @@ class Condition_list_item
     protected:
         Condition* _condition; // owns it
     };
-        
+
 class Condition_dialog
     {
     public:
         virtual Condition* edit_condition() = 0;
         virtual ~Condition_dialog();
     };
-    
+
 class Active_window_condition_dialog
     : public KDialogBase, public Condition_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Active_window_condition_dialog( Active_window_condition* condition_P );
         virtual Condition* edit_condition();
@@ -94,11 +96,11 @@ class Active_window_condition_dialog
         Windowdef_list_widget* widget;
         Active_window_condition* condition;
     };
-        
+
 class Existing_window_condition_dialog
     : public KDialogBase, public Condition_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Existing_window_condition_dialog( Existing_window_condition* condition_P );
         virtual Condition* edit_condition();
@@ -107,7 +109,7 @@ class Existing_window_condition_dialog
         Windowdef_list_widget* widget;
         Existing_window_condition* condition;
     };
-        
+
 
 //***************************************************************************
 // Inline
@@ -120,7 +122,7 @@ Condition_list_item::Condition_list_item( TQListView* parent_P, Condition* condi
     : TQListViewItem( parent_P ), _condition( condition_P )
     {
     }
-    
+
 inline
 Condition_list_item::Condition_list_item( TQListViewItem* parent_P, Condition* condition_P )
     : TQListViewItem( parent_P ), _condition( condition_P )
@@ -146,7 +148,7 @@ Condition* Condition_list_item::condition() const
     {
     return _condition;
     }
-    
+
 inline
 void Condition_list_item::set_condition( Condition* condition_P )
     {
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/dcop_widget.h b/khotkeys/kcontrol/dcop_widget.h
index 43523f00d..a7b6f1bca 100644
--- a/khotkeys/kcontrol/dcop_widget.h
+++ b/khotkeys/kcontrol/dcop_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Dcop_widget
     : public Dcop_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Dcop_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Dcop_action* data_P );
diff --git a/khotkeys/kcontrol/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp
index cf2337446..a0e1e84c7 100644
--- a/khotkeys/kcontrol/general_settings_tab.cpp
+++ b/khotkeys/kcontrol/general_settings_tab.cpp
@@ -27,8 +27,8 @@ General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name
     : General_settings_tab_ui( parent_P, name_P )
     {
     // KHotKeys::Module::changed()
-    connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()),
-        module, TQT_SLOT( changed()));
+    connect( disable_daemon_checkbox, TQ_SIGNAL( clicked()),
+        module, TQ_SLOT( changed()));
     }
 
 void General_settings_tab::import_clicked()
diff --git a/khotkeys/kcontrol/general_settings_tab.h b/khotkeys/kcontrol/general_settings_tab.h
index 8bcd5cd21..ba76bf68e 100644
--- a/khotkeys/kcontrol/general_settings_tab.h
+++ b/khotkeys/kcontrol/general_settings_tab.h
@@ -19,7 +19,7 @@ namespace KHotKeys
 class General_settings_tab
     : public General_settings_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         General_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
         void read_data();
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/general_tab.h b/khotkeys/kcontrol/general_tab.h
index 58f670a68..bd738f6a1 100644
--- a/khotkeys/kcontrol/general_tab.h
+++ b/khotkeys/kcontrol/general_tab.h
@@ -25,7 +25,7 @@ class Action_list;
 class General_tab
     : public General_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         General_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Action_data* data_P );
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/gesture_triggers_tab.h b/khotkeys/kcontrol/gesture_triggers_tab.h
index c11787d03..95bdebe94 100644
--- a/khotkeys/kcontrol/gesture_triggers_tab.h
+++ b/khotkeys/kcontrol/gesture_triggers_tab.h
@@ -26,7 +26,7 @@ class Action_data;
 class Gesture_triggers_tab
     : public Gesture_triggers_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gesture_triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Trigger_list* triggers_P );
@@ -46,7 +46,7 @@ class GestureRecordPage;
 class Gesture_edit_dialog
     : public KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gesture_edit_dialog( const TQString& gesture_P );
         TQString edit_gesture();
diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h
index ee3af6809..c3476348e 100644
--- a/khotkeys/kcontrol/gesturedrawer.h
+++ b/khotkeys/kcontrol/gesturedrawer.h
@@ -24,7 +24,7 @@ namespace KHotKeys
 
 class GestureDrawer : public TQFrame
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         GestureDrawer(TQWidget *parent, const char *name);
         ~GestureDrawer();
diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp
index 6e4395a5b..db946cf06 100644
--- a/khotkeys/kcontrol/gesturerecorder.cpp
+++ b/khotkeys/kcontrol/gesturerecorder.cpp
@@ -32,7 +32,7 @@ GestureRecorder::~GestureRecorder()
 
 void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
     {
-    if (ev->button() == Qt::LeftButton)
+    if (ev->button() == TQt::LeftButton)
         {
         _mouseButtonDown = true;
         stroke.reset();
@@ -43,7 +43,7 @@ void GestureRecorder::mousePressEvent(TQMouseEvent *ev)
 
 void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev)
     {
-    if ((ev->button() == Qt::LeftButton) && (_mouseButtonDown))
+    if ((ev->button() == TQt::LeftButton) && (_mouseButtonDown))
         {
         TQPoint pos = ev->pos();
         stroke.record(pos.x(), pos.y());
diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h
index e42de2c0e..07e5f88a4 100644
--- a/khotkeys/kcontrol/gesturerecorder.h
+++ b/khotkeys/kcontrol/gesturerecorder.h
@@ -24,7 +24,7 @@ namespace KHotKeys
 
 class GestureRecorder : public TQFrame
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         GestureRecorder(TQWidget *parent, const char *name);
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/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h
index 306710c0e..5b498577c 100644
--- a/khotkeys/kcontrol/gesturerecordpage.h
+++ b/khotkeys/kcontrol/gesturerecordpage.h
@@ -28,7 +28,7 @@ class GestureRecorder;
 
 class GestureRecordPage : public TQVBox
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         GestureRecordPage(const TQString &gesture,
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/gestures_settings_tab.h b/khotkeys/kcontrol/gestures_settings_tab.h
index 813209439..bf4b2611b 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.h
+++ b/khotkeys/kcontrol/gestures_settings_tab.h
@@ -19,7 +19,7 @@ namespace KHotKeys
 class Gestures_settings_tab
     : public Gestures_settings_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gestures_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
         void read_data();
diff --git a/khotkeys/kcontrol/info_tab.h b/khotkeys/kcontrol/info_tab.h
index 32212ae98..451f58514 100644
--- a/khotkeys/kcontrol/info_tab.h
+++ b/khotkeys/kcontrol/info_tab.h
@@ -19,7 +19,7 @@ namespace KHotKeys
 class Info_tab
     : public Info_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Info_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
     public slots:
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 85dbaaaa8..48349a65c 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -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,
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h
index 2fffc2b16..7d1876d8d 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.h
+++ b/khotkeys/kcontrol/kcmkhotkeys.h
@@ -30,7 +30,7 @@ class Main_buttons_widget;
 class Module
     : public TDECModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Module( TQWidget *parent_P, const char *name_P );
         virtual ~Module();
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/keyboard_input_widget.h b/khotkeys/kcontrol/keyboard_input_widget.h
index 32690f44e..1d1a141bd 100644
--- a/khotkeys/kcontrol/keyboard_input_widget.h
+++ b/khotkeys/kcontrol/keyboard_input_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Keyboard_input_widget
     : public Keyboard_input_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Keyboard_input_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Keyboard_input_action* data_P );
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/main_buttons_widget.h b/khotkeys/kcontrol/main_buttons_widget.h
index e4410d9d0..ce08570bf 100644
--- a/khotkeys/kcontrol/main_buttons_widget.h
+++ b/khotkeys/kcontrol/main_buttons_widget.h
@@ -19,7 +19,7 @@ namespace KHotKeys
 class Main_buttons_widget
     : public Main_buttons_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Main_buttons_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void enable_delete( bool enable_P );
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/menuentry_widget.h b/khotkeys/kcontrol/menuentry_widget.h
index f4b61677d..c9cc8e36c 100644
--- a/khotkeys/kcontrol/menuentry_widget.h
+++ b/khotkeys/kcontrol/menuentry_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Menuentry_widget
     : public Menuentry_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Menuentry_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Menuentry_action* data_P );
diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index d3ca4afbe..236d755d2 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 ));
@@ -441,18 +441,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/tab_widget.h b/khotkeys/kcontrol/tab_widget.h
index 81fb9e4ad..1439864f1 100644
--- a/khotkeys/kcontrol/tab_widget.h
+++ b/khotkeys/kcontrol/tab_widget.h
@@ -21,7 +21,7 @@ namespace KHotKeys
 class Tab_widget
     : public TQTabWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         enum action_type_t
             {
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index d4f7ff9d3..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()
@@ -227,11 +227,11 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char
     lay->addWidget( lbl );
     lay->addSpacing( 10 );
     bt = new KKeyButton( this );
-    lay->addWidget( bt, 0 , Qt::AlignHCenter );
+    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/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h
index c4d6160fe..dc99bda5c 100644
--- a/khotkeys/kcontrol/triggers_tab.h
+++ b/khotkeys/kcontrol/triggers_tab.h
@@ -35,7 +35,7 @@ class KHotKeysShortcutList;
 class Triggers_tab
     : public Triggers_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL );
         virtual ~Triggers_tab();
@@ -82,7 +82,7 @@ class Trigger_dialog
 class Shortcut_trigger_widget
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Shortcut_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Shortcut_trigger* trigger_P );
@@ -100,7 +100,7 @@ typedef Shortcut_trigger_widget Shortcut_trigger_tab;
 class Shortcut_trigger_dialog
     : public KDialogBase, public Trigger_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Shortcut_trigger_dialog( Shortcut_trigger* trigger_P );
         virtual Trigger* edit_trigger();
@@ -113,7 +113,7 @@ class Shortcut_trigger_dialog
 class Window_trigger_dialog
     : public KDialogBase, public Trigger_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Window_trigger_dialog( Window_trigger* trigger_P );
         virtual Trigger* edit_trigger();
@@ -128,7 +128,7 @@ class GestureRecordPage;
 class Gesture_trigger_dialog
     : public KDialogBase, public Trigger_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gesture_trigger_dialog( Gesture_trigger* trigger_P );
         virtual Trigger* edit_trigger();
@@ -144,7 +144,7 @@ class VoiceRecordPage;
 class Voice_trigger_dialog
 	: public KDialogBase, public Trigger_dialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		Voice_trigger_dialog( Voice_trigger* trigger_P );
 		virtual Trigger* edit_trigger();
diff --git a/khotkeys/kcontrol/ui/CMakeLists.txt b/khotkeys/kcontrol/ui/CMakeLists.txt
index 85212affb..ab8db9e78 100644
--- a/khotkeys/kcontrol/ui/CMakeLists.txt
+++ b/khotkeys/kcontrol/ui/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 tde_add_library( ui STATIC_PIC AUTOMOC
   SOURCES
     windowdef_simple_widget_ui.ui windowdef_list_widget_ui.ui
-    command_url_widget_ui.ui menuentry_widget_ui.ui
+    command_url_widget_ui.ui menuentry_widget_ui.ui waiting_widget_ui.ui
     triggers_tab_ui.ui general_tab_ui.ui action_group_tab_ui.ui
     dcop_widget_ui.ui main_buttons_widget_ui.ui voice_settings_tab_ui.ui
     info_tab_ui.ui window_trigger_widget_ui.ui action_list_widget_ui.ui
diff --git a/khotkeys/kcontrol/ui/Makefile.am b/khotkeys/kcontrol/ui/Makefile.am
index 14ea5c44d..ee63c6871 100644
--- a/khotkeys/kcontrol/ui/Makefile.am
+++ b/khotkeys/kcontrol/ui/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libui.la
 libui_la_SOURCES = dummy.cpp windowdef_simple_widget_ui.ui windowdef_list_widget_ui.ui \
-    command_url_widget_ui.ui menuentry_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui \
+    command_url_widget_ui.ui menuentry_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui waiting_widget_ui.ui \
     action_group_tab_ui.ui dcop_widget_ui.ui main_buttons_widget_ui.ui \
     actions_listview_widget_ui.ui info_tab_ui.ui window_trigger_widget_ui.ui \
     action_list_widget_ui.ui keyboard_input_widget_ui.ui condition_list_widget_ui.ui \
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 d78c6b5f1..12537d770 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -97,6 +97,22 @@
                                 <string>Delete</string>
                             </property>
                         </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_up_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;up</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_down_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;down</string>
+                            </property>
+                        </widget>
                     </vbox>
                 </widget>
             </hbox>
@@ -148,6 +164,18 @@
         <slot>delete_pressed()</slot>
     </connection>
     <connection>
+        <sender>move_up_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Action_list_widget_ui</receiver>
+        <slot>move_up_pressed()</slot>
+    </connection>
+    <connection>
+        <sender>move_down_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Action_list_widget_ui</receiver>
+        <slot>move_down_pressed()</slot>
+    </connection>
+    <connection>
         <sender>actions_listview</sender>
         <signal>current_changed(TQListViewItem*)</signal>
         <receiver>Action_list_widget_ui</receiver>
@@ -157,12 +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>
-</Q_SLOTS>
+    <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
+    <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
+</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 6d571e699..375ae4138 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -50,17 +50,15 @@
         </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>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index 9b3727ffd..98b13c653 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -94,7 +94,23 @@
                                 <cstring>delete_button</cstring>
                             </property>
                             <property name="text">
-                                <string>Delete</string>
+                                <string>D&amp;elete</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_up_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;up</string>
+                            </property>
+                        </widget>
+                        <widget class="TQPushButton">
+                            <property name="name">
+                                <cstring>move_down_button</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Move &amp;down</string>
                             </property>
                         </widget>
                     </vbox>
@@ -147,6 +163,18 @@
         <slot>delete_pressed()</slot>
     </connection>
     <connection>
+        <sender>move_up_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Condition_list_widget_ui</receiver>
+        <slot>move_up_pressed()</slot>
+    </connection>
+    <connection>
+        <sender>move_down_button</sender>
+        <signal>clicked()</signal>
+        <receiver>Condition_list_widget_ui</receiver>
+        <slot>move_down_pressed()</slot>
+    </connection>
+    <connection>
         <sender>conditions_listview</sender>
         <signal>current_changed(TQListViewItem*)</signal>
         <receiver>Condition_list_widget_ui</receiver>
@@ -156,12 +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>
-</Q_SLOTS>
+    <slot access="protected" specifier="pure virtual">move_up_pressed()</slot>
+    <slot access="protected" specifier="pure virtual">move_down_pressed()</slot>
+</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..9242b6da9 100644
--- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
@@ -107,9 +107,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/waiting_widget_ui.ui b/khotkeys/kcontrol/ui/waiting_widget_ui.ui
new file mode 100644
index 000000000..5942a34ba
--- /dev/null
+++ b/khotkeys/kcontrol/ui/waiting_widget_ui.ui
@@ -0,0 +1,72 @@
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<class>KHotKeys::Waiting_widget_ui</class>
+<widget class="TQWidget">
+    <property name="name">
+        <cstring>Waiting_widget_ui</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>580</width>
+            <height>480</height>
+        </rect>
+    </property>
+    <hbox>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>11</number>
+        </property>
+        <property name="spacing">
+            <number>6</number>
+        </property>
+        <widget class="TQLabel">
+            <property name="name">
+                <cstring>waiting_label</cstring>
+            </property>
+            <property name="text">
+                <string>Waiting time (ms): </string>
+            </property>
+            <property name="buddy" stdset="0">
+                <cstring>waiting_spinbox</cstring>
+            </property>
+        </widget>
+        <widget class="KIntSpinBox">
+            <property name="name">
+                <cstring>waiting_spinbox</cstring>
+            </property>
+            <property name="minValue">
+                <number>0</number>
+            </property>
+            <property name="maxValue">
+                <number>20000</number>
+            </property>
+        </widget>
+        <spacer>
+            <property name="name">
+                <cstring>Spacer16</cstring>
+            </property>
+            <property name="orientation">
+                <enum>Horizontal</enum>
+            </property>
+            <property name="sizeType">
+                <enum>Expanding</enum>
+            </property>
+            <property name="sizeHint">
+                <size>
+                    <width>0</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+    </hbox>
+</widget>
+<includes>
+    <include location="global" impldecl="in implementation">kdialog.h</include>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+</UI>
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/voice_settings_tab.h b/khotkeys/kcontrol/voice_settings_tab.h
index c59a911a2..57b5905c5 100644
--- a/khotkeys/kcontrol/voice_settings_tab.h
+++ b/khotkeys/kcontrol/voice_settings_tab.h
@@ -21,7 +21,7 @@ namespace KHotKeys
 class Voice_settings_tab
     : public Voice_settings_tab_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Voice_settings_tab( TQWidget* parent = NULL, const char* name = NULL );
         void read_data();
diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index fc231a82c..9af645045 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -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/voicerecorder.h b/khotkeys/kcontrol/voicerecorder.h
index 30d03acdc..6edb20f37 100644
--- a/khotkeys/kcontrol/voicerecorder.h
+++ b/khotkeys/kcontrol/voicerecorder.h
@@ -30,7 +30,7 @@ namespace KHotKeys
 
 class VoiceRecorder : public Voice_input_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name);
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index 1c7f8c938..c450abe44 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -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/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h
index 9cb934b61..970ccf83b 100644
--- a/khotkeys/kcontrol/voicerecordpage.h
+++ b/khotkeys/kcontrol/voicerecordpage.h
@@ -31,7 +31,7 @@ class VoiceSignature;
 
 class VoiceRecordPage : public TQVBox
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         VoiceRecordPage(const TQString &voiceip_P, TQWidget *parent, const char *name);
diff --git a/khotkeys/kcontrol/waiting_widget.cpp b/khotkeys/kcontrol/waiting_widget.cpp
new file mode 100644
index 000000000..135261e30
--- /dev/null
+++ b/khotkeys/kcontrol/waiting_widget.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+
+ KHotKeys
+
+ Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
+
+ Distributed under the terms of the GNU General Public License version 2.
+
+****************************************************************************/
+
+#define _WAITING_WIDGET_CPP_
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "waiting_widget.h"
+
+#include <knuminput.h>
+
+#include <kdebug.h>
+
+#include <actions.h>
+#include <action_data.h>
+
+#include "windowdef_list_widget.h"
+#include "kcmkhotkeys.h"
+
+namespace KHotKeys
+{
+
+Waiting_widget::Waiting_widget( TQWidget* parent_P, const char* name_P )
+    : Waiting_widget_ui( parent_P, name_P )
+    {
+    // KHotKeys::Module::changed()
+    connect(waiting_spinbox, TQ_SIGNAL(valueChanged(int)),
+        module, TQ_SLOT(changed()));
+    }
+
+void Waiting_widget::set_data( const Waiting_action* data_P )
+    {
+    if( data_P == NULL )
+        {
+        return;
+        }
+    waiting_spinbox->setValue(data_P->_waiting_time);
+    }
+
+Waiting_action* Waiting_widget::get_data( Action_data* data_P ) const
+    {
+    return new Waiting_action( data_P, waiting_spinbox->value());
+    }
+
+} // namespace KHotKeys
+
+#include "waiting_widget.moc"
diff --git a/khotkeys/kcontrol/waiting_widget.h b/khotkeys/kcontrol/waiting_widget.h
new file mode 100644
index 000000000..a339e2b98
--- /dev/null
+++ b/khotkeys/kcontrol/waiting_widget.h
@@ -0,0 +1,36 @@
+/****************************************************************************
+
+ KHotKeys
+
+ Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org>
+
+ Distributed under the terms of the GNU General Public License version 2.
+
+****************************************************************************/
+
+#ifndef _WAITING_WIDGET_H_
+#define _WAITING_WIDGET_H_
+
+#include <waiting_widget_ui.h>
+
+namespace KHotKeys
+{
+
+class Waiting_action;
+class Action_data;
+
+class Waiting_widget
+    : public Waiting_widget_ui
+    {
+    TQ_OBJECT
+    public:
+        Waiting_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
+        void set_data( const Waiting_action* data_P );
+        Waiting_action* get_data( Action_data* data_P ) const;
+    };
+
+typedef Waiting_widget Waiting_tab;
+
+} // namespace KHotKeys
+
+#endif
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/window_trigger_widget.h b/khotkeys/kcontrol/window_trigger_widget.h
index c012a0bca..60efdf317 100644
--- a/khotkeys/kcontrol/window_trigger_widget.h
+++ b/khotkeys/kcontrol/window_trigger_widget.h
@@ -22,7 +22,7 @@ class Action_data;
 class Window_trigger_widget
     : public Window_trigger_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Window_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Window_trigger* trigger_P );
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_list_widget.h b/khotkeys/kcontrol/windowdef_list_widget.h
index 6e923c902..972bbdb05 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.h
+++ b/khotkeys/kcontrol/windowdef_list_widget.h
@@ -30,7 +30,7 @@ class Windowdef_list_item;
 class Windowdef_list_widget
     : public Windowdef_list_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Windowdef_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         virtual ~Windowdef_list_widget();
@@ -84,7 +84,7 @@ class Windowdef_dialog
 class Windowdef_simple_dialog
     : public KDialogBase, public Windowdef_dialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Windowdef_simple_dialog( Windowdef_simple* window_P, TQObject* obj_P, const char* slot_P );
         virtual Windowdef* edit_windowdef();
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/windowdef_simple_widget.h b/khotkeys/kcontrol/windowdef_simple_widget.h
index 26db6fd87..0c21d3b2d 100644
--- a/khotkeys/kcontrol/windowdef_simple_widget.h
+++ b/khotkeys/kcontrol/windowdef_simple_widget.h
@@ -22,7 +22,7 @@ class Windowdef_list_item;
 class Windowdef_simple_widget
     : public Windowdef_simple_widget_ui
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Windowdef_simple_widget( TQWidget* parent_P = NULL, const char* name_P = NULL );
         void set_data( const Windowdef_simple* data_P );
diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp
index d1cbe8f5f..d5a1f4859 100644
--- a/khotkeys/kcontrol/windowselector.cpp
+++ b/khotkeys/kcontrol/windowselector.cpp
@@ -29,13 +29,13 @@ 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( tqcrossCursor ));
-    kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+    kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
+    kapp->installX11EventFilter( this );
     }
 
 bool WindowSelector::x11Event( XEvent* e )
diff --git a/khotkeys/kcontrol/windowselector.h b/khotkeys/kcontrol/windowselector.h
index 4f52312ea..0abb41811 100644
--- a/khotkeys/kcontrol/windowselector.h
+++ b/khotkeys/kcontrol/windowselector.h
@@ -17,9 +17,9 @@ namespace KHotKeys
 {
 
 class WindowSelector
-    : public QWidget
+    : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         WindowSelector( TQObject* receiver, const char* slot );
         void select();
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index c8590789a..69c853fed 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -54,7 +54,9 @@ Action* Action::create_cfg_read( TDEConfig& cfg_P, Action_data* data_P )
         return new Keyboard_input_action( cfg_P, data_P );
     if( type == "ACTIVATE_WINDOW" )
         return new Activate_window_action( cfg_P, data_P );
-    kdWarning( 1217 ) << "Unknown Action type read from cfg file\n";
+    if( type == "WAITING" )
+        return new Waiting_action( cfg_P, data_P );
+    kdWarning( 1217 ) << "Unknown Action type read from cfg file: " << type << endl;
     return NULL;
     }
 
@@ -452,4 +454,34 @@ Action* Activate_window_action::copy( Action_data* data_P ) const
     return new Activate_window_action( data_P, window()->copy());
     }
 
+// Waiting_action
+
+Waiting_action::Waiting_action( TDEConfig& cfg_P, Action_data* data_P )
+    : Action( cfg_P, data_P )
+    {
+    _waiting_time = cfg_P.readNumEntry("Time");
+    }
+
+void Waiting_action::cfg_write( TDEConfig& cfg_P ) const
+    {
+    base::cfg_write( cfg_P );
+    cfg_P.writeEntry( "Type", "WAITING" ); // overwrites value set in base::cfg_write()
+    cfg_P.writeEntry( "Time", _waiting_time);
+    }
+
+void Waiting_action::execute()
+    {
+		usleep(_waiting_time * 1000);
+    }
+
+TQString Waiting_action::description() const
+    {
+    return i18n( "Waiting %1 ms" ).arg(_waiting_time);
+    }
+
+Action* Waiting_action::copy( Action_data* data_P ) const
+    {
+    return new Waiting_action( data_P, _waiting_time);
+    }
+
 } // namespace KHotKeys
diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h
index f381683e1..c7cabf0fc 100644
--- a/khotkeys/shared/actions.h
+++ b/khotkeys/shared/actions.h
@@ -50,7 +50,7 @@ class KDE_EXPORT Action_list
     : public TQPtrList< Action >
     {
     public:
-        Action_list( const TQString& comment_P ); // CHECKME nebo i data ?
+        Action_list( const TQString& comment_P );
         Action_list( TDEConfig& cfg_P, Action_data* data_P );
         void cfg_write( TDEConfig& cfg_P ) const;
         typedef TQPtrListIterator< Action > Iterator;
@@ -111,7 +111,7 @@ class KDE_EXPORT Dcop_action
         virtual TQString description() const;
         virtual Action* copy( Action_data* data_P ) const;
     private:
-        TQString app; // CHECKME TQCString ?
+        TQString app;
         TQString obj;
         TQString call;
         TQString args;
@@ -159,6 +159,21 @@ class KDE_EXPORT Activate_window_action
         const Windowdef_list* _window;
     };
         
+class KDE_EXPORT Waiting_action
+    : public Action
+    {
+    typedef Action base;
+    public:
+        Waiting_action( Action_data* data_P, const int waiting_time );
+        Waiting_action( TDEConfig& cfg_P, Action_data* data_P );
+        virtual void cfg_write( TDEConfig& cfg_P ) const;
+        virtual void execute();
+        virtual TQString description() const;
+        virtual Action* copy( Action_data* data_P ) const;
+
+        int _waiting_time;
+    };
+
 //***************************************************************************
 // Inline
 //***************************************************************************
@@ -300,6 +315,14 @@ const Windowdef_list* Activate_window_action::window() const
     return _window;
     }
 
+// Waiting_action
+
+inline
+Waiting_action::Waiting_action( Action_data* data_P, const int waiting_time)
+    : Action( data_P ), _waiting_time(waiting_time)
+    {
+    }
+
 } // namespace KHotKeys
-    
+
 #endif
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 ff1af7d07..8e5b9e813 100644
--- a/khotkeys/shared/conditions.h
+++ b/khotkeys/shared/conditions.h
@@ -87,7 +87,7 @@ class KDE_EXPORT Condition_list
 class KDE_EXPORT Active_window_condition
     : public TQObject, public Condition
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Condition base;
     public:
         Active_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P );
@@ -114,7 +114,7 @@ class KDE_EXPORT Active_window_condition
 class KDE_EXPORT Existing_window_condition
     : public TQObject, public Condition
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Condition base;
     public:
         Existing_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P );
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 9933ba74f..5777f9a4f 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()
@@ -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 4f0f3f94c..01da65d00 100644
--- a/khotkeys/shared/gestures.h
+++ b/khotkeys/shared/gestures.h
@@ -65,7 +65,7 @@ class KDE_EXPORT Stroke
 class KDE_EXPORT Gesture
     : public TQWidget // not TQObject because of x11EventFilter()
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Gesture( bool enabled_P, TQObject* parent_P );
         virtual ~Gesture();
@@ -103,7 +103,7 @@ class KDE_EXPORT Gesture
 class DeleteObject
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         DeleteObject( TQWidget* widget_P, TQObject* parent_P )
             : TQObject( parent_P ), widget( widget_P ) {}
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 7b9696c7e..96338b055 100644
--- a/khotkeys/shared/input.cpp
+++ b/khotkeys/shared/input.cpp
@@ -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/input.h b/khotkeys/shared/input.h
index c6bbdf1e5..e810cea80 100644
--- a/khotkeys/shared/input.h
+++ b/khotkeys/shared/input.h
@@ -35,7 +35,7 @@ class Kbd_receiver
 class Kbd
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	Kbd( bool grabbing_enabled_P, TQObject* parent_P );
         virtual ~Kbd();
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/khlistbox.h b/khotkeys/shared/khlistbox.h
index d0f9b51ae..8f4a77138 100644
--- a/khotkeys/shared/khlistbox.h
+++ b/khotkeys/shared/khlistbox.h
@@ -21,7 +21,7 @@ namespace KHotKeys
 class KHListBox
     : public TQListBox
     {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
     public:
         KHListBox( TQWidget* parent_P, const char* name_P = NULL );
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 2cee34617..1a0f27e2b 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -22,7 +22,7 @@ namespace KHotKeys
 class KDE_EXPORT KHListView
     : public TDEListView
     {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
     public:
         KHListView( TQWidget* parent_P, const char* name_P = NULL );
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index 76adac6b9..becacd5d1 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -145,9 +145,11 @@ void Settings::write_settings()
         gestures_exclude->cfg_write( cfg );
         }
     else
+        {
         cfg.deleteGroup( "GesturesExclude" );
-	cfg.setGroup( "Voice" );
-	cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() );
+        }
+    cfg.setGroup( "Voice" );
+    cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() );
 
     }
 
diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h
index c7e55fc22..5a770abbe 100644
--- a/khotkeys/shared/soundrecorder.h
+++ b/khotkeys/shared/soundrecorder.h
@@ -36,7 +36,7 @@ namespace KHotKeys
 */
 class KDE_EXPORT SoundRecorder : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     static SoundRecorder* create( TQObject* parent = 0, const char* name = 0 );
     virtual ~SoundRecorder();
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 115bc6687..1b6e903b7 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -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 )
@@ -277,6 +277,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
     bool matches = windows()->match( Window_data( window_P ));
     existing_windows[ window_P ] = matches;
     if( active && matches && !was_match )
+        {
         if( window_actions & WINDOW_APPEARS )
             {
             windows_handler->set_action_window( window_P );
@@ -287,6 +288,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
             windows_handler->set_action_window( window_P );
             data->execute();
             }
+        }
     kdDebug( 1217 ) << "Window_trigger::w_changed() : " << was_match << "|" << matches << endl;
     }
 
@@ -333,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
@@ -366,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 c74a3a54a..3ed2171f0 100644
--- a/khotkeys/shared/triggers.h
+++ b/khotkeys/shared/triggers.h
@@ -82,7 +82,7 @@ class KDE_EXPORT Shortcut_trigger
 class KDE_EXPORT Window_trigger
     : public TQObject, public Trigger        
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Trigger base;
     public:
         enum window_action_t
@@ -124,7 +124,7 @@ class KDE_EXPORT Window_trigger
 class KDE_EXPORT Gesture_trigger
     : public TQObject, public Trigger
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Trigger base;
     public:
         Gesture_trigger( Action_data* data_P, const TQString& gesture_P );
@@ -145,7 +145,7 @@ class KDE_EXPORT Gesture_trigger
 class KDE_EXPORT Voice_trigger
     : public TQObject, public Trigger
     {
-    Q_OBJECT
+    TQ_OBJECT
     typedef Trigger base;
     public:
 		Voice_trigger( Action_data* data_P, const TQString& Voice_P, const VoiceSignature & signature1_P, const VoiceSignature & signature2_P );
diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index a31ac8237..031f75c78 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -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 ccd07563f..ccf7943fc 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -30,7 +30,7 @@ class VoiceSignature;
 
 class KDE_EXPORT Voice  : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Voice( bool enabled_P, TQObject* parent_P );
         virtual ~Voice();
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 4fa403436..e9868e52b 100644
--- a/khotkeys/shared/windows.h
+++ b/khotkeys/shared/windows.h
@@ -37,7 +37,7 @@ class Windowdef_list;
 class KDE_EXPORT Windows
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Windows( bool enable_signals_P, TQObject* parent_P );
         virtual ~Windows();
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 3368ee21e..19e503ac5 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -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 );
diff --git a/kicker/HACKING b/kicker/HACKING
index c03925cdc..12f48652d 100644
--- a/kicker/HACKING
+++ b/kicker/HACKING
@@ -3,10 +3,10 @@ The Short Story
 Four space tabs, braces on their own lines, 80 character lines.
 Code should look something like this:
 
-QString ExtensionManager::uniqueId()
+TQString ExtensionManager::uniqueId()
 {
-    QString idBase = "Extension_%1";
-    QString newId;
+    TQString idBase = "Extension_%1";
+    TQString newId;
     int i = 0;
     bool unique = false;
 
@@ -255,7 +255,7 @@ from tight loops or is in a hot path) or if it is a simple, one-liner
 setter/getter method. Otherwise methods should be implemented outside of
 the class definition.
 
-[1] macros include things like Q_OBJECT and K_DCOP. the should ONLY appear in
+[1] macros include things like TQ_OBJECT and K_DCOP. the should ONLY appear in
 files where they are actually necessary and not just randomly thrown in there
 for fun. ;-)
 
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 86ee8b059..7cbb5a6c8 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -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)
@@ -425,7 +425,7 @@ void DigitalClock::drawContents( TQPainter * p)
     p->translate( +1, +1 );
     TQLCDNumber::drawContents( p );
     if (_prefs->digitalLCDStyle())
-        pal.setColor( TQColorGroup::Foreground, Qt::black);
+        pal.setColor( TQColorGroup::Foreground, TQt::black);
     else
         pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
     setPalette( pal );
@@ -633,8 +633,8 @@ void AnalogClock::paintEvent( TQPaintEvent * )
         }
 
         if (_prefs->analogLCDStyle()) {
-            paint.setPen( TQPen(Qt::black, aaFactor) );
-            paint.setBrush( Qt::black );
+            paint.setPen( TQPen(TQt::black, aaFactor) );
+            paint.setBrush( TQt::black );
         } else {
             paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) );
             paint.setBrush( _prefs->analogForegroundColor() );
@@ -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;
 }
@@ -854,7 +854,7 @@ void FuzzyClock::drawContents(TQPainter *p)
 
     TQRect tr;
 
-    if (_applet->getOrientation() == Qt::Vertical)
+    if (_applet->getOrientation() == TQt::Vertical)
     {
         p->rotate(90);
         tr = TQRect(4, -2, height() - 8, -(width()) + 2);
@@ -917,9 +917,9 @@ 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(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
 
     reconfigure();    // initialize clock widget
     slotUpdate();
@@ -927,8 +927,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
     if (kapp->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);
     }
 
@@ -970,7 +970,7 @@ KTextShadowEngine *ClockApplet::shadowEngine()
 
 int ClockApplet::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
@@ -1081,7 +1081,7 @@ int ClockApplet::widthForHeight(int h) const
 
 int ClockApplet::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
@@ -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();
 
@@ -1542,24 +1542,24 @@ void ClockApplet::aboutToShowContextMenu()
 
     TDELocale *loc = TDEGlobal::locale();
     TQDateTime dt = TQDateTime::currentDateTime();
-    dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
+    dt = dt.addSecs(TZoffset);
 
     TDEPopupMenu *copyMenu = new TDEPopupMenu( menu );
     copyMenu->insertItem(loc->formatDateTime(dt), 201);
-    copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202);
-    copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203);
-    copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204);
-    copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205);
+    copyMenu->insertItem(loc->formatDate(dt.date()), 202);
+    copyMenu->insertItem(loc->formatDate(dt.date(), true), 203);
+    copyMenu->insertItem(loc->formatTime(dt.time()), 204);
+    copyMenu->insertItem(loc->formatTime(dt.time(), true), 205);
     copyMenu->insertItem(dt.date().toString(), 206);
     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);
@@ -1610,12 +1610,12 @@ void ClockApplet::slotCopyMenuActivated( int id )
 
 TQTime ClockApplet::clockGetTime()
 {
-    return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset));
+    return TQTime::currentTime().addSecs(TZoffset);
 }
 
 TQDate ClockApplet::clockGetDate()
 {
-    return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date());
+    return TQDateTime::currentDateTime().addSecs(TZoffset).date();
 }
 
 void ClockApplet::showZone(int z)
@@ -1642,13 +1642,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev)
 {
     switch (ev->button()) 
     {
-        case Qt::LeftButton:
+        case TQt::LeftButton:
             toggleCalendar();
             break;
-        case Qt::RightButton:
+        case TQt::RightButton:
             openContextMenu();
             break;
-        case Qt::MidButton:
+        case TQt::MidButton:
             nextZone();
             TQToolTip::remove(_clock->widget());
             break;
@@ -1675,10 +1675,10 @@ void ClockApplet::wheelEvent(TQWheelEvent* e)
 // catch the mouse clicks of our child widgets
 bool ClockApplet::eventFilter( TQObject *o, TQEvent *e )
 {
-    if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) &&
+    if (( o == _clock->widget() || o == _date || o == _dayOfWeek) &&
         e->type() == TQEvent::MouseButtonPress )
     {
-        mousePressEvent(TQT_TQMOUSEEVENT(e) );
+        mousePressEvent(static_cast<TQMouseEvent*>(e) );
         return true;
     }
 
@@ -1794,7 +1794,7 @@ void ClockApplet::fixupLayout()
     // this fixes problems triggered by having the date first
     // because of the date format (e.g. YY/MM/DD) and then hiding
     // the date
-    if (orientation() == Qt::Horizontal && height() < 32)
+    if (orientation() == TQt::Horizontal && height() < 32)
     {
         bool mustShowDate = showDate || (zone->zoneIndex() != 0);
 
@@ -1840,7 +1840,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
          (m_clock->type() == Prefs::EnumType::Analog) )
     {
         // show full time (incl. hour) as tooltip for Fuzzy clock
-        tipText = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
+        tipText = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset));
     }
     else
     {
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 36e5f00bf..9f4031539 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -66,7 +66,7 @@ class SettingsWidgetImp;
 
 class SettingsWidgetImp : public SettingsWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         SettingsWidgetImp(Prefs *p=0,
@@ -84,7 +84,7 @@ class SettingsWidgetImp : public SettingsWidget
 
 class TDEConfigDialogSingle : public TDEConfigDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         TDEConfigDialogSingle(Zone *zone,
@@ -139,7 +139,7 @@ class ClockWidget
 
 class PlainClock : public TQLabel, public ClockWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -162,7 +162,7 @@ class PlainClock : public TQLabel, public ClockWidget
 
 class DigitalClock : public TQLCDNumber, public ClockWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -189,7 +189,7 @@ class DigitalClock : public TQLCDNumber, public ClockWidget
 
 class AnalogClock : public TQFrame, public ClockWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -216,7 +216,7 @@ class AnalogClock : public TQFrame, public ClockWidget
 
 class FuzzyClock : public TQFrame, public ClockWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         FuzzyClock(ClockApplet *applet, Prefs* prefs, TQWidget *parent=0, const char *name=0);
@@ -260,7 +260,7 @@ class ClockAppletToolTip : public TQToolTip
 
 class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   friend class ClockAppletToolTip;
diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp
index d6165306e..99b9fe33e 100644
--- a/kicker/applets/clock/datepicker.cpp
+++ b/kicker/applets/clock/datepicker.cpp
@@ -69,7 +69,7 @@ void DatePicker::keyPressEvent(TQKeyEvent *e)
 {
     TQVBox::keyPressEvent(e);
 
-    if (e->key() == Qt::Key_Escape)
+    if (e->key() == TQt::Key_Escape)
     {
         close();
     }
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/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 aa9126b8c..85a4f3f19 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -85,7 +85,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */)
 
   if (z)
   {
-    return -z->offset(Qt::LocalTime);
+    return -z->offset(TQt::LocalTime);
   }
 
   return 0;
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/configdlg.h b/kicker/applets/launcher/configdlg.h
index b96caf459..14fda2cac 100644
--- a/kicker/applets/launcher/configdlg.h
+++ b/kicker/applets/launcher/configdlg.h
@@ -31,7 +31,7 @@ class Prefs;
 
 class ConfigDlg : public TDEConfigDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize,
diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp
index 46c79a857..5172b4eee 100644
--- a/kicker/applets/launcher/flowgridmanager.cpp
+++ b/kicker/applets/launcher/flowgridmanager.cpp
@@ -17,7 +17,7 @@ FlowGridManager::FlowGridManager(TQSize p_item_size,
                                  TQSize p_space_size,
                                  TQSize p_border_size,
                                  TQSize p_frame_size,
-                                 Qt::Orientation orient,
+                                 TQt::Orientation orient,
                                  int num_items,
                                  Slack slack_x,Slack slack_y)
 {
@@ -65,15 +65,15 @@ void FlowGridManager::setFrameSize(TQSize p_frame_size)
         return;
     _pFrameSize=p_frame_size;
     if (_pFrameSize.width()<=0) {
-        _orientation=Qt::Vertical;
+        _orientation=TQt::Vertical;
     }
     if (_pFrameSize.height()<=0) {
-        _orientation=Qt::Horizontal;
+        _orientation=TQt::Horizontal;
     }
     _dirty=true;
 }
 
-void FlowGridManager::setOrientation(Qt::Orientation orient)
+void FlowGridManager::setOrientation(TQt::Orientation orient)
 {   if (orient==_orientation)
         return;
     _orientation=orient; _dirty=true;
@@ -114,7 +114,7 @@ TQSize  FlowGridManager::frameSize() const
 TQPoint FlowGridManager::origin() const
 {   _checkReconfigure();  return _origin;}
 
-Qt::Orientation FlowGridManager::orientation() const
+TQt::Orientation FlowGridManager::orientation() const
 {   _checkReconfigure();  return _orientation;}
 
 /*Slack FlowGridManager::slackX() const
@@ -154,7 +154,7 @@ TQPoint FlowGridManager::cell(int index) const
 // return height if orientation is Horizontal
 // return width if orientation is Vertical
 int FlowGridManager::_getHH(TQSize size) const
-{  if (_orientation==Qt::Horizontal)
+{  if (_orientation==TQt::Horizontal)
         return size.height();
     return size.width();
 }
@@ -162,14 +162,14 @@ int FlowGridManager::_getHH(TQSize size) const
 // return height if orientation is Vertical
 // return width if orientation is Horizontal
 int FlowGridManager::_getWH(TQSize size) const
-{  if (_orientation==Qt::Horizontal)
+{  if (_orientation==TQt::Horizontal)
         return size.width();
     return size.height();
 }
 
 // swap horizontal and vertical if orientation is Vertical, otherwise return arg
 TQSize FlowGridManager::_swapHV(TQSize hv) const
-{  if (_orientation==Qt::Horizontal)
+{  if (_orientation==TQt::Horizontal)
         return hv;
     TQSize temp=hv;
     temp.transpose();
diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h
index c801431b4..228210884 100644
--- a/kicker/applets/launcher/flowgridmanager.h
+++ b/kicker/applets/launcher/flowgridmanager.h
@@ -26,7 +26,7 @@ public:
                                      TQSize p_space_size=TQSize(0,0),
                                      TQSize p_border_size=TQSize(0,0),
                                      TQSize frame_size=TQSize(0,0),
-                                     Qt::Orientation orient=Qt::Horizontal,
+                                     TQt::Orientation orient=TQt::Horizontal,
                                      int num_items=0,
                                      Slack slack_x=ItemSlack,
                                      Slack slack_y=ItemSlack);
@@ -36,7 +36,7 @@ public:
     void setItemSize(TQSize item_size);
     void setSpaceSize(TQSize space_size);
     void setBorderSize(TQSize border_size);
-    void setOrientation(Qt::Orientation orient);
+    void setOrientation(TQt::Orientation orient);
     void setFrameSize(TQSize frame_size);
     void setSlack(Slack slack_x, Slack slack_y);
     void setConserveSpace(bool conserve);
@@ -49,7 +49,7 @@ public:
     TQSize  gridSpacing() const;
     TQSize  frameSize() const;
     TQPoint origin() const;
-    Qt::Orientation orientation() const;
+    TQt::Orientation orientation() const;
     bool   conserveSpace() const;
 
 //    Slack  slackX() const;
@@ -76,7 +76,7 @@ protected:
     TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize;
     Slack _slackX, _slackY;
     bool _conserveSpace;
-    Qt::Orientation _orientation;
+    TQt::Orientation _orientation;
     int _numItems;
 
     // results
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index cdbc94dd5..bf496e028 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -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/quickaddappsmenu.h b/kicker/applets/launcher/quickaddappsmenu.h
index 01c185181..b5bab8bfc 100644
--- a/kicker/applets/launcher/quickaddappsmenu.h
+++ b/kicker/applets/launcher/quickaddappsmenu.h
@@ -29,7 +29,7 @@ s
 #include "service_mnu.h"
 
 class QuickAddAppsMenu: public PanelServiceMenu {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent=0, const char *name=0, const TQString &sender=TQString(""));
    QuickAddAppsMenu(TQWidget *target, TQWidget *parent=0, const TQString &sender=TQString(""), const char *name=0);
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 19377c1b4..2b09dac34 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -138,7 +138,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
        pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
    }
    // Resize to fit button
-   pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin));
+   pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin));
    return pxmap;
 }
 
@@ -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()
@@ -219,9 +219,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e)
 
 void QuickButton::mousePressEvent(TQMouseEvent *e)
 {
-   if (e->button() == Qt::RightButton)
+   if (e->button() == TQt::RightButton)
       _popup->popup(e->globalPos());
-   else if (e->button() == Qt::LeftButton) {
+   else if (e->button() == TQt::LeftButton) {
       _dragPos = e->pos();
       TQButton::mousePressEvent(e);
    }
@@ -229,7 +229,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e)
 
 void QuickButton::mouseMoveEvent(TQMouseEvent *e)
 {
-   if ((e->state() & Qt::LeftButton) == 0) return;
+   if ((e->state() & TQt::LeftButton) == 0) return;
    TQPoint p(e->pos() - _dragPos);
    if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay())
       return;
@@ -246,7 +246,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e)
        dd->drag();
        releaseKeyboard();
    } else {
-       setCursor(Qt::ForbiddenCursor);
+       setCursor(TQt::ForbiddenCursor);
    }
 }
 
@@ -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/quickbutton.h b/kicker/applets/launcher/quickbutton.h
index ea5ed21aa..ebb967def 100644
--- a/kicker/applets/launcher/quickbutton.h
+++ b/kicker/applets/launcher/quickbutton.h
@@ -66,7 +66,7 @@ private:
 
 
 class QuickButton: public SimpleButton, public KickerTip::Client {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum { DEFAULT_ICON_DIM = 16 };
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 1ee251b36..3f0ee88a8 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -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();
@@ -338,7 +338,7 @@ int QuickLauncher::widthForHeight(int h) const
 {
     FlowGridManager temp_manager = *m_manager;
     temp_manager.setFrameSize(TQSize(h,h));
-    temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary
+    temp_manager.setOrientation(TQt::Horizontal); // ??? probably not necessary
     if (temp_manager.isValid())
     {
         return temp_manager.frameSize().width();
@@ -351,7 +351,7 @@ int QuickLauncher::heightForWidth(int w) const
 {
     FlowGridManager temp_manager=*m_manager;
     temp_manager.setFrameSize(TQSize(w,w));
-    temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary
+    temp_manager.setOrientation(TQt::Vertical); // ??? probably not necessary
     if (temp_manager.isValid())
     {
         return temp_manager.frameSize().height();
@@ -362,7 +362,7 @@ int QuickLauncher::heightForWidth(int w) const
 
 int QuickLauncher::dimension() const
 {
-    if (orientation()==Qt::Vertical)
+    if (orientation()==TQt::Vertical)
     {
         return size().width();
     }
@@ -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;
 }
@@ -507,7 +507,7 @@ void QuickLauncher::about()
 
 void QuickLauncher::mousePressEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::RightButton)
+    if (e->button() == TQt::RightButton)
     {
         m_popup->popup(e->globalPos());
     }
@@ -856,7 +856,7 @@ void QuickLauncher::loadConfig()
     int n = 0;
     while (iter != urls.end()) {
         TQString url = *iter;
-        addApp(url, n, false);
+        if(!url.isEmpty()) addApp(url, n, false);
         ++iter;
         ++n;
     }
@@ -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()));
     }
 }
 
@@ -1077,7 +1077,7 @@ void QuickLauncher::updateStickyHighlightLayer()
     m_stickyHighlightLayer = TQImage(width(), height(), 32);
     m_stickyHighlightLayer.setAlphaBuffer(true);
     int pix, tlPix, brPix, w(width()), h(height());
-    QRgb transparent(tqRgba(0, 0, 0, 0));
+    TQRgb transparent(tqRgba(0, 0, 0, 0));
     for (int y = h-1; y >= 0; --y)
     {
         for (int x = w-1; x >= 0; --x)
diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h
index 2c47b602a..b6211f054 100644
--- a/kicker/applets/launcher/quicklauncher.h
+++ b/kicker/applets/launcher/quicklauncher.h
@@ -45,7 +45,7 @@ typedef QuickButtonGroup ButtonGroup;
 
 class QuickLauncher: public KPanelApplet, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 k_dcop:
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index d4c14c9db..fcda62468 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -62,7 +62,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
     //setFrameStyle(Panel | Sunken);
     setBackgroundOrigin( AncestorOrigin );
 
-    if ( orientation() == Qt::Horizontal )
+    if ( orientation() == TQt::Horizontal )
         layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom );
     else
         layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
@@ -82,8 +82,8 @@ 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 );
@@ -100,7 +100,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
     if ( !kapp->dcopClient()->isAttached() )
         kapp->dcopClient()->attach();
 
-    connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() ));
+    connect( kapp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
 }
 
 Lockout::~Lockout()
@@ -117,13 +117,13 @@ void Lockout::checkLayout( int height ) const
     TQBoxLayout::Direction direction = layout->direction();
 
     if ( direction == TQBoxLayout::LeftToRight &&
-         ( ( orientation() == Qt::Vertical   && s.width() - 2 >= height ) ||
-           ( orientation() == Qt::Horizontal && s.width() - 2 < height ) ) ) {
+         ( ( orientation() == TQt::Vertical   && s.width() - 2 >= height ) ||
+           ( orientation() == TQt::Horizontal && s.width() - 2 < height ) ) ) {
         layout->setDirection( TQBoxLayout::TopToBottom );
     }
     else if ( direction == TQBoxLayout::TopToBottom &&
-              ( ( orientation() == Qt::Vertical   && s.height() - 2 < height ) ||
-                ( orientation() == Qt::Horizontal && s.height() - 2 >= height ) ) ) {
+              ( ( orientation() == TQt::Vertical   && s.height() - 2 < height ) ||
+                ( orientation() == TQt::Horizontal && s.height() - 2 >= height ) ) ) {
         layout->setDirection( TQBoxLayout::LeftToRight );
     }
 }
@@ -193,25 +193,25 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
         TDEConfig *conf = config();
         conf->setGroup("lockout");
 
-        TQMouseEvent *me = TQT_TQMOUSEEVENT( e );
-        if( me->button() == Qt::RightButton )
+        TQMouseEvent *me = static_cast<TQMouseEvent*>( e );
+        if( me->button() == TQt::RightButton )
         {
-            if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lockButton) )
+            if( o == lockButton )
             {
                 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() );
@@ -219,20 +219,20 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 
                 return true;
             }
-            else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(logoutButton) )
+            else if ( o == logoutButton )
             {
                 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/lockout/lockout.h b/kicker/applets/lockout/lockout.h
index 6be995790..dd6428628 100644
--- a/kicker/applets/lockout/lockout.h
+++ b/kicker/applets/lockout/lockout.h
@@ -12,7 +12,7 @@ class TQToolButton;
 
 class Lockout : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Lockout( const TQString& configFile,
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index c3b964ce1..89f836492 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -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();
 }
@@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons()
         MediumButton *button = *it;
         
         button_size = std::max(button_size,
-                            orientation() == Qt::Vertical ?
+                            orientation() == TQt::Vertical ?
                     button->heightForWidth(width()) :
                 button->widthForHeight(height()) );
     //		                           button->widthForHeight(height()) :
@@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons()
     }
     
     int kicker_size;
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         kicker_size = width();
     }
@@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons()
         
         ++pack_count;
     
-        if(orientation() == Qt::Vertical)
+        if(orientation() == TQt::Vertical)
                     {
         if (pack_count < max_packed_buttons)
         {
@@ -425,7 +425,7 @@ void MediaApplet::reloadList()
 
 void MediaApplet::mousePressEvent(TQMouseEvent *e)
 {
-    if(e->button()==Qt::RightButton)
+    if(e->button()==TQt::RightButton)
     {
         TDEPopupMenu menu(this);
     
diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h
index 4c57b508d..1703d98f0 100644
--- a/kicker/applets/media/mediaapplet.h
+++ b/kicker/applets/media/mediaapplet.h
@@ -38,7 +38,7 @@ typedef TQValueList<MediumButton*> MediumButtonList;
 
 class MediaApplet : public KPanelApplet
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	MediaApplet(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index ce61cfbd6..be75a3d40 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -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());
 }
@@ -122,8 +122,7 @@ void MediumButton::initPopup()
 
 void MediumButton::refreshType()
 {
-    KMimeType::Ptr mime = mFileItem.determineMimeType();
-    TQToolTip::add(this, mime->comment());
+    TQToolTip::add(this, mFileItem.text());
     setIcon(mFileItem.iconName());
 }
 
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 76e448b27..40ee85ebd 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -32,7 +32,7 @@
 
 class MediumButton : public PanelPopupButton
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	MediumButton(TQWidget *parent, const KFileItem &fileItem);
diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h
index b29f697ae..2354a73a2 100644
--- a/kicker/applets/media/preferencesdialog.h
+++ b/kicker/applets/media/preferencesdialog.h
@@ -30,7 +30,7 @@
 
 class PreferencesDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	PreferencesDialog(KFileItemList media, TQWidget *parent=0, const char *name=0);
 	~PreferencesDialog();
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index f95e4e4c5..dff03a036 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -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( kapp, 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;
@@ -476,7 +476,7 @@ void MenuEmbed::setMinimumSize( int w, int h )
         assert( msg_type_atom != None );
         ev.xclient.message_type = msg_type_atom;
         ev.xclient.format = 32;
-        ev.xclient.data.l[0] = GET_QT_X_TIME();
+        ev.xclient.data.l[0] = get_tqt_x_time();
         ev.xclient.data.l[1] = minimumWidth();
         ev.xclient.data.l[2] = minimumHeight();
         ev.xclient.data.l[3] = 0;
diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h
index 0b09334b6..159c7a37d 100644
--- a/kicker/applets/menu/menuapplet.h
+++ b/kicker/applets/menu/menuapplet.h
@@ -66,7 +66,7 @@ class MenuEmbed;
 
 class Applet : public KPanelApplet, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 k_dcop:
@@ -186,7 +186,7 @@ private:
 class MenuEmbed
     : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index ac0fa1340..437bae679 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -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();
 
@@ -123,7 +123,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
         m_curDesk = 1;
     }
 
-    desktopLayoutOrientation = Qt::Horizontal;
+    desktopLayoutOrientation = TQt::Horizontal;
     desktopLayoutX = -1;
     desktopLayoutY = -1;
 
@@ -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( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
 
     if (kapp->authorizeTDEAction("kicker_rmb") && kapp->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);
     }
 
@@ -246,7 +246,7 @@ void KMiniPager::slotButtonSelected( int desk )
 
 int KMiniPager::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
@@ -302,7 +302,7 @@ int KMiniPager::widthForHeight(int h) const
 
 int KMiniPager::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
@@ -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;
@@ -374,14 +374,14 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
             return;
         }
     }
-    NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
+    NET::Orientation orient = o == TQt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
     NETRootInfo i( tqt_xdisplay(), 0 );
     i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft );
 }
 
 void KMiniPager::resizeEvent(TQResizeEvent*)
 {
-    bool horiz = orientation() == Qt::Horizontal;
+    bool horiz = orientation() == TQt::Horizontal;
 
     int deskNum = m_desktops.count();
     int rowNum = m_settings->numberOfRows();
@@ -408,13 +408,13 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
     {
         nDX = rowNum;
         nDY = deskCols;
-        updateDesktopLayout(Qt::Horizontal, -1, nDX);
+        updateDesktopLayout(TQt::Horizontal, -1, nDX);
     }
     else
     {
         nDX = deskCols;
         nDY = rowNum;
-        updateDesktopLayout(Qt::Horizontal, nDY, -1);
+        updateDesktopLayout(TQt::Horizontal, nDY, -1);
     }
 
     // 1 pixel spacing.
@@ -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,8 +727,8 @@ 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)));
-    showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"):
+    connect(rowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
+    showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"):
                                                        i18n("&Columns"),
                          rowMenu);
 
@@ -753,7 +753,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"),
@@ -892,7 +892,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())
@@ -941,8 +941,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( kapp->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 1f0edc409..ceb5ec8f4 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -46,7 +46,7 @@ class PagerSettings;
 
 class KMiniPager : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMiniPager(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 3e51a199e..22f59956d 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -83,10 +83,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())
     {
@@ -247,8 +247,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 +258,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 +274,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) {
@@ -528,10 +528,10 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
 
 void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
 {
-    if (e->button() == Qt::RightButton)
+    if (e->button() == TQt::RightButton)
     {
         // prevent LMB down -> RMB down -> LMB up sequence
-        if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton)
+        if ((e->state() & TQt::MouseButtonMask ) == TQt::NoButton)
         {
             emit showMenu(e->globalPos(), m_desktop);
             return;
@@ -726,7 +726,7 @@ void KMiniPagerButton::rename()
 {
   if ( !m_lineEdit ) {
     m_lineEdit = new TQLineEdit( this );
-    connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) );
+    connect( m_lineEdit, TQ_SIGNAL( returnPressed() ), m_lineEdit, TQ_SLOT( hide() ) );
     m_lineEdit->installEventFilter( this );
   }
   m_lineEdit->setGeometry( rect() );
@@ -747,12 +747,12 @@ void KMiniPagerButton::slotToggled( bool b )
 
 bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
 {
-    if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) &&
+    if (o && o == m_lineEdit &&
         (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide))
     {
         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;
     }
@@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
     }
 
     data.duration = 4000;
-    data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium);
+    data.icon = DesktopIcon("window_duplicate", TDEIcon::SizeMedium);
     data.message = TQStyleSheet::escape(m_desktopName);
     data.direction = m_pager->popupDirection();
 }
diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h
index 042820f20..4d889c39e 100644
--- a/kicker/applets/minipager/pagerbutton.h
+++ b/kicker/applets/minipager/pagerbutton.h
@@ -37,7 +37,7 @@ class TQLineEdit;
 
 class KMiniPagerButton : public TQButton, public KickerTip::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KMiniPagerButton(int desk, bool useViewports, const TQPoint& viewport,
             KMiniPager *parent=0, const char *name=0);
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 1da45a350..83db26d12 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -67,29 +67,28 @@ NaughtyApplet::NaughtyApplet
   setBackgroundOrigin( AncestorOrigin );
 
   button_ = new SimpleButton(this);
-  button_->setFixedSize(20, 20);
 
   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();
@@ -132,25 +131,15 @@ NaughtyApplet::slotWarn(ulong pid, const TQString & name)
   }
 }
 
-  int
-NaughtyApplet::widthForHeight(int) const
-{
-  return 20;
-}
-
-  int
-NaughtyApplet::heightForWidth(int) const
-{
-  return 20;
-}
 
   void
 NaughtyApplet::slotLoad(uint l)
 {
-  if (l > monitor_->triggerLevel())
-    button_->setPixmap(BarIcon("naughty-sad"));
-  else
-    button_->setPixmap(BarIcon("naughty-happy"));
+  button_->setPixmap(TDEGlobal::iconLoader()->loadIcon(
+     (l > monitor_->triggerLevel() ? "naughty-sad" : "naughty-happy"),
+     TDEIcon::Panel,
+     TQMIN(size().width(),size().height())-2
+  ));
 }
 
   void
diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h
index eb9850851..0ef796ea4 100644
--- a/kicker/applets/naughty/NaughtyApplet.h
+++ b/kicker/applets/naughty/NaughtyApplet.h
@@ -31,7 +31,7 @@ class TQPushButton;
 
 class NaughtyApplet : public KPanelApplet
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -46,8 +46,6 @@ class NaughtyApplet : public KPanelApplet
 
     ~NaughtyApplet();
 
-    virtual int widthForHeight(int h) const;
-    virtual int heightForWidth(int w) const;
 
   signals:
 
diff --git a/kicker/applets/naughty/NaughtyConfigDialog.h b/kicker/applets/naughty/NaughtyConfigDialog.h
index 4e428f00f..41be8344e 100644
--- a/kicker/applets/naughty/NaughtyConfigDialog.h
+++ b/kicker/applets/naughty/NaughtyConfigDialog.h
@@ -28,7 +28,7 @@ class KIntNumInput;
 
 class NaughtyConfigDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index 09c02cbf9..63b634e59 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -39,6 +39,10 @@
 #include <signal.h>
 #include <unistd.h>
 
+#ifdef Q_OS_SOLARIS
+#include <procfs.h>
+#endif
+
 #include <tqfile.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
@@ -107,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()
@@ -210,7 +214,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
   bool
 NaughtyProcessMonitor::canKill(ulong pid) const
 {
-#ifdef __linux__
+#ifdef Q_OS_LINUX
   TQFile f("/proc/" + TQString::number(pid) + "/status");
 
   if (!f.open(IO_ReadOnly))
@@ -240,6 +244,17 @@ NaughtyProcessMonitor::canKill(ulong pid) const
       return false ;
   
   return geteuid () == d->uidMap_[pid] ;
+#elif defined(Q_OS_SOLARIS)
+  TQFile f("/proc/" + TQString::number(pid) + "/psinfo");
+  TQByteArray raw;
+  psinfo_t *inf;
+
+  if (!f.open(IO_ReadOnly))
+    return false;
+  raw = f.readAll();
+  f.close();
+  inf = (psinfo_t *)raw.data();
+  return geteuid() == inf->pr_euid;
 #else
   Q_UNUSED( pid );
   return false;
@@ -249,8 +264,9 @@ NaughtyProcessMonitor::canKill(ulong pid) const
   TQString
 NaughtyProcessMonitor::processName(ulong pid) const
 {
-#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
-#ifdef __linux__
+#if defined(Q_OS_LINUX) || defined(__OpenBSD__) || defined(__NetBSD__) || \
+    defined(Q_OS_SOLARIS)
+#if defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS)
   TQFile f("/proc/" + TQString::number(pid) + "/cmdline");
 
   if (!f.open(IO_ReadOnly))
@@ -344,7 +360,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
   uint
 NaughtyProcessMonitor::cpuLoad() const
 {
-#ifdef __linux__
+#ifdef Q_OS_LINUX
   TQFile f("/proc/stat");
 
   if (!f.open(IO_ReadOnly))
@@ -400,7 +416,7 @@ NaughtyProcessMonitor::cpuLoad() const
   TQValueList<ulong>
 NaughtyProcessMonitor::pidList() const
 {
-#ifdef __linux__
+#if defined(Q_OS_LINUX) || defined(Q_OS_SOLARIS)
   TQStringList dl(TQDir("/proc").entryList());
 
   TQValueList<ulong> pl;
@@ -505,7 +521,7 @@ NaughtyProcessMonitor::pidList() const
   bool
 NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const
 {
-#ifdef __linux__
+#ifdef Q_OS_LINUX
   TQFile f("/proc/" + TQString::number(pid) + "/stat");
 
   if (!f.open(IO_ReadOnly))
@@ -540,7 +556,8 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const
   bool
 NaughtyProcessMonitor::kill(ulong pid) const
 {
-#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(Q_OS_LINUX) || defined(__OpenBSD__) || defined(__NetBSD__) ||\
+  defined(Q_OS_SOLARIS)
   return 0 == ::kill(pid, SIGKILL);
 #else
   Q_UNUSED( pid );
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.h b/kicker/applets/naughty/NaughtyProcessMonitor.h
index d66479964..3075bb9bd 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.h
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.h
@@ -27,7 +27,7 @@ class NaughtyProcessMonitorPrivate;
 
 class NaughtyProcessMonitor : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/kicker/applets/naughty/naughty-happy.png b/kicker/applets/naughty/naughty-happy.png
index 4c3505dfc..cbd451365 100644
--- a/kicker/applets/naughty/naughty-happy.png
+++ b/kicker/applets/naughty/naughty-happy.png
diff --git a/kicker/applets/naughty/naughty-sad.png b/kicker/applets/naughty/naughty-sad.png
index ae6d727f2..82a8279f5 100644
--- a/kicker/applets/naughty/naughty-sad.png
+++ b/kicker/applets/naughty/naughty-sad.png
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index c5d3e972a..638ce93c8 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -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");
@@ -115,7 +115,7 @@ RunApplet::~RunApplet()
 
 void RunApplet::resizeEvent(TQResizeEvent*)
 {
-    if(orientation() == Qt::Horizontal)
+    if(orientation() == TQt::Horizontal)
 	{
 	    _btn->hide();
 	    _input->reparent(this, TQPoint(0,0), true);
@@ -233,7 +233,7 @@ void RunApplet::run_command(const TQString& command)
 	    bool shutdown = kapp->requestShutDown();
 	    if( !shutdown )
             {
-                // This i18n string is in kdesktop/desktop.cc as well. Maybe we should DCOP to kdesktop instead ?
+                // This i18n string is in kdesktop/desktop.cpp as well. Maybe we should DCOP to kdesktop instead ?
 		KMessageBox::error( 0, i18n("Unable to log out properly.\nThe session manager cannot "
 					    "be contacted. You can try to force a shutdown by pressing "
 					    "Ctrl+Alt+Backspace. Note, however, that your current "
@@ -288,7 +288,7 @@ void RunApplet::run_command(const TQString& command)
     return;
 
  hide:
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
 	_hbox->hide();
     needsFocus(focusNeeded);
 }
diff --git a/kicker/applets/run/runapplet.h b/kicker/applets/run/runapplet.h
index d5d12435f..adb0d4c6f 100644
--- a/kicker/applets/run/runapplet.h
+++ b/kicker/applets/run/runapplet.h
@@ -35,7 +35,7 @@ class KURIFilterData;
 
 class RunApplet : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RunApplet(const TQString& configFile, Type t = Stretch, int actions = 0,
diff --git a/kicker/applets/swallow/prefwidget.h b/kicker/applets/swallow/prefwidget.h
index a23d6414b..03cde1399 100644
--- a/kicker/applets/swallow/prefwidget.h
+++ b/kicker/applets/swallow/prefwidget.h
@@ -23,7 +23,7 @@
 
 class PreferencesWidget : public PreferencesWidgetBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	PreferencesWidget( SwallowCommandList* swc, TQWidget* parent = 0 );
diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui
index bd2673efa..13f8aa300 100644
--- a/kicker/applets/swallow/prefwidgetbase.ui
+++ b/kicker/applets/swallow/prefwidgetbase.ui
@@ -119,16 +119,13 @@
         </spacer>
     </grid>
 </widget>
-<includes>
-    <include location="local" impldecl="in implementation">kdialog.h</include>
-</includes>
 <layoutdefaults spacing="3" margin="6"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">keditlistbox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="local"  impldecl="in implementation">kdialog.h</include>
+</includes>
 </UI>
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 1ac34cfec..c30a31cff 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -157,8 +157,8 @@ 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();
@@ -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;
@@ -289,8 +289,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent,
 	//	*process << "-geometry";
 	//	*process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->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/swallow/swallow.h b/kicker/applets/swallow/swallow.h
index b4be4f624..8bacc79f3 100644
--- a/kicker/applets/swallow/swallow.h
+++ b/kicker/applets/swallow/swallow.h
@@ -44,7 +44,7 @@ typedef TQPtrList<SwallowApp> SwallowAppList;
 
 class SwallowApplet : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SwallowApplet( const TQString& configFile, TQWidget *parent,
@@ -88,7 +88,7 @@ private:
 
 class SwallowApp : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 	
 public:
     SwallowApp( const SwallowCommand * swc, TQWidget* parent = 0,
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 97b71d1b2..664dd85ad 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -99,19 +99,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
     // disabling of frame effect on mouse hover
     kapp->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,7 +119,7 @@ void SystemTrayApplet::updateClockGeometry()
     if (m_clockApplet)
     {
         m_clockApplet->setPosition(position());
-			  if (orientation() == Qt::Horizontal)
+			  if (orientation() == TQt::Horizontal)
 			  {
 	          m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height());
    			}
@@ -151,10 +151,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());
@@ -249,11 +249,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, Qt::Vertical);
+    TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, TQt::Vertical);
 
     m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid);
     m_showClockSettingCB->setChecked(m_showClockInTray);
@@ -432,11 +432,11 @@ void SystemTrayApplet::showExpandButton(bool show)
     {
         if (!m_expandButton)
         {
-            m_expandButton = new SimpleArrowButton(this, Qt::UpArrow, 0, KickerSettings::showDeepButtons());
+            m_expandButton = new SimpleArrowButton(this, TQt::UpArrow, 0, KickerSettings::showDeepButtons());
             m_expandButton->installEventFilter(this);
             refreshExpandButton();
 
-            if (orientation() == Qt::Vertical)
+            if (orientation() == TQt::Vertical)
             {
                 m_expandButton->setFixedSize(width() - 4,
                                              m_expandButton->sizeHint()
@@ -448,12 +448,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
         {
@@ -559,7 +559,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))
@@ -677,12 +677,12 @@ void SystemTrayApplet::refreshExpandButton()
         return;
     }
 
-    Qt::ArrowType a;
+    TQt::ArrowType a;
 
-    if (orientation() == Qt::Vertical)
-        a = m_showHidden ? Qt::DownArrow : Qt::UpArrow;
+    if (orientation() == TQt::Vertical)
+        a = m_showHidden ? TQt::DownArrow : TQt::UpArrow;
     else
-        a = (m_showHidden ^ kapp->reverseLayout()) ? Qt::RightArrow : Qt::LeftArrow;
+        a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
     
     m_expandButton->setArrowType(a);
 }
@@ -833,17 +833,17 @@ int SystemTrayApplet::maxIconHeight() const
 
 bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
 {
-    if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_expandButton))
+    if (watched == m_expandButton)
     {
         TQPoint p;
         if (e->type() == TQEvent::ContextMenu)
         {
-            p = TQT_TQCONTEXTMENUEVENT(e)->globalPos();
+            p = static_cast<TQContextMenuEvent*>(e)->globalPos();
         }
         else if (e->type() == TQEvent::MouseButtonPress)
         {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
-            if (me->button() == Qt::RightButton)
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+            if (me->button() == TQt::RightButton)
             {
                 p = me->globalPos();
             }
@@ -853,9 +853,9 @@ 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(TQT_TQCONTEXTMENUEVENT(e)->globalPos());
+            contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos());
 
             delete contextMenu;
             return true;
@@ -867,7 +867,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
 
 int SystemTrayApplet::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
@@ -886,7 +886,7 @@ int SystemTrayApplet::widthForHeight(int h) const
 
 int SystemTrayApplet::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
@@ -913,7 +913,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()
@@ -937,7 +937,7 @@ void SystemTrayApplet::layoutTray()
 
     if (m_expandButton)
     {
-        if (orientation() == Qt::Vertical)
+        if (orientation() == TQt::Vertical)
         {
             m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height());
         }
@@ -961,7 +961,7 @@ void SystemTrayApplet::layoutTray()
     // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded.
     //
 
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout
         heightWidth = width() - ICON_MARGIN;
@@ -972,7 +972,7 @@ void SystemTrayApplet::layoutTray()
         m_layout->addMultiCellWidget(m_leftSpacer,
                                      0, 0,
                                      0, nbrOfLines - 1,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
         col = 1;
 
         if (showExpandButton)
@@ -980,7 +980,7 @@ void SystemTrayApplet::layoutTray()
             m_layout->addMultiCellWidget(m_expandButton,
                                          1, 1,
                                          0, nbrOfLines - 1,
-                                         Qt::AlignHCenter | Qt::AlignVCenter);
+                                         TQt::AlignHCenter | TQt::AlignVCenter);
             col = 2;
         }
 
@@ -993,7 +993,7 @@ void SystemTrayApplet::layoutTray()
                 line = i % nbrOfLines;
                 (*emb)->show();
                 m_layout->addWidget((*emb), col, line,
-                                    Qt::AlignHCenter | Qt::AlignVCenter);
+                                    TQt::AlignHCenter | TQt::AlignVCenter);
 
                 if ((line + 1) == nbrOfLines)
                 {
@@ -1011,7 +1011,7 @@ void SystemTrayApplet::layoutTray()
             line = i % nbrOfLines;
             (*emb)->show();
             m_layout->addWidget((*emb), col, line,
-                                Qt::AlignHCenter | Qt::AlignVCenter);
+                                TQt::AlignHCenter | TQt::AlignVCenter);
 
             if ((line + 1) == nbrOfLines)
             {
@@ -1024,7 +1024,7 @@ void SystemTrayApplet::layoutTray()
         m_layout->addMultiCellWidget(m_rightSpacer,
                                      col, col,
                                      0, nbrOfLines - 1,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
 
         if (m_clockApplet) {
             if (m_showClockInTray)
@@ -1035,7 +1035,7 @@ void SystemTrayApplet::layoutTray()
             m_layout->addMultiCellWidget(m_clockApplet,
                                      col+1, col+1,
                                      0, nbrOfLines - 1,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
         }
     }
     else // horizontal
@@ -1048,7 +1048,7 @@ void SystemTrayApplet::layoutTray()
         m_layout->addMultiCellWidget(m_leftSpacer,
                                      0, nbrOfLines - 1,
                                      0, 0,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
         col = 1;
 
         if (showExpandButton)
@@ -1056,7 +1056,7 @@ void SystemTrayApplet::layoutTray()
             m_layout->addMultiCellWidget(m_expandButton,
                                          0, nbrOfLines - 1,
                                          1, 1,
-                                         Qt::AlignHCenter | Qt::AlignVCenter);
+                                         TQt::AlignHCenter | TQt::AlignVCenter);
             col = 2;
         }
 
@@ -1068,7 +1068,7 @@ void SystemTrayApplet::layoutTray()
                 line = i % nbrOfLines;
                 (*emb)->show();
                 m_layout->addWidget((*emb), line, col,
-                                    Qt::AlignHCenter | Qt::AlignVCenter);
+                                    TQt::AlignHCenter | TQt::AlignVCenter);
 
                 if ((line + 1) == nbrOfLines)
                 {
@@ -1086,7 +1086,7 @@ void SystemTrayApplet::layoutTray()
             line = i % nbrOfLines;
             (*emb)->show();
             m_layout->addWidget((*emb), line, col,
-                                Qt::AlignHCenter | Qt::AlignVCenter);
+                                TQt::AlignHCenter | TQt::AlignVCenter);
 
             if ((line + 1) == nbrOfLines)
             {
@@ -1099,7 +1099,7 @@ void SystemTrayApplet::layoutTray()
         m_layout->addMultiCellWidget(m_rightSpacer,
                                      0, nbrOfLines - 1,
                                      col, col,
-                                     Qt::AlignHCenter | Qt::AlignVCenter);
+                                     TQt::AlignHCenter | TQt::AlignVCenter);
 
         if (m_clockApplet) {
             if (m_showClockInTray)
@@ -1110,7 +1110,7 @@ void SystemTrayApplet::layoutTray()
             m_layout->addMultiCellWidget(m_clockApplet,
                                          0, nbrOfLines - 1,
                                          col+1, col+1,
-                                         Qt::AlignHCenter | Qt::AlignVCenter);
+                                         TQt::AlignHCenter | TQt::AlignVCenter);
         }
     }
 
diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h
index e311a1bdd..2b49ce93e 100644
--- a/kicker/applets/systemtray/systemtrayapplet.h
+++ b/kicker/applets/systemtray/systemtrayapplet.h
@@ -48,7 +48,7 @@ class TDEActionSelector;
 
 class SystemTrayApplet : public KPanelApplet, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     typedef TQValueVector<TrayEmbed*> TrayEmbedList;
 
@@ -125,7 +125,7 @@ private:
 
 class TrayEmbed : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TrayEmbed( bool kdeTray, TQWidget* parent = NULL );
     ~TrayEmbed();
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 5673cb563..37a78a923 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -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());
 }
@@ -72,14 +72,14 @@ TaskbarApplet::~TaskbarApplet()
 
 int TaskbarApplet::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
 
     // FIXME KDE4: when either TaskBarContainer or Applet smartens up
     //             simplify this
-    KPanelExtension::Position d = orientation() == Qt::Horizontal ?
+    KPanelExtension::Position d = orientation() == TQt::Horizontal ?
                                   KPanelExtension::Top :
                                   KPanelExtension::Left;
     return container->sizeHint(d, TQSize(200, h)).width();
@@ -87,14 +87,14 @@ int TaskbarApplet::widthForHeight(int h) const
 
 int TaskbarApplet::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
 
     // FIXME KDE4: when either TaskBarContainer or Applet smartens up
     //             simplify this
-    KPanelExtension::Position d = orientation() == Qt::Horizontal ?
+    KPanelExtension::Position d = orientation() == TQt::Horizontal ?
                                   KPanelExtension::Top :
                                   KPanelExtension::Left;
     return container->sizeHint(d, TQSize(w, 200)).height();
diff --git a/kicker/applets/taskbar/taskbarapplet.h b/kicker/applets/taskbar/taskbarapplet.h
index 9685b436b..6204e94f5 100644
--- a/kicker/applets/taskbar/taskbarapplet.h
+++ b/kicker/applets/taskbar/taskbarapplet.h
@@ -31,7 +31,7 @@ class TQPalette;
 
 class TaskbarApplet : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TaskbarApplet( const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index f431b8aed..9fe7eccf6 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -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");
 }
@@ -121,12 +121,12 @@ void TrashApplet::resizeEvent( TQResizeEvent * )
 	int size = 1;
 
 	size = std::max( size, 
-			 orientation() == Qt::Vertical ?
+			 orientation() == TQt::Vertical ?
 			 	mButton->heightForWidth( width() ) :
 				mButton->widthForHeight( height() ) );
 
 	
-	if(orientation() == Qt::Vertical)
+	if(orientation() == TQt::Vertical)
 	{
 		mButton->resize( width(), size );
 	}
diff --git a/kicker/applets/trash/trashapplet.h b/kicker/applets/trash/trashapplet.h
index c77cf3755..124ae4310 100644
--- a/kicker/applets/trash/trashapplet.h
+++ b/kicker/applets/trash/trashapplet.h
@@ -33,7 +33,7 @@
 
 class TrashApplet : public KPanelApplet
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	TrashApplet(const TQString& configFile, Type t = Normal, int actions = 0,
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/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index bbf596a0c..fa1ce7077 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -32,7 +32,7 @@
 
 class TrashButton : public PanelPopupButton
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	TrashButton(TQWidget *parent);
diff --git a/kicker/data/icons/Makefile.am b/kicker/data/icons/Makefile.am
index 4bc51ce73..a8a6a18cd 100644
--- a/kicker/data/icons/Makefile.am
+++ b/kicker/data/icons/Makefile.am
@@ -1,3 +1,3 @@
-KDE_ICON = kdisknav package_favourite panel window_list kmenu kicker
+KDE_ICON = kdisknav package_favourite panel kmenu kicker
 
 SUBDIRS = actions
diff --git a/kicker/data/icons/cr16-app-window_list.png b/kicker/data/icons/cr16-app-window_list.png
deleted file mode 100644
index 33439e716..000000000
--- a/kicker/data/icons/cr16-app-window_list.png
+++ /dev/null
diff --git a/kicker/data/icons/cr32-app-window_list.png b/kicker/data/icons/cr32-app-window_list.png
deleted file mode 100644
index 2de7c18db..000000000
--- a/kicker/data/icons/cr32-app-window_list.png
+++ /dev/null
diff --git a/kicker/data/icons/cr48-app-window_list.png b/kicker/data/icons/cr48-app-window_list.png
deleted file mode 100644
index f19da6616..000000000
--- a/kicker/data/icons/cr48-app-window_list.png
+++ /dev/null
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 446991109..a5aeefa57 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -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();
@@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers()
          it != containers.constEnd();
          ++it)
     {
-        if (orientation() == Qt::Horizontal)
+        if (orientation() == TQt::Horizontal)
             (*it)->move(DockContainer::sz() * i, 0);
         else
             (*it)->move(0, DockContainer::sz() * i);
@@ -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();
 }
@@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p)
 }
 
 void DockBarExtension::mousePressEvent(TQMouseEvent *e ) {
-    if (e->button() == Qt::LeftButton) {
+    if (e->button() == TQt::LeftButton) {
         // Store the position of the mouse clic.
         mclic_pos = e->pos();
-    } else if (e->button() == Qt::RightButton) {
+    } else if (e->button() == TQt::RightButton) {
         int pos = findContainerAtPoint(e->pos());
         if (pos != -1) containers.at(pos)->popupMenu(e->globalPos());
     }
 }
 
 void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
-    if (e->button() != Qt::LeftButton) return;
+    if (e->button() != TQt::LeftButton) return;
     if (dragging_container) {  
         releaseMouse();
         original_container->embed(dragging_container->embeddedWinId());
@@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
 }
 
 void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
-    if (! (e->state() & Qt::LeftButton) ) return;
+    if (! (e->state() & TQt::LeftButton) ) return;
     if (dragging_container == 0) {
         // Check whether the user has moved far enough.
         int delay = TQApplication::startDragDistance();
@@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
         int pdrag1,pdrag2,psz;
         pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2;
         pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2;
-        if (orientation() == Qt::Vertical) {
+        if (orientation() == TQt::Vertical) {
             int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp;
             psz = height();
         } else psz = width();
diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h
index 0952d259e..1431f29ee 100644
--- a/kicker/extensions/dockbar/dockbarextension.h
+++ b/kicker/extensions/dockbar/dockbarextension.h
@@ -32,7 +32,7 @@ class KWinModule;
 
 class DockBarExtension : public KPanelExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DockBarExtension(const TQString& configFile, Type t = Normal,
diff --git a/kicker/extensions/dockbar/dockcontainer.h b/kicker/extensions/dockbar/dockcontainer.h
index 278b8e450..9ab21efb5 100644
--- a/kicker/extensions/dockbar/dockcontainer.h
+++ b/kicker/extensions/dockbar/dockcontainer.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class DockContainer : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     typedef TQValueVector<DockContainer*> Vector;
diff --git a/kicker/extensions/kasbar/docs.h b/kicker/extensions/kasbar/docs.h
index 105176d08..8a5ded920 100644
--- a/kicker/extensions/kasbar/docs.h
+++ b/kicker/extensions/kasbar/docs.h
@@ -36,19 +36,19 @@
 
 
 
-class QObject
+class TQObject
 {
 };
 
-class TQWidget : public QObject
+class TQWidget : public TQObject
 {
 };
 
-class TQDialog : public QWidget
+class TQDialog : public TQWidget
 {
 };
 
-class TQFrame : public QWidget
+class TQFrame : public TQWidget
 {
 };
 
@@ -64,6 +64,6 @@ class KDialogBase : public QDialog
 {
 };
 
-class KPanelExtension : public QWidget
+class KPanelExtension : public TQWidget
 {
 };
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 1d15dc7c8..e1c9f4afc 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar()
    box->setSpacing( spacingHint() );
    box->setMargin( marginHint() );
 
-   KasBar *bar = new KasBar( Qt::Horizontal, box );
+   KasBar *bar = new KasBar( TQt::Horizontal, box );
    bar->setItemSize( KasBar::Large );
    bar->setMasked( false );
 
@@ -129,9 +129,9 @@ 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() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
+   KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
    KasItem *i = 0;
 
    KasClockItem *clk = new KasClockItem( groupbar );
diff --git a/kicker/extensions/kasbar/kasaboutdlg.h b/kicker/extensions/kasbar/kasaboutdlg.h
index 0311202ba..dda84045b 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.h
+++ b/kicker/extensions/kasbar/kasaboutdlg.h
@@ -51,8 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
 #ifndef KASABOUTDLG_H
 #define KASABOUTDLG_H
 
@@ -65,7 +63,7 @@ class KasBar;
  */
 class KasAboutDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    KasAboutDialog( TQWidget *parent=0 );
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 87fc7c629..323a58150 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
    : TQWidget( parent, name, f ),
      master_(0),
      orient( o ),
-     direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+     direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
      itemUnderMouse_( 0 ),
      boxesPerLine_(10), // Temp value
      inDrag( false ),
@@ -102,14 +102,14 @@ 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 )
    : TQWidget( parent, name, f ),
      master_(master),
      orient( o ),
-     direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+     direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
      itemUnderMouse_( 0 ),
      boxesPerLine_(10), // Temp value
      inDrag( false ),
@@ -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 );
 
@@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir )
 	return;
 
     if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) )
-	orient = Qt::Horizontal;
+	orient = TQt::Horizontal;
     else
-	orient = Qt::Vertical;
+	orient = TQt::Vertical;
 
     direction_ = dir;
     emit directionChanged();
@@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o )
     if ( orient == o )
 	return;
 
-    if ( o == Qt::Horizontal )
+    if ( o == TQt::Horizontal )
 	setDirection( TQBoxLayout::LeftToRight );
     else
 	setDirection( TQBoxLayout::TopToBottom );
@@ -377,7 +377,7 @@ void KasBar::setDetached( bool detach )
 
 TQSize KasBar::sizeHint( Orientation o,  TQSize sz )
 {
-    if ( o == Qt::Horizontal )
+    if ( o == TQt::Horizontal )
 	setBoxesPerLine( sz.width() / itemExtent() );
     else
 	setBoxesPerLine( sz.height() / itemExtent() );
@@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o,  TQSize sz )
       ++r;
 
    TQSize s;
-   if( o == Qt::Horizontal ) {
+   if( o == TQt::Horizontal ) {
       s.setWidth( c*itemExtent() );
       s.setHeight( r*itemExtent() );
    }
@@ -434,7 +434,7 @@ void KasBar::updateLayout()
       ++r;
 
    TQSize sz;
-   if ( orient == Qt::Horizontal )
+   if ( orient == TQt::Horizontal )
        sz = TQSize( c * itemExtent(), r * itemExtent() );
    else
        sz = TQSize( r * itemExtent(), c * itemExtent() );
@@ -449,7 +449,7 @@ void KasBar::updateLayout()
    TQRegion mask;
 
    KasItem *i;
-   if ( orient == Qt::Horizontal ) {
+   if ( orient == TQt::Horizontal ) {
        for ( i = items.first(); i; i = items.next() ) {
 	   int x = (items.at() % c) * itemExtent();
 
@@ -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 d875dd00f..5aad7392a 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /* kasbar.h
 **
 ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
@@ -53,9 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
-
 #ifndef __KASBAR_H
 #define __KASBAR_H
 
@@ -79,7 +74,7 @@ typedef TQPtrList<KasItem> KasItemList;
  */
 class KDE_EXPORT KasBar : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
    TQ_PROPERTY( int maxBoxes READ maxBoxes )
    TQ_PROPERTY( uint boxesPerLine READ boxesPerLine )
    TQ_PROPERTY( Direction direction READ direction )
@@ -89,8 +84,8 @@ class KDE_EXPORT KasBar : public TQWidget
 
    friend class KasItem;
 public:
-   KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
-   KasBar( Qt::Orientation o, KasBar *master, 
+   KasBar( TQt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
+   KasBar( TQt::Orientation o, KasBar *master, 
 	   TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
    virtual ~KasBar();
@@ -104,7 +99,7 @@ public:
    KasBar *master() const { return master_; }
 
    /** Creates a child bar of the kasbar. The child will inherit the appearance options. */
-   virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
+   virtual KasBar *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 );
 
    /** Factory method that returns the singleton resources object. */
    virtual KasResources *resources();
@@ -141,8 +136,8 @@ public:
    int maxBoxes() const { return maxBoxes_; }
    uint boxesPerLine() const { return boxesPerLine_; }
 
-   void setOrientation( Qt::Orientation o );
-   Qt::Orientation orientation() const { return orient; }
+   void setOrientation( TQt::Orientation o );
+   TQt::Orientation orientation() const { return orient; }
 
    void setDirection( Direction dir );
    Direction direction() const { return direction_; }
@@ -152,7 +147,7 @@ public:
 
    bool isDrag() const { return inDrag; }
 
-   TQSize sizeHint( Qt::Orientation,  TQSize max );
+   TQSize sizeHint( TQt::Orientation,  TQSize max );
 
    //
    // Look and feel options
@@ -287,7 +282,7 @@ private:
    TQPixmap offscreen;
    KasBar *master_;
    KasItemList items;
-   Qt::Orientation orient;
+   TQt::Orientation orient;
    Direction direction_;
    KasItem *itemUnderMouse_;
    uint boxesPerLine_;
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index ebb2422d3..a9a5fd68a 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -88,7 +88,7 @@ int main( int argc, char **argv )
   TDEConfig conf( "kasbarrc" );
 
   if ( args->isSet("test") ) {
-      kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
+      kasbar = new KasBar( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
       kasbar->setItemSize( KasBar::Large );
       kasbar->append( new KasClockItem(kasbar) );
       kasbar->append( new KasItem(kasbar) );
@@ -97,14 +97,14 @@ int main( int argc, char **argv )
       kasbar->addTestItems();
   }
   else {
-      KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
+      KasTasker *kastasker = new KasTasker( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
       kastasker->setConfig( &conf );
       kastasker->setStandAlone( true );
       kasbar = kastasker;
 
       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();
   }
 
@@ -118,7 +118,7 @@ int main( int argc, char **argv )
 
   TDEApplication::kApplication()->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 5d870dae6..327fd564c 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -97,8 +97,8 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
 //    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();
@@ -146,7 +146,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ )
 
 TQSize KasBarExtension::detachedSize()
 {
-    if ( orientation() == Qt::Vertical )
+    if ( orientation() == TQt::Vertical )
 	return TQSize( kasbar->itemExtent()/2, 0 );
     else
 	return TQSize( 0, kasbar->itemExtent()/2 );
@@ -155,13 +155,13 @@ TQSize KasBarExtension::detachedSize()
 
 TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const
 {
-   Orientation o = Qt::Horizontal;
+   Orientation o = TQt::Horizontal;
 
    if ( p == Left || p == Right )
-      o = Qt::Vertical;
+      o = TQt::Vertical;
 
    if ( detached_ ) {
-       if ( o == Qt::Vertical )
+       if ( o == TQt::Vertical )
 	   return TQSize( kasbar->itemExtent()/2, 0 );
        else
 	   return TQSize( 0, kasbar->itemExtent()/2 );
diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h
index 7fbb4fbc6..c1786c953 100644
--- a/kicker/extensions/kasbar/kasbarextension.h
+++ b/kicker/extensions/kasbar/kasbarextension.h
@@ -51,8 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
 #ifndef KASBAREXTENSION_H
 #define KASBAREXTENSION_H
 
@@ -66,7 +64,7 @@ class KasTasker;
  */
 class KasBarExtension : public KPanelExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasBarExtension( const TQString& configFile,
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 249e7c051..a99c5f8ba 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -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 a95ebac7b..b6b263318 100644
--- a/kicker/extensions/kasbar/kasclockitem.h
+++ b/kicker/extensions/kasbar/kasclockitem.h
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-
-
 #ifndef KASCLOCKITEM_H
 #define KASCLOCKITEM_H
 
@@ -11,7 +8,7 @@
  */
 class KDE_EXPORT KasClockItem : public KasItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasClockItem( KasBar *parent );
diff --git a/kicker/extensions/kasbar/kasgrouper.h b/kicker/extensions/kasbar/kasgrouper.h
index c5beab3a6..d134d8921 100644
--- a/kicker/extensions/kasbar/kasgrouper.h
+++ b/kicker/extensions/kasbar/kasgrouper.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /* kasgrouper.h
 **
 ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index a14dff2ea..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();
 }
 
@@ -255,9 +255,9 @@ void KasGroupItem::updatePopup()
 KasPopup *KasGroupItem::createPopup()
 {
     KasPopup *pop = new KasPopup( this );
-    bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
+    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/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h
index e30260f57..2acad3004 100644
--- a/kicker/extensions/kasbar/kasgroupitem.h
+++ b/kicker/extensions/kasbar/kasgroupitem.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /* kasgroupitem.h
 **
 ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
@@ -53,9 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
-
 #ifndef KASGROUPITEM_H
 #define KASGROUPITEM_H
 
@@ -73,7 +68,7 @@ class Task;
  */
 class KasGroupItem : public KasItem
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    enum GroupType {
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 2523ef18c..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 );
    }
 
@@ -179,11 +179,11 @@ void KasItem::mouseEnter()
 
 void KasItem::mouseReleaseEvent( TQMouseEvent *ev )
 {
-    if ( ev->button() == Qt::LeftButton )
+    if ( ev->button() == TQt::LeftButton )
 	emit leftButtonClicked( ev );
-    else if ( ev->button() == Qt::RightButton )
+    else if ( ev->button() == TQt::RightButton )
 	emit rightButtonClicked( ev );
-    else if ( ev->button() == Qt::MidButton )
+    else if ( ev->button() == TQt::MidButton )
 	emit middleButtonClicked( ev );
 }
 
@@ -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()
@@ -312,13 +312,13 @@ void KasItem::paintFrame( TQPainter *p )
 	   p->drawRect( 0, 0, extent(), extent());
        }
        else {
-	   pen = TQPen( Qt::white );
+	   pen = TQPen( TQt::white );
 	   p->setPen( pen );
 	   p->drawRect(0, 0, extent(), extent());
        }
    }
    else if ( kas->paintInactiveFrames() ) {
-       p->setPen( attention_ ? resources()->attentionColor() : Qt::black );
+       p->setPen( attention_ ? resources()->attentionColor() : TQt::black );
        p->drawRect(0, 0, extent(), extent());
    }
 }
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 5c7378825..508955f9d 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -51,8 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
 #ifndef KASITEM_H
 #define KASITEM_H
 
@@ -77,7 +75,7 @@ class KasPopup;
  */
 class KDE_EXPORT KasItem : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     friend class KasBar;
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 6169d09b1..450d80154 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -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 ba2fd5ff4..91af06080 100644
--- a/kicker/extensions/kasbar/kasloaditem.h
+++ b/kicker/extensions/kasbar/kasloaditem.h
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-
-
 #ifndef KASLOADITEM_H
 #define KASLOADITEM_H
 
@@ -13,7 +10,7 @@
  */
 class KDE_EXPORT KasLoadItem : public KasItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasLoadItem( KasBar *parent );
diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp
index 0edc0a77a..33966bdb9 100644
--- a/kicker/extensions/kasbar/kaspopup.cpp
+++ b/kicker/extensions/kasbar/kaspopup.cpp
@@ -95,7 +95,7 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h )
    int x = pos.x();
    int y = pos.y();
 
-   if ( kasbar->orientation() == Qt::Horizontal ) {
+   if ( kasbar->orientation() == TQt::Horizontal ) {
       if ( y < ( tqApp->desktop()->height() / 2 ) )
 	 y = y + kasbar->itemExtent();
       else
diff --git a/kicker/extensions/kasbar/kaspopup.h b/kicker/extensions/kasbar/kaspopup.h
index 38abbbc28..701ca01dd 100644
--- a/kicker/extensions/kasbar/kaspopup.h
+++ b/kicker/extensions/kasbar/kaspopup.h
@@ -51,8 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
 #ifndef KASPOPUP_H
 #define KASPOPUP_H
 
@@ -71,7 +69,7 @@ class KasBar;
  */
 class KasPopup : public TQHBox
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    KasPopup( KasItem *item, const char *name=0 );
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 28c6fca72..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,40 +197,40 @@ 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 );
 
    int percent = (int) (kasbar->tintAmount() * 100.0);
-   tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox );
+   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,
@@ -261,9 +261,9 @@ void KasPrefsDialog::addThumbsPage()
 			  "cause performance problems." ) );
    TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox );
    int percent = (int) (kasbar->thumbnailSize() * 100.0);
-   thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox );
-   connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ),
-	    kasbar, TQT_SLOT( setThumbnailSize( int ) ) );
+   thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox );
+   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 );
 
@@ -287,27 +287,27 @@ void KasPrefsDialog::addThumbsPage()
 
 void KasPrefsDialog::addBehavePage()
 {
-   TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_list" ) );
+   TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_duplicate" ) );
 
    groupWindowsCheck = new TQCheckBox( i18n("&Group windows"), behavePage );
    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/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h
index c3e8be131..b35e96bed 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.h
+++ b/kicker/extensions/kasbar/kasprefsdlg.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /* kasprefsdlg.h
 **
 ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
@@ -53,8 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
 #ifndef KASPREFSDLG_H
 #define KASPREFSDLG_H
 
@@ -76,7 +72,7 @@ class KasResources;
  */
 class KasPrefsDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    KasPrefsDialog( KasTasker *kas, TQWidget *parent=0 );
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 78b25e8c0..219c324fb 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -126,10 +126,10 @@ static const char *micro_shade[]={
 KasResources::KasResources( KasBar *parent, const char *name )
     : TQObject( parent, name ? name : "kasbar_resources" ),
       kasbar( parent ),
-      labelPenColor_( Qt::white ), labelBgColor_( Qt::black ),
-      activePenColor_( Qt::black ), activeBgColor_( Qt::white ),
-      inactivePenColor_( Qt::black ), inactiveBgColor_( Qt::white ),
-      progressColor_( Qt::green ), attentionColor_( Qt::red ),
+      labelPenColor_( TQt::white ), labelBgColor_( TQt::black ),
+      activePenColor_( TQt::black ), activeBgColor_( TQt::white ),
+      inactivePenColor_( TQt::black ), inactiveBgColor_( TQt::white ),
+      progressColor_( TQt::green ), attentionColor_( TQt::red ),
       startupFrames_()
 {
 }
diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h
index bada9786b..81f06086c 100644
--- a/kicker/extensions/kasbar/kasresources.h
+++ b/kicker/extensions/kasbar/kasresources.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /* kasbar.h
 **
 ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
@@ -75,7 +73,7 @@ class KasBar;
  */
 class KasResources : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasResources( KasBar *parent, const char *name=0 );
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/kasstartupitem.h b/kicker/extensions/kasbar/kasstartupitem.h
index 16adcc68d..24cf4fe60 100644
--- a/kicker/extensions/kasbar/kasstartupitem.h
+++ b/kicker/extensions/kasbar/kasstartupitem.h
@@ -51,9 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
-
 #ifndef KASSTARTUPITEM_H
 #define KASSTARTUPITEM_H
 
@@ -70,7 +67,7 @@ class TQTimer;
  */
 class KasStartupItem : public KasItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasStartupItem( KasBar *parent, Startup::Ptr startup );
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index d10805a78..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()
@@ -635,7 +635,7 @@ void KasTasker::readConfig( TDEConfig *conf )
    conf->setGroup("Layout");
 
    setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) );
-   setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) );
+   setOrientation( (TQt::Orientation) conf->readNumEntry( "Orientation", TQt::Horizontal ) );
    setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) );
 
    TQPoint pos(100, 100);
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index 93cddd1ce..c05c13bb6 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 /* kastasker.h
 **
 ** Copyright (C) 2001-2004 Richard Moore <rich@kde.org>
@@ -84,21 +82,21 @@ class KasGrouper;
  */
 class KDE_EXPORT KasTasker : public KasBar
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool isTopLevel READ isTopLevel )
     TQ_PROPERTY( bool showClock READ showClock )
     TQ_PROPERTY( bool showLoad READ showLoad )
 
 public:
     /** Create a KasTasker widget. */
-    KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+    KasTasker( TQt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
 
     /**
      * Create a KasTasker widget that is slaved to another KasTasker. The
      * created widget will inherit the settings of the parent, but will
      * not connect to the signals of the TaskManager.
      */
-    KasTasker( Qt::Orientation o, KasTasker *master,
+    KasTasker( TQt::Orientation o, KasTasker *master,
 	       TQWidget *parent=0, const char *name=0, WFlags f=0 );
 
     /** Cleans up. */
@@ -107,7 +105,7 @@ public:
     /** Factory method that returns the default menu for items in the bar. */
     virtual TDEPopupMenu *contextMenu();
 
-    virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
+    virtual KasTasker *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 );
 
     /**
      * Returns true if this is the top KasTasker. Note that it is possible for
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index 0f57524cc..b7ab94de6 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -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/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h
index b2b166ef5..99205ae27 100644
--- a/kicker/extensions/kasbar/kastaskitem.h
+++ b/kicker/extensions/kasbar/kastaskitem.h
@@ -51,9 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
-
 #ifndef KASTASKITEM_H
 #define KASTASKITEM_H
 
@@ -70,7 +67,7 @@ class KPixmap;
  */
 class KasTaskItem : public KasItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
  public:
     KasTaskItem( KasTasker *parent, Task::Ptr task );
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 7b5fe4ed5..8905af37a 100644
--- a/kicker/extensions/kasbar/kastaskpopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -91,10 +91,10 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
     }
 
     KPixmapEffect::gradient( titleBg, 
-                             Qt::black, colorGroup().mid(),
+                             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()
@@ -119,7 +119,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * )
 
     TQString text = item->task()->visibleIconicName();
 
-    p.setPen( Qt::white );
+    p.setPen( TQt::white );
     if ( fontMetrics().width( text ) > width() - 4 )
         p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter,
                      text );
@@ -133,7 +133,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * )
     //
     // Draw border
     //
-    p.setPen( Qt::black );
+    p.setPen( TQt::black );
     p.drawRect( 0, 0, width(), height() );
 }
 
diff --git a/kicker/extensions/kasbar/kastaskpopup.h b/kicker/extensions/kasbar/kastaskpopup.h
index dcdc33107..c209f8774 100644
--- a/kicker/extensions/kasbar/kastaskpopup.h
+++ b/kicker/extensions/kasbar/kastaskpopup.h
@@ -51,8 +51,6 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-// -*- c++ -*-
-
 #ifndef KASTASKPOPUP_H
 #define KASTASKPOPUP_H
 
@@ -68,7 +66,7 @@ class KasTaskItem;
  */
 class KasTaskPopup : public KasPopup
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KasTaskPopup( KasTaskItem *item, const char *name=0 );
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 1a4f6924b..142b42ee3 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -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 &)));
 
     }
 
@@ -73,8 +73,8 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
     m_resizeHandle->setFrameShape(TQFrame::Panel);
     m_resizeHandle->setFrameShadow(TQFrame::Raised);
     m_resizeHandle->setFixedWidth(6);
-    m_resizeHandle->setCursor(TQCursor(Qt::SizeHorCursor));
-    connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool)));
+    m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor));
+    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/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h
index 5a117b1ee..bd8210a3c 100644
--- a/kicker/extensions/sidebar/sidebarextension.h
+++ b/kicker/extensions/sidebar/sidebarextension.h
@@ -26,7 +26,7 @@ class TQVBox;
 
 class SidebarExtension : public KPanelExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SidebarExtension( const TQString& configFile,
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 4606b27fb..56f33c66d 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -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);
     connectDCOPSignal("kicker", "kicker", "configurationChanged()",
                       "configure()", false);
 
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-            TQT_SLOT(setBackgroundTheme()));
+    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+            TQ_SLOT(setBackgroundTheme()));
 
-    TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme()));
+    TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme()));
 }
 
 TaskBarExtension::~TaskBarExtension()
@@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p )
         m_container->popupDirectionChange(KPanelApplet::Right);
         break;
     case Floating:
-        if (orientation() == Qt::Horizontal)
+        if (orientation() == TQt::Horizontal)
         {
             m_container->popupDirectionChange(KPanelApplet::Down);
         }
@@ -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
         {
@@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme()
         {
             TQImage bgImage = m_bgImage;
 
-            if (orientation() == Qt::Vertical)
+            if (orientation() == TQt::Vertical)
             {
                 if (KickerSettings::rotateBackground())
                 {
diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h
index 2848e80c7..f2bc3ebf0 100644
--- a/kicker/extensions/taskbar/taskbarextension.h
+++ b/kicker/extensions/taskbar/taskbarextension.h
@@ -34,7 +34,7 @@ class TaskBarContainer;
 
 class TaskBarExtension : public KPanelExtension, virtual public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 k_dcop:
diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h
index bb6d450e1..18d03214c 100644
--- a/kicker/kicker/buttons/bookmarksbutton.h
+++ b/kicker/kicker/buttons/bookmarksbutton.h
@@ -36,7 +36,7 @@ class KBookmarkOwner;
  */
 class BookmarksButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BookmarksButton(TQWidget* parent);
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/browserbutton.h b/kicker/kicker/buttons/browserbutton.h
index 507a764ed..627368472 100644
--- a/kicker/kicker/buttons/browserbutton.h
+++ b/kicker/kicker/buttons/browserbutton.h
@@ -33,7 +33,7 @@ class PanelBrowserMenu;
  */
 class BrowserButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent );
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/desktopbutton.h b/kicker/kicker/buttons/desktopbutton.h
index c896bdf92..3ea98a49e 100644
--- a/kicker/kicker/buttons/desktopbutton.h
+++ b/kicker/kicker/buttons/desktopbutton.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class DesktopButton : public PanelButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DesktopButton( TQWidget* parent );
diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h
index 2d2d2d1f2..3c9932655 100644
--- a/kicker/kicker/buttons/extensionbutton.h
+++ b/kicker/kicker/buttons/extensionbutton.h
@@ -31,7 +31,7 @@ class KPanelMenu;
 
 class ExtensionButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ExtensionButton( const TQString& desktopFile, TQWidget* parent );
diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h
index 896bf56c2..fd34e5104 100644
--- a/kicker/kicker/buttons/kbutton.h
+++ b/kicker/kicker/buttons/kbutton.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class KButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KButton( TQWidget *parent );
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index ee5fa9c1f..ee3a942e5 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -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();
      }
@@ -112,11 +112,11 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
         e->type() == TQEvent::MouseButtonPress   ||
         e->type() == TQEvent::MouseButtonDblClick )
     {
-        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             if (m_pressedDuringPopup && m_popup && m_openTimer != -1
-                    && (me->button() & Qt::LeftButton) )
+                    && (me->button() & TQt::LeftButton) )
                 return true;
         }
     }
diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h
index 1bdbbafbd..d38df07c6 100644
--- a/kicker/kicker/buttons/knewbutton.h
+++ b/kicker/kicker/buttons/knewbutton.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class KNewButton : public KButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KNewButton( TQWidget *parent );
diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp
index 4f88f2d37..972944897 100644
--- a/kicker/kicker/buttons/nontdeappbutton.cpp
+++ b/kicker/kicker/buttons/nontdeappbutton.cpp
@@ -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,
@@ -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/nontdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h
index 94c7cb59d..eac6ce412 100644
--- a/kicker/kicker/buttons/nontdeappbutton.h
+++ b/kicker/kicker/buttons/nontdeappbutton.h
@@ -37,8 +37,8 @@ class PanelExeDialog;
  */
 class NonKDEAppButton : public PanelButton
 {
-    // the Q_OBJECT macro provides the magic glue for signals 'n slots
-    Q_OBJECT
+    // the TQ_OBJECT macro provides the magic glue for signals 'n slots
+    TQ_OBJECT
 
 public:
     // define our two constructors, one used for creating new buttons...
diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp
index 716a750ed..9b368407e 100644
--- a/kicker/kicker/buttons/servicebutton.cpp
+++ b/kicker/kicker/buttons/servicebutton.cpp
@@ -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()
@@ -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()
@@ -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/servicebutton.h b/kicker/kicker/buttons/servicebutton.h
index ac551adb5..a2d7939e8 100644
--- a/kicker/kicker/buttons/servicebutton.h
+++ b/kicker/kicker/buttons/servicebutton.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class ServiceButton : public PanelButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ServiceButton( const TQString& desktopFile, TQWidget* parent );
diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h
index da512105d..bef038859 100644
--- a/kicker/kicker/buttons/servicemenubutton.h
+++ b/kicker/kicker/buttons/servicemenubutton.h
@@ -33,7 +33,7 @@ class PanelServiceMenu;
  */
 class ServiceMenuButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ServiceMenuButton( const TQString& relPath, TQWidget* parent );
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index 13ff95323..d398b07b0 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -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())
@@ -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/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h
index ba4a1b43d..dd55d78b4 100644
--- a/kicker/kicker/buttons/urlbutton.h
+++ b/kicker/kicker/buttons/urlbutton.h
@@ -34,7 +34,7 @@ class KPropertiesDialog;
  */
 class URLButton : public PanelButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     URLButton( const TQString& url, TQWidget* parent );
diff --git a/kicker/kicker/buttons/windowlist.desktop b/kicker/kicker/buttons/windowlist.desktop
index 94c035def..1ffb96610 100644
--- a/kicker/kicker/buttons/windowlist.desktop
+++ b/kicker/kicker/buttons/windowlist.desktop
@@ -3,5 +3,5 @@ Name=Window List Menu
 
 Comment=A menu that lists all open windows
 
-Icon=window_list
+Icon=window_duplicate
 X-TDE-Library=WindowListButton
diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp
index f1c72904e..cbcfd4b75 100644
--- a/kicker/kicker/buttons/windowlistbutton.cpp
+++ b/kicker/kicker/buttons/windowlistbutton.cpp
@@ -38,7 +38,7 @@ WindowListButton::WindowListButton( TQWidget* parent )
 
     setTitle(i18n("Window List"));
     TQToolTip::add(this, i18n("Window list"));
-    setIcon("window_list");
+    setIcon("window_duplicate");
 }
 
 void WindowListButton::initPopup()
diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h
index d8b57c62e..d9b67fb67 100644
--- a/kicker/kicker/buttons/windowlistbutton.h
+++ b/kicker/kicker/buttons/windowlistbutton.h
@@ -33,7 +33,7 @@ class KWindowListMenu;
  */
 class WindowListButton : public PanelPopupButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     WindowListButton( TQWidget* parent );
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index 1806fedbb..c8f87b02e 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -64,8 +64,8 @@ AppletHandle::AppletHandle(AppletContainer* parent)
         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()));
     }
 
@@ -89,7 +89,7 @@ int AppletHandle::widthForHeight( int /* h */ ) const
 
 void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
 {
-    Qt::ArrowType a = Qt::UpArrow;
+    TQt::ArrowType a = TQt::UpArrow;
 
     if (d == m_popupDirection || !m_menuButton)
     {
@@ -102,19 +102,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
     {
         case KPanelApplet::Up:
             m_layout->setDirection(TQBoxLayout::BottomToTop);
-            a = Qt::UpArrow;
+            a = TQt::UpArrow;
             break;
         case KPanelApplet::Down:
             m_layout->setDirection(TQBoxLayout::TopToBottom);
-            a = Qt::DownArrow;
+            a = TQt::DownArrow;
             break;
         case KPanelApplet::Left:
             m_layout->setDirection(TQBoxLayout::RightToLeft);
-            a = Qt::LeftArrow;
+            a = TQt::LeftArrow;
             break;
         case KPanelApplet::Right:
             m_layout->setDirection(TQBoxLayout::LeftToRight);
-            a = Qt::RightArrow;
+            a = TQt::RightArrow;
             break;
     }
 
@@ -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);
         }
     }
@@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
                     // a hack for applets that have out-of-process
                     // elements (e.g the systray) so that the handle
                     // doesn't flicker when moving over those elements
-                    if (TQT_TQRECT_OBJECT(w->rect()).contains(w->mapFromGlobal(TQCursor::pos())))
+                    if (w->rect().contains(w->mapFromGlobal(TQCursor::pos())))
                     {
                         nowDrawIt = true;
                     }
@@ -220,12 +220,12 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
 
         return TQWidget::eventFilter( o, e );
     }
-    else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar))
+    else if (o == m_dragBar)
     {
         if (e->type() == TQEvent::MouseButtonPress)
         {
-            TQMouseEvent* ev = TQT_TQMOUSEEVENT(e);
-            if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton)
+            TQMouseEvent* ev = static_cast<TQMouseEvent*>(e);
+            if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton)
             {
                 emit moveApplet(m_applet->mapFromGlobal(ev->globalPos()));
             }
@@ -234,8 +234,8 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
 
     if (m_menuButton && e->type() == TQEvent::MouseButtonPress)
     {
-        TQMouseEvent* ev = TQT_TQMOUSEEVENT(e);
-        if (ev->button() == Qt::RightButton)
+        TQMouseEvent* ev = static_cast<TQMouseEvent*>(e);
+        if (ev->button() == TQt::RightButton)
         {
             if (!m_menuButton->isDown())
             {
@@ -312,7 +312,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const
 {
     int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
 
-    if (m_parent->orientation() == Qt::Horizontal)
+    if (m_parent->orientation() == TQt::Horizontal)
     {
         return TQSize(wh, 0);
     }
@@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const
 
 TQSizePolicy AppletHandleDrag::sizePolicy() const
 {
-    if (m_parent->orientation() == Qt::Horizontal)
+    if (m_parent->orientation() == TQt::Horizontal)
     {
         return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
     }
@@ -360,14 +360,14 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *)
         
         TQStyle::SFlags flags = TQStyle::Style_Default;
         flags |= TQStyle::Style_Enabled;
-        if (m_parent->orientation() == Qt::Horizontal)
+        if (m_parent->orientation() == TQt::Horizontal)
         {
             flags |= TQStyle::Style_Horizontal;
         }
     
         TQRect r = rect();
     
-        style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
+        style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
                             colorGroup(), flags);
     }
     else
@@ -387,7 +387,7 @@ TQSize AppletHandleButton::minimumSizeHint() const
     int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
     int width = height;
 
-    if (m_parent->orientation() == Qt::Horizontal)
+    if (m_parent->orientation() == TQt::Horizontal)
     {
         return TQSize(width, height);
     }
diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h
index 34e8e3576..578bc1dc3 100644
--- a/kicker/kicker/core/applethandle.h
+++ b/kicker/kicker/core/applethandle.h
@@ -37,7 +37,7 @@ class AppletHandleButton;
 
 class AppletHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         AppletHandle(AppletContainer* parent);
@@ -87,7 +87,7 @@ class AppletHandle : public TQWidget
 
 class AppletHandleDrag : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         AppletHandleDrag(AppletHandle* parent);
@@ -109,7 +109,7 @@ class AppletHandleDrag : public TQWidget
 
 class AppletHandleButton : public SimpleArrowButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         AppletHandleButton(AppletHandle *parent);
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index d710a1ade..e53e831ba 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
     _appletframe->setFrameStyle(TQFrame::NoFrame);
     _appletframe->installEventFilter(this);
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
     }
@@ -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()
@@ -191,7 +191,7 @@ void AppletContainer::resetLayout()
 {
     _handle->resetLayout();
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         _layout->setDirection( TQBoxLayout::LeftToRight );
     }
@@ -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()));
@@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( TDEConfigGroup& config,
                                            bool layoutOnly ) const
 {
     // immutability is checked by ContainerBase
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         config.writeEntry( "WidthForHeightHint", widthForHeight(height()) );
     }
@@ -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;
 }
@@ -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_applet.h b/kicker/kicker/core/container_applet.h
index 458f18fe0..d5b80930e 100644
--- a/kicker/kicker/core/container_applet.h
+++ b/kicker/kicker/core/container_applet.h
@@ -40,7 +40,7 @@ class AppletHandle;
 
 class AppletContainer : public BaseContainer
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     AppletContainer(const AppletInfo& info, TQPopupMenu* opMenu, bool isImmutable = false, TQWidget* parent = 0);
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index e3131b2ed..64886f436 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name )
   : TQWidget( parent, name )
   , _dir(KPanelApplet::Up)
-  , _orient(Qt::Horizontal)
+  , _orient(TQt::Horizontal)
   , _alignment(KPanelExtension::LeftTop)
   , _fspace(0)
   , _moveOffset(TQPoint(0,0))
@@ -47,7 +47,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const
   , _opMnu(0)
   , _appletOpMnu(appletOpMenu)
 {
-    setCursor(tqarrowCursor);
+    setCursor(TQt::arrowCursor);
 }
 
 BaseContainer::~BaseContainer()
diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h
index 88e06e715..6cf61bec6 100644
--- a/kicker/kicker/core/container_base.h
+++ b/kicker/kicker/core/container_base.h
@@ -36,7 +36,7 @@ class TQPopupMenu;
 
 class BaseContainer : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     typedef TQValueList<BaseContainer*> List;
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index 40f479308..d3a550a07 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()
@@ -225,7 +225,7 @@ void ButtonContainer::dragButton(const TQPixmap icon)
 
 bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
 {
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress)
+    if (o == _button && e->type() == TQEvent::MouseButtonPress)
     {
         static bool sentinal = false;
 
@@ -235,10 +235,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
         }
 
         sentinal = true;
-        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
         switch (me->button())
         {
-        case Qt::MidButton:
+        case TQt::MidButton:
         {
             if (isImmutable())
             {
@@ -252,7 +252,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
             return true;
         }
 
-        case Qt::RightButton:
+        case TQt::RightButton:
         {
             if (!kapp->authorizeTDEAction("kicker_rmb") ||
                 isImmutable())
@@ -261,9 +261,9 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
             }
 
             TQPopupMenu* menu = opMenu();
-            connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) );
-            TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this),
-                                                  (orientation() == Qt::Horizontal) ?
+            connect( menu, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotMenuClosed() ) );
+            TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this,
+                                                  (orientation() == TQt::Horizontal) ?
                                                    TQPoint(0, 0) : me->pos());
 
             Kicker::the()->setInsertionPoint(me->globalPos());
diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h
index bc24272db..d564354b0 100644
--- a/kicker/kicker/core/container_button.h
+++ b/kicker/kicker/core/container_button.h
@@ -36,7 +36,7 @@ class TDEConfigGroup;
 
 class ButtonContainer : public BaseContainer
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
@@ -151,7 +151,7 @@ public:
     WindowListButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0);
     WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0);
     TQString appletType() const { return "WindowListButton"; }
-    virtual TQString icon() const { return "window_list"; }
+    virtual TQString icon() const { return "window_duplicate"; }
     virtual TQString visibleName() const { return i18n("Windowlist"); }
     bool isAMenu() const { return true; }
 };
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 721df418e..afb786f7f 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -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);
     }
@@ -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
@@ -1208,7 +1208,7 @@ int ExtensionContainer::arrangeHideButtons()
         _layout->setEnabled(false);
     }
 
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         int maxWidth = width();
 
@@ -1227,7 +1227,7 @@ int ExtensionContainer::arrangeHideButtons()
             _ltHB->setMaximumWidth(maxWidth);
             _ltHB->setMaximumHeight(14);
             _layout->remove(_ltHB);
-            _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft);
+            _layout->addWidget(_ltHB, 0, 1, TQt::AlignBottom | TQt::AlignLeft);
         }
 
         if (_rbHB)
@@ -1252,8 +1252,8 @@ int ExtensionContainer::arrangeHideButtons()
             maxHeight = maxHeight - (PANEL_RESIZE_HANDLE_WIDTH + PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE);
         }
 
-        int vertAlignment = (position() == KPanelExtension::Top) ? Qt::AlignTop : 0;
-        int leftAlignment = Qt::AlignRight;
+        int vertAlignment = (position() == KPanelExtension::Top) ? TQt::AlignTop : 0;
+        int leftAlignment = TQt::AlignRight;
 
         if (_ltHB)
         {
@@ -1262,11 +1262,11 @@ int ExtensionContainer::arrangeHideButtons()
             _layout->remove(_ltHB);
             if (kapp->reverseLayout())
             {
-                _layout->addWidget(_ltHB, 1, 2, (TQ_Alignment)vertAlignment);
+                _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
             }
             else
             {
-                _layout->addWidget(_ltHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment));
+                _layout->addWidget(_ltHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
             }
         }
 
@@ -1277,11 +1277,11 @@ int ExtensionContainer::arrangeHideButtons()
             _layout->remove(_rbHB);
             if (kapp->reverseLayout())
             {
-                _layout->addWidget(_rbHB, 1, 0, (TQ_Alignment)(leftAlignment | vertAlignment));
+                _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
             }
             else
             {
-                _layout->addWidget(_rbHB, 1, 2, (TQ_Alignment)vertAlignment);
+                _layout->addWidget(_rbHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
             }
         }
     }
@@ -1315,7 +1315,7 @@ int ExtensionContainer::setupBorderSpace()
     TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen());
     TQRect h = geometry();
 
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         if (h.top() > 0)
         {
@@ -1417,26 +1417,26 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
         // KPanelExtension::Left/Right don't seem to draw the separators at all!
         if (position() == KPanelExtension::Left) {
             rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height());
-            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
+            style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
         }
         else if (position() == KPanelExtension::Right) {
             rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height());
-            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
+            style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
         }
         else if (position() == KPanelExtension::Top) {
             // Nastiness to both vertically flip the PE_Separator
             // and make sure it pops out of, not sinks into, the screen
             TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH);
-            TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm));
+            TQPainter myp(&inv_pm);
             rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
             TQColorGroup darkcg = colorGroup();
             darkcg.setColor(TQColorGroup::Light, colorGroup().dark());
-            style().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default );
+            style().drawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default );
             p.drawPixmap(0,height()-2,inv_pm);
         }
         else {
             rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
-            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default );
+            style().drawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default );
         }
     }
 }
@@ -1486,7 +1486,7 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS)
     {
         autoHide(false);
         TQTimer::singleShot(showForAtLeastHowManyMS,
-                           this, TQT_SLOT(maybeStartAutoHideTimer()));
+                           this, TQ_SLOT(maybeStartAutoHideTimer()));
         return;
     }
 
@@ -1582,11 +1582,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const
 {
     if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom)
     {
-        return Qt::Horizontal;
+        return TQt::Horizontal;
     }
     else
     {
-        return Qt::Vertical;
+        return TQt::Vertical;
     }
 }
 
@@ -1627,18 +1627,18 @@ 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;
         }
 
-        if (orientation() == Qt::Horizontal)
+        if (orientation() == TQt::Horizontal)
         {
-            _ltHB->setArrowType(Qt::LeftArrow);
+            _ltHB->setArrowType(TQt::LeftArrow);
             _ltHB->setFixedSize(m_settings.hideButtonSize(), height());
         }
         else
         {
-            _ltHB->setArrowType(Qt::UpArrow);
+            _ltHB->setArrowType(TQt::UpArrow);
             _ltHB->setFixedSize(width(), m_settings.hideButtonSize());
         }
 
@@ -1658,18 +1658,18 @@ 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;
         }
 
-        if ( orientation() == Qt::Horizontal)
+        if ( orientation() == TQt::Horizontal)
         {
-            _rbHB->setArrowType(Qt::RightArrow);
+            _rbHB->setArrowType(TQt::RightArrow);
             _rbHB->setFixedSize(m_settings.hideButtonSize(), height());
         }
         else
         {
-            _rbHB->setArrowType(Qt::DownArrow);
+            _rbHB->setArrowType(TQt::DownArrow);
             _rbHB->setFixedSize(width(), m_settings.hideButtonSize());
         }
 
@@ -1709,7 +1709,7 @@ void ExtensionContainer::resetLayout()
     updateGeometry();
     int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace();
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (m_extension)
         {
@@ -2145,8 +2145,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
     {
         case TQEvent::MouseButtonPress:
         {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
-            if ( me->button() == Qt::LeftButton )
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+            if ( me->button() == TQt::LeftButton )
             {
                 if (inResizeArea(me->pos()))
                 {
@@ -2170,7 +2170,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
                     _is_lmb_down = true;
                 }
             }
-            else if (me->button() == Qt::RightButton)
+            else if (me->button() == TQt::RightButton)
             {
                 showPanelMenu(me->globalPos());
                 return true; // don't crash!
@@ -2180,8 +2180,8 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
 
         case TQEvent::MouseButtonRelease:
         {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
-            if ( me->button() == Qt::LeftButton )
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+            if ( me->button() == TQt::LeftButton )
             {
                 _is_lmb_down = false;
             }
@@ -2190,7 +2190,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
 
         case TQEvent::MouseMove:
         {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
             if (KickerSettings::useResizeHandle())
             {
                 KPanelExtension::Position pos = position();
@@ -2202,7 +2202,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
                     }
                     else
                     {
-                        setCursor(tqarrowCursor);
+                        setCursor(TQt::arrowCursor);
                     }
                 }
                 else if (pos == KPanelExtension::Right)
@@ -2213,35 +2213,35 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
                     }
                     else
                     {
-                        setCursor(tqarrowCursor);
+                        setCursor(TQt::arrowCursor);
                     }
                 }
                 else if (pos == KPanelExtension::Top)
                 {
                     if (inResizeArea(me->pos()))
                     {
-                        setCursor(tqsizeVerCursor);
+                        setCursor(TQt::sizeVerCursor);
                     }
                     else
                     {
-                        setCursor(tqarrowCursor);
+                        setCursor(TQt::arrowCursor);
                     }
                 }
                 else
                 {
                     if (inResizeArea(me->pos()))
                     {
-                        setCursor(tqsizeVerCursor);
+                        setCursor(TQt::sizeVerCursor);
                     }
                     else
                     {
-                        setCursor(tqarrowCursor);
+                        setCursor(TQt::arrowCursor);
                     }
                 }
             }
 
             if (_is_lmb_down &&
-                ((me->state() & Qt::LeftButton) == Qt::LeftButton) &&
+                ((me->state() & TQt::LeftButton) == TQt::LeftButton) &&
                 !Kicker::the()->isImmutable() &&
                 !m_settings.config()->isImmutable() &&
                 !ExtensionManager::the()->isMenuBar(this))
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index 8948341d1..b1db1efeb 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -51,7 +51,7 @@ class TQColor;
 
 class ExtensionContainer : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum UserHidden { Unhidden, LeftTop, RightBottom };
@@ -203,7 +203,7 @@ private:
 
 class PopupWidgetFilter : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     PopupWidgetFilter( TQObject *parent );
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 5b1eb5c8c..234aba375 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -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(kapp, 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()
@@ -153,7 +153,7 @@ void ContainerArea::defaultContainerConfig()
     containers.append(new KMenuButtonContainer(m_opMenu, m_contents));
 
     int dsize;
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         dsize = width();
     }
@@ -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)
@@ -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.
@@ -850,7 +850,7 @@ void ContainerArea::resizeContents()
     int w = width();
     int h = height();
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         int newWidth = m_layout->widthForHeight(h);
         if (newWidth > w)
@@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a)
     KickerTip::enableTipping(false);
     emit maintainFocus(true);
     setMouseTracking(true);
-    grabMouse(tqsizeAllCursor);
+    grabMouse(TQt::sizeAllCursor);
 
     m_layout->setStretchEnabled(false);
     a->raise();
@@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *)
     // so we need to complete the move here
     _autoScrollTimer.stop();
     releaseMouse();
-    setCursor(tqarrowCursor);
+    setCursor(TQt::arrowCursor);
     setMouseTracking(false);
 
     _moveAC->completeMoveOperation();
@@ -962,12 +962,12 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         return;
     }
 
-    if (ev->state() == Qt::LeftButton && !TQT_TQRECT_OBJECT(rect()).contains(ev->pos()))
+    if (ev->state() == TQt::LeftButton && !rect().contains(ev->pos()))
     {
         // leaveEvent() doesn't work, while grabbing the mouse
         _autoScrollTimer.stop();
         releaseMouse();
-        setCursor(tqarrowCursor);
+        setCursor(TQt::arrowCursor);
         setMouseTracking(false);
 
         _moveAC->completeMoveOperation();
@@ -986,7 +986,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         return;
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         int oldX = _moveAC->x() + _moveAC->moveOffset().x();
         int x = ev->pos().x() + contentsX();
@@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
         preferedHeight = draggedContainer->heightForWidth(width());
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         _dragIndicator->setPreferredSize(TQSize(preferedWidth, height()));
     }
@@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
             --it;
             BaseContainer* a = *it;
 
-            if ((orientation() == Qt::Horizontal &&
+            if ((orientation() == TQt::Horizontal &&
                  a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) ||
-                (orientation() == Qt::Vertical &&
+                (orientation() == TQt::Vertical &&
                  a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y()))
             {
                 _dragMoveAC = a;
@@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
         } while (it != m_containers.begin());
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x());
     }
@@ -1143,7 +1143,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
         startContainerMove(_moveAC);
 
         // Align the container to the mouse position.
-        if (orientation() == Qt::Horizontal)
+        if (orientation() == TQt::Horizontal)
         {
             m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x());
         }
@@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
         return;
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x());
     }
@@ -1201,7 +1201,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
         }
 
         TQObject *parent = ev->source() ? ev->source()->parent() : 0;
-        while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this)))
+        while (parent && (parent != this))
         {
             parent = parent->parent();
         }
@@ -1209,13 +1209,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
         if (parent)
         {
             // Move container a
-            if (orientation() == Qt::Horizontal)
+            if (orientation() == TQt::Horizontal)
             {
                 int oldX = a->x();
                 int x = _dragIndicator->x();
                 m_layout->moveContainerSwitch(a, x - oldX);
             }
-            else if (orientation() == Qt::Vertical)
+            else if (orientation() == TQt::Vertical)
             {
                 int oldY = a->y();
                 int y = _dragIndicator->y();
@@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e)
     // which contain a ContainerArea can react to layout changes of its
     // contents. For example: If an applets grows, the top level widget may
     // want to grow as well.
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents))
+    if (o == m_contents)
     {
         if (e->type() == TQEvent::LayoutHint)
         {
@@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev)
 void ContainerArea::viewportResizeEvent(TQResizeEvent* ev)
 {
     Panner::viewportResizeEvent(ev);
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         m_contents->resize(kMax(widthForHeight(ev->size().height()),
                                 ev->size().width()),
@@ -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
         {
@@ -1487,7 +1487,7 @@ void ContainerArea::setBackground()
         {
             TQImage bgImage = srcImage;
 
-            if (orientation() == Qt::Vertical)
+            if (orientation() == TQt::Vertical)
             {
                 if (KickerSettings::rotateBackground())
                 {
@@ -1516,7 +1516,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 +1538,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)
@@ -1565,7 +1565,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
         }
     }
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (a)
         {
@@ -1599,7 +1599,7 @@ void ContainerArea::moveDragIndicator(int pos)
 
     // Move _dragIndicator to position pos, restricted by availableSpace.
     // Resize _dragIndicator if necessary.
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (availableSpace.size().width() <
             _dragIndicator->preferredSize().width())
@@ -1663,7 +1663,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()));
     }
 }
 
@@ -1680,9 +1680,9 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
     }
 
     _pos = p;
-    Qt::Orientation o = (p == KPanelExtension::Top ||
+    TQt::Orientation o = (p == KPanelExtension::Top ||
                          p == KPanelExtension::Bottom) ?
-                        Qt::Horizontal : Qt::Vertical;
+                        TQt::Horizontal : TQt::Vertical;
     bool orientationChanged = (orientation() != o);
     m_layout->setEnabled(false);
 
@@ -1696,7 +1696,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
         // when that gets called AFTER we've been moved
         // it's not always safe to do the resize here, as scroll buttons
         // from the panner may get in our way. =/
-        if (o == Qt::Horizontal)
+        if (o == TQt::Horizontal)
         {
             resizeContents(0, height());
         }
@@ -1742,7 +1742,7 @@ void ContainerArea::autoScroll()
 {
     if(!_moveAC) return;
 
-    if(orientation() == Qt::Horizontal) {
+    if(orientation() == TQt::Horizontal) {
         if(_moveAC->pos().x() <= 80)
             scrollBy(-10, 0);
         else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80)
@@ -1793,7 +1793,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 +1910,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
     {
@@ -1958,7 +1958,7 @@ void DragIndicator::paintEvent(TQPaintEvent*)
 {
     TQPainter painter(this);
     TQRect rect(0, 0, width(), height());
-    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
+    style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
                            TQStyle::Style_Default, colorGroup().base() );
 }
 
diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h
index f52003982..2b543e6ac 100644
--- a/kicker/kicker/core/containerarea.h
+++ b/kicker/kicker/core/containerarea.h
@@ -45,7 +45,7 @@ class AddAppletDialog;
 
 class ContainerArea : public Panner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ContainerArea( TDEConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 );
@@ -174,7 +174,7 @@ private:
 
 class DragIndicator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DragIndicator(TQWidget* parent = 0, const char* name = 0);
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index c12778fbb..81080fe82 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -122,7 +122,7 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio)
         m_freeSpaceRatio = ratio;
 }
 
-Qt::Orientation ContainerAreaLayoutItem::orientation() const
+TQt::Orientation ContainerAreaLayoutItem::orientation() const
 {
     return m_layout->orientation();
 }
@@ -139,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r)
 
 int ContainerAreaLayoutItem::widthForHeightR(int h) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return widthForHeight(h);
     }
@@ -151,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const
 
 int ContainerAreaLayoutItem::widthR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return geometry().width();
     }
@@ -163,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const
 
 int ContainerAreaLayoutItem::heightR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return geometry().height();
     }
@@ -175,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const
 
 int ContainerAreaLayoutItem::leftR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (TQApplication::reverseLayout())
             return m_layout->geometry().right() - geometry().right();
@@ -190,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const
 
 int ContainerAreaLayoutItem::rightR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (TQApplication::reverseLayout())
             return m_layout->geometry().right() - geometry().left();
@@ -206,46 +206,14 @@ int ContainerAreaLayoutItem::rightR() const
 
 ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent)
     : TQLayout(parent),
-      m_orientation(Qt::Horizontal),
+      m_orientation(TQt::Horizontal),
       m_stretchEnabled(true)
 {
 }
 
-#ifdef USE_QT4
-/*!
-    \reimp
-*/
-int ContainerAreaLayout::count() const {
-	return m_items.count();
-}
-
-/*!
-    \reimp
-*/
-TQLayoutItem* ContainerAreaLayout::itemAt(int index) const {
-	return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0;
-}
-
-/*!
-    \reimp
-*/
-TQLayoutItem* ContainerAreaLayout::takeAt(int index) {
-	if (index < 0 || index >= m_items.count())
-		return 0;
-	ContainerAreaLayoutItem *b = *m_items.at(index);
-	m_items.remove(m_items.at(index));
-	TQLayoutItem *item = b->item;
-	b->item = 0;
-	delete b;
-
-	invalidate();
-	return item;
-}
-#endif // USE_QT4
-
 void ContainerAreaLayout::addItem(TQLayoutItem* item)
 {
-    m_items.append(new ContainerAreaLayoutItem(static_cast<TQLayoutItem*>(item), this));
+    m_items.append(new ContainerAreaLayoutItem(item, this));
 }
 
 void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint)
@@ -283,7 +251,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio
         return;
     }
 
-    int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y();
+    int insPos = (orientation() == TQt::Horizontal) ? insertionPoint.x(): insertionPoint.y();
     Item* current = *currentIt;
     Item* next = *nextIt;
 
@@ -419,7 +387,7 @@ TQSize ContainerAreaLayout::sizeHint() const
 {
     const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall);
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return TQSize(widthForHeight(size), size);
     }
@@ -433,7 +401,7 @@ TQSize ContainerAreaLayout::minimumSize() const
 {
     const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny);
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return TQSize(widthForHeight(size), size);
     }
@@ -445,13 +413,7 @@ TQSize ContainerAreaLayout::minimumSize() const
 
 TQLayoutIterator ContainerAreaLayout::iterator()
 {
-    // [FIXME]
-#ifdef USE_QT4
-    #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4
-    return TQLayoutIterator(this);	    	// [FIXME]
-#else // USE_QT4
     return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items));
-#endif // USE_QT4
 }
 
 void ContainerAreaLayout::setGeometry(const TQRect& rect)
@@ -559,7 +521,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con
 
 void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
 {
-    const bool horizontal    = orientation() == Qt::Horizontal;
+    const bool horizontal    = orientation() == TQt::Horizontal;
     const bool reverseLayout = TQApplication::reverseLayout();
 
     if (horizontal && reverseLayout)
@@ -696,7 +658,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
 
 int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance)
 {
-    const bool horizontal    = orientation() == Qt::Horizontal;
+    const bool horizontal    = orientation() == TQt::Horizontal;
     const bool reverseLayout = TQApplication::reverseLayout();
 
     // Get the iterator 'it' pointing to the layoutitem representing 'a'.
@@ -767,7 +729,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it,
 
 TQRect ContainerAreaLayout::transform(const TQRect& r) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (TQApplication::reverseLayout())
         {
@@ -788,7 +750,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const
 
 int ContainerAreaLayout::widthForHeightR(int h) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return widthForHeight(h);
     }
@@ -800,7 +762,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const
 
 int ContainerAreaLayout::widthR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return geometry().width();
     }
@@ -812,7 +774,7 @@ int ContainerAreaLayout::widthR() const
 
 int ContainerAreaLayout::heightR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return geometry().height();
     }
@@ -824,7 +786,7 @@ int ContainerAreaLayout::heightR() const
 
 int ContainerAreaLayout::leftR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
         return geometry().left();
     else
         return geometry().top();
@@ -832,7 +794,7 @@ int ContainerAreaLayout::leftR() const
 
 int ContainerAreaLayout::rightR() const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
         return geometry().right();
     else
         return geometry().bottom();
diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h
index 4edeb8be2..abb28c6f0 100644
--- a/kicker/kicker/core/containerarealayout.h
+++ b/kicker/kicker/core/containerarealayout.h
@@ -108,12 +108,6 @@ class ContainerAreaLayout : public TQLayout
         int leftR() const;
         int rightR() const;
 
-#ifdef USE_QT4
-
-        QLAYOUT_REQUIRED_METHOD_DECLARATIONS
-
-#endif // USE_QT4
-
     private:
         int moveContainerPushRecursive(ItemList::const_iterator it, int distance);
         int distanceToPreviousItem(ItemList::const_iterator it) const;
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 796b98125..cb20c7a58 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -179,7 +179,7 @@ void ExtensionManager::initialize()
     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(kapp, 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()),
diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h
index b4a53ec31..1e36bca56 100644
--- a/kicker/kicker/core/extensionmanager.h
+++ b/kicker/kicker/core/extensionmanager.h
@@ -33,7 +33,7 @@ const int XineramaAllScreens = -2;
 
 class ExtensionManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static ExtensionManager* the();
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 94517607e..19c348851 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -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
     {
@@ -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())
diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h
index 6a3e02d36..1868c0bbe 100644
--- a/kicker/kicker/core/kicker.h
+++ b/kicker/kicker/core/kicker.h
@@ -38,7 +38,7 @@ class PanelPopupButton;
 
 class Kicker : public KUniqueApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp
index 46cfa432d..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 )
@@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifdef LAUNCH_MENU
 	keys->insert("Program:kicker", i18n("Panel"));
-	DEF(I18N_NOOP("Popup Launch Menu" ), ALT+Qt::Key_F1, WIN+Qt::Key_Menu,
+	DEF(I18N_NOOP("Popup Launch Menu" ), ALT+TQt::Key_F1, WIN+TQt::Key_Menu,
                       MenuManager::the(), kmenuAccelActivated());
 #endif
 
 #ifdef SHOW_DESKTOP
-	DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+Qt::Key_D, WIN+CTRL+Qt::Key_D,
+	DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+TQt::Key_D, WIN+CTRL+TQt::Key_D,
             this, slotToggleShowDesktop());
 #endif
 
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index a7326844e..94ee0acfb 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -71,8 +71,8 @@ MenuManager::MenuManager(TQObject *parent)
 	m_kmenu = new KMenuStub(new KMenu);
 
     kapp->dcopClient()->setNotifications(true);
-    connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-            this, TQT_SLOT(applicationRemoved(const TQCString&)));
+    connect(kapp->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
     {
diff --git a/kicker/kicker/core/menumanager.h b/kicker/kicker/core/menumanager.h
index 1139b0b61..03e107767 100644
--- a/kicker/kicker/core/menumanager.h
+++ b/kicker/kicker/core/menumanager.h
@@ -40,7 +40,7 @@ typedef TQValueList<PanelPopupButton*> KButtonList;
  */
 class MenuManager : public TQObject, DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static MenuManager* the();
 
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 93bd2356b..e55f65697 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() == Qt::RightButton && kapp->authorize("action/kicker_rmb"))
+        if ( me->button() == TQt::RightButton && kapp->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,20 +370,20 @@ 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"))
diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h
index c7882291f..02460b00b 100644
--- a/kicker/kicker/core/panelextension.h
+++ b/kicker/kicker/core/panelextension.h
@@ -40,7 +40,7 @@ class TQGridLayout;
 
 class PanelExtension : public KPanelExtension, virtual public  DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
@@ -109,7 +109,7 @@ private:
 
 class MenubarExtension : public PanelExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         MenubarExtension(const AppletInfo& info);
diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp
index a8b79877a..78db46495 100644
--- a/kicker/kicker/core/pluginmanager.cpp
+++ b/kicker/kicker/core/pluginmanager.cpp
@@ -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, kapp );
 }
 
 void LibUnloader::unload()
diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h
index f67c13490..d78d1b07a 100644
--- a/kicker/kicker/core/pluginmanager.h
+++ b/kicker/kicker/core/pluginmanager.h
@@ -40,7 +40,7 @@ class TQPopupMenu;
 
 class KDE_EXPORT PluginManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static PluginManager* the();
@@ -90,7 +90,7 @@ private:
 
 class LibUnloader : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static void unload( const TQString &libName );
 
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/showdesktop.h b/kicker/kicker/core/showdesktop.h
index 88cc7d7c7..ec7119438 100644
--- a/kicker/kicker/core/showdesktop.h
+++ b/kicker/kicker/core/showdesktop.h
@@ -33,7 +33,7 @@ class KWinModule;
  */
 class ShowDesktop : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static ShowDesktop* the();
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/unhidetrigger.h b/kicker/kicker/core/unhidetrigger.h
index af05a43f5..472009014 100644
--- a/kicker/kicker/core/unhidetrigger.h
+++ b/kicker/kicker/core/unhidetrigger.h
@@ -32,9 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqobject.h>
 
-class UnhideTrigger : public QObject
+class UnhideTrigger : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum Trigger { None = 0, Top, TopRight, Right, BottomRight, Bottom, BottomLeft, Left, TopLeft };
 	static UnhideTrigger* the();
diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp
index d48c43aad..04a2a4afd 100644
--- a/kicker/kicker/core/userrectsel.cpp
+++ b/kicker/kicker/core/userrectsel.cpp
@@ -46,7 +46,7 @@ UserRectSel::~UserRectSel()
 
 void UserRectSel::mouseReleaseEvent(TQMouseEvent * e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         tqApp->exit_loop();
     }
@@ -89,7 +89,7 @@ void UserRectSel::paintCurrent()
         for (i = 0; i < 4; i++)
         {
             _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM));
-            _frame[i]->setPaletteBackgroundColor(Qt::black);
+            _frame[i]->setPaletteBackgroundColor(TQt::black);
         }
         for (i = 4; i < 8; i++)
         {
diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h
index 564a6d980..dbc4d62be 100644
--- a/kicker/kicker/core/userrectsel.h
+++ b/kicker/kicker/core/userrectsel.h
@@ -34,7 +34,7 @@ class ShutUpCompiler;
 
 class UserRectSel : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
     public:
         class PanelStrut
diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp
index 107a2527a..654114d90 100644
--- a/kicker/kicker/core/usersizesel.cpp
+++ b/kicker/kicker/core/usersizesel.cpp
@@ -46,7 +46,7 @@ UserSizeSel::UserSizeSel(const TQRect& rect, const KPanelExtension::Position pos
     }
     if ((pos == KPanelExtension::Top) || (pos == KPanelExtension::Bottom))
     {
-        setCursor(tqsizeVerCursor);
+        setCursor(TQt::sizeVerCursor);
     }
 
     setGeometry(-10, -10, 2, 2);
@@ -69,7 +69,7 @@ UserSizeSel::~UserSizeSel()
 
 void UserSizeSel::mouseReleaseEvent(TQMouseEvent * e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         tqApp->exit_loop();
     }
@@ -156,7 +156,7 @@ void UserSizeSel::paintCurrent()
         for (i = 0; i < 4; i++)
         {
             _frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM));
-            _frame[i]->setPaletteBackgroundColor(Qt::black);
+            _frame[i]->setPaletteBackgroundColor(TQt::black);
         }
         for (i = 4; i < 8; i++)
         {
diff --git a/kicker/kicker/core/usersizesel.h b/kicker/kicker/core/usersizesel.h
index 64c8950bd..658baecf2 100644
--- a/kicker/kicker/core/usersizesel.h
+++ b/kicker/kicker/core/usersizesel.h
@@ -34,7 +34,7 @@ class ShutUpCompiler;
 
 class UserSizeSel : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
     public:
         static TQRect select(const TQRect& rect, const KPanelExtension::Position pos, const TQColor& color);
diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h
index e605e27c5..fc733f207 100644
--- a/kicker/kicker/interfaces/kickoff-search-plugin.h
+++ b/kicker/kicker/interfaces/kickoff-search-plugin.h
@@ -91,7 +91,7 @@ namespace KickoffSearch {
 
     class KDE_EXPORT Plugin : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         Plugin(TQObject *parent, const char* name=0);
diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h
index 485e9757c..b8a866c7b 100644
--- a/kicker/kicker/interfaces/kickoffsearchinterface.h
+++ b/kicker/kicker/interfaces/kickoffsearchinterface.h
@@ -30,7 +30,7 @@ namespace KickoffSearch
 {
     class KDE_EXPORT KickoffSearchInterface :public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         KickoffSearchInterface( TQObject* parent, const char* name = 0);
diff --git a/kicker/kicker/ui/CMakeLists.txt b/kicker/kicker/ui/CMakeLists.txt
index 754288ce9..c773cfe7b 100644
--- a/kicker/kicker/ui/CMakeLists.txt
+++ b/kicker/kicker/ui/CMakeLists.txt
@@ -20,7 +20,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kicker/kicker/buttons
   ${CMAKE_SOURCE_DIR}/tdmlib
   ${CMAKE_SOURCE_DIR}/libkonq
-  ${DBUS_TQT_INCLUDE_DIRS}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -56,5 +55,5 @@ set( ${target}_SRCS
 tde_add_library( ${target} STATIC_PIC AUTOMOC
   SOURCES ${${target}_SRCS}
   DEPENDENCIES kicker_core-static
-  LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES}
+  LINK dmctl-static kickoffsearch_interfaces-shared ${TDEHW_LIBRARIES}
 )
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 0db6bc352..fb5e3f16d 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
       m_odd(odd),
       m_selected(false)
 {
-    setFocusPolicy(TQ_StrongFocus);
+    setFocusPolicy(TQWidget::StrongFocus);
     setSelected(m_selected);
     
     itemTitle->setText("<h3>" + info.name() + "</h3>");
@@ -84,8 +84,8 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
 {
     if (e->type() == TQEvent::MouseButtonPress)
     {
-        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
-        if (me->button() & Qt::LeftButton)
+        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+        if (me->button() & TQt::LeftButton)
         {
             m_dragStart = me->pos();
         }
@@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
 
     if (e->type() == TQEvent::MouseMove)
     {
-        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
         if ((me->pos() - m_dragStart).manhattanLength() >
             TDEGlobalSettings::dndEventDelay())
         {
@@ -123,21 +123,21 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
 
 void AppletWidget::keyPressEvent(TQKeyEvent *e)
 {
-    if (e->key() == Qt::Key_Enter ||
-        e->key() == Qt::Key_Return)
+    if (e->key() == TQt::Key_Enter ||
+        e->key() == TQt::Key_Return)
     {
         emit doubleClicked(this);
     }
-    else if (e->key() == Qt::Key_Up)
+    else if (e->key() == TQt::Key_Up)
     {
         TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0);
         TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0);
         TQApplication::sendEvent(this, &fakedKeyPress);
         TQApplication::sendEvent(this, &fakedKeyRelease);
     }
-    else if (e->key() == Qt::Key_Down)
+    else if (e->key() == TQt::Key_Down)
     {
-        TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0);
+        TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_Tab, 0, 0);
         TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0);
         TQApplication::sendEvent(this, &fakedKeyPress);
         TQApplication::sendEvent(this, &fakedKeyRelease);
@@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e)
 
 void AppletWidget::mousePressEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         emit clicked(this);
         m_dragStart = e->pos();
@@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e)
 
 void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton &&
+    if (e->button() == TQt::LeftButton &&
         !m_dragStart.isNull() &&
         (e->pos() - m_dragStart).manhattanLength() >
          TDEGlobalSettings::dndEventDelay())
@@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e)
 
 void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-    if (!e->button() == Qt::LeftButton)
+    if (!e->button() == TQt::LeftButton)
     {
         AppletItem::mouseDoubleClickEvent(e);
         return;
@@ -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.h b/kicker/kicker/ui/addapplet.h
index bc2763f0b..c62b2b2ec 100644
--- a/kicker/kicker/ui/addapplet.h
+++ b/kicker/kicker/ui/addapplet.h
@@ -41,7 +41,7 @@ class TQTimer;
 
 class AddAppletDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         AddAppletDialog(ContainerArea* cArea, TQWidget* parent, const char* name);
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/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h
index 79c539687..dfe15bbeb 100644
--- a/kicker/kicker/ui/addapplet_mnu.h
+++ b/kicker/kicker/ui/addapplet_mnu.h
@@ -33,7 +33,7 @@ class ContainerArea;
 
 class PanelAddAppletMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelAddAppletMenu(ContainerArea *cArea, TQWidget *parent=0, const char *name=0);
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index 62ff12675..dd6f04135 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -54,9 +54,9 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget,
       m_moveTimer(0, "m_moveTimer"),
       m_dirty(false)
 {
-    setFocusPolicy(TQ_NoFocus);
+    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());
 
@@ -109,10 +109,10 @@ void AddAppletVisualFeedback::makeMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::black);
+    m_mask.fill(TQt::black);
 
-    maskPainter.setBrush(Qt::white);
-    maskPainter.setPen(Qt::white);
+    maskPainter.setBrush(TQt::white);
+    maskPainter.setPen(TQt::white);
     maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(),
                               1600 / m_mask.rect().height());
     setMask(m_mask);
@@ -156,7 +156,7 @@ void AddAppletVisualFeedback::displayInternal()
 
     // draw background
     TQPainter bufferPainter(&m_pixmap);
-    bufferPainter.setPen(Qt::black);
+    bufferPainter.setPen(TQt::black);
     bufferPainter.setBrush(colorGroup().background());
     bufferPainter.drawRoundRect(0, 0, width, height,
                                 1600 / width, 1600 / height);
@@ -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/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h
index dc660bff1..d2e3da5e6 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.h
+++ b/kicker/kicker/ui/addappletvisualfeedback.h
@@ -40,7 +40,7 @@ class TQTimer;
 
 class AddAppletVisualFeedback : TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         AddAppletVisualFeedback(AppletWidget* parent,
diff --git a/kicker/kicker/ui/addbutton_mnu.h b/kicker/kicker/ui/addbutton_mnu.h
index 209e7e9a3..1a19b9480 100644
--- a/kicker/kicker/ui/addbutton_mnu.h
+++ b/kicker/kicker/ui/addbutton_mnu.h
@@ -30,7 +30,7 @@ class ContainerArea;
 
 class PanelAddButtonMenu : public PanelServiceMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelAddButtonMenu(ContainerArea* cArea, const TQString & label, const TQString & relPath,
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/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h
index 76163250f..f3be54c1f 100644
--- a/kicker/kicker/ui/addextension_mnu.h
+++ b/kicker/kicker/ui/addextension_mnu.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PanelAddExtensionMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelAddExtensionMenu(TQWidget *parent=0, const char *name=0);
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index a037909b6..740260d7f 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -169,10 +169,10 @@ 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"))
@@ -213,7 +213,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
 
 void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e)
 {
-    if (e->key() == Qt::Key_Escape)
+    if (e->key() == TQt::Key_Escape)
     {
         emit escapePressed();
     }
diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h
index 35e10be3c..ae058cea1 100644
--- a/kicker/kicker/ui/appletop_mnu.h
+++ b/kicker/kicker/ui/appletop_mnu.h
@@ -31,7 +31,7 @@ class AppletInfo;
 // The button operations menu (usually right click)
 class PanelAppletOpMenu : public TQPopupMenu
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905 };
diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui
index 5d92dab89..e61575a72 100644
--- a/kicker/kicker/ui/appletview.ui
+++ b/kicker/kicker/ui/appletview.ui
@@ -198,8 +198,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tqscrollview.h</include>
 </includes>
-<includehints>
-    <includehint>tqscrollview.h</includehint>
-</includehints>
 </UI>
diff --git a/kicker/kicker/ui/appletwidget.h b/kicker/kicker/ui/appletwidget.h
index d0bb9e885..e0a0b485c 100644
--- a/kicker/kicker/ui/appletwidget.h
+++ b/kicker/kicker/ui/appletwidget.h
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class AppletWidget: public AppletItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         typedef TQValueList<AppletWidget*> List;
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_dlg.h b/kicker/kicker/ui/browser_dlg.h
index d1b3b623d..8aad531a2 100644
--- a/kicker/kicker/ui/browser_dlg.h
+++ b/kicker/kicker/ui/browser_dlg.h
@@ -31,7 +31,7 @@ class KLineEdit;
 
 class PanelBrowserDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelBrowserDialog( const TQString &path = TQString::null, const TQString &icon = TQString::null, TQWidget *parent = 0, const char *name = 0 );
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 9b629e165..63ea58f1b 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -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;
 }
@@ -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()));
+       insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager()));
 	if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal())
-	    insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal()));
+	    insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal()));
     	insertSeparator();
     }
 
@@ -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);
     }
 }
@@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
 {
     TQPopupMenu::mouseMoveEvent(e);
 
-    if (!(e->state() & Qt::LeftButton)) return;
+    if (!(e->state() & TQt::LeftButton)) return;
     if(_lastpress == TQPoint(-1, -1)) return;
 
     // DND delay
@@ -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();
 }
@@ -422,7 +422,7 @@ void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev )
 
 void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev)
 {
-    TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton);
+    TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), TQt::NoButton, TQt::LeftButton);
     TQPopupMenu::mouseMoveEvent(&mev);
 }
 
@@ -544,5 +544,3 @@ void PanelBrowserMenu::initIconMap()
     _icons->insert("exec", SmallIcon("application-x-executable"));
     _icons->insert("chardevice", SmallIcon("chardevice"));
 }
-
-// vim: sw=4 et
diff --git a/kicker/kicker/ui/browser_mnu.h b/kicker/kicker/ui/browser_mnu.h
index 38f9b9690..1359e855e 100644
--- a/kicker/kicker/ui/browser_mnu.h
+++ b/kicker/kicker/ui/browser_mnu.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PanelBrowserMenu : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0);
diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h
index 85efcada8..22dc8f904 100644
--- a/kicker/kicker/ui/clicklineedit.h
+++ b/kicker/kicker/ui/clicklineedit.h
@@ -35,7 +35,7 @@ namespace KPIM {
 */
 class KDE_EXPORT ClickLineEdit : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     ClickLineEdit( TQWidget *parent, const TQString &msg = TQString::null, const char* name = 0 );
     ~ClickLineEdit();
diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp
index 0ad2107d1..8a69f0749 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 );
 }
 
diff --git a/kicker/kicker/ui/client_mnu.h b/kicker/kicker/ui/client_mnu.h
index 272f6364f..c1884469d 100644
--- a/kicker/kicker/ui/client_mnu.h
+++ b/kicker/kicker/ui/client_mnu.h
@@ -40,7 +40,7 @@ class PanelKMenu;
  */
 class KickerClientMenu : public TQPopupMenu, DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KickerClientMenu( TQWidget *parent=0, const char *name=0);
     ~KickerClientMenu();
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 07caa2b55..6861ba988 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -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/exe_dlg.h b/kicker/kicker/ui/exe_dlg.h
index ef96fe9d0..669e98a61 100644
--- a/kicker/kicker/ui/exe_dlg.h
+++ b/kicker/kicker/ui/exe_dlg.h
@@ -29,7 +29,7 @@ class NonKDEButtonSettings;
 
 class PanelExeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PanelExeDialog(const TQString& title, const TQString& description,
                    const TQString &path, const TQString &pixmap=TQString::null,
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 d2de2ab5e..6ba2615b3 100644
--- a/kicker/kicker/ui/flipscrollview.h
+++ b/kicker/kicker/ui/flipscrollview.h
@@ -51,7 +51,7 @@ class ItemView;
 
 class BackFrame : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BackFrame( TQWidget *parent );
@@ -71,7 +71,7 @@ private:
 
 class FlipScrollView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum State{ StoppedLeft, StoppedRight, ScrollingLeft, ScrollingRight };
     FlipScrollView( TQWidget * parent = 0, const char * name = 0 );
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 04666659d..3107fe17a 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -34,12 +34,12 @@
 HideButton::HideButton(TQWidget *parent, const char *name)
     : TQButton(parent, name),
       m_highlight(false),
-      m_arrow(Qt::LeftArrow)
+      m_arrow(TQt::LeftArrow)
 {
     setBackgroundOrigin(AncestorOrigin);
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
-    connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)));
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)));
 
     kapp->addKipcEventMask(KIPC::SettingsChanged);
     kapp->addKipcEventMask(KIPC::IconChanged);
@@ -49,22 +49,22 @@ HideButton::HideButton(TQWidget *parent, const char *name)
 
 void HideButton::drawButton(TQPainter *p)
 {
-    if (m_arrow == Qt::LeftArrow)
+    if (m_arrow == TQt::LeftArrow)
     {
         p->setPen(colorGroup().mid());
         p->drawLine(width()-1, 0, width()-1, height());
     }
-    else if (m_arrow == Qt::RightArrow)
+    else if (m_arrow == TQt::RightArrow)
     {
         p->setPen(colorGroup().mid());
         p->drawLine(0, 0, 0, height());
     }
-    else if (m_arrow == Qt::UpArrow)
+    else if (m_arrow == TQt::UpArrow)
     {
         p->setPen(colorGroup().mid());
         p->drawLine(0, height()-1, width(), height()-1);
     }
-    else if (m_arrow == Qt::DownArrow)
+    else if (m_arrow == TQt::DownArrow)
     {
         p->setPen(colorGroup().mid());
         p->drawLine(0, 0, width(), 0);
@@ -106,24 +106,24 @@ void HideButton::setPixmap(const TQPixmap &pix)
     generateIcons();
 }
 
-void HideButton::setArrowType(Qt::ArrowType arrow)
+void HideButton::setArrowType(TQt::ArrowType arrow)
 {
     m_arrow = arrow;
     switch (arrow)
     {
-        case Qt::LeftArrow:
+        case TQt::LeftArrow:
             setPixmap(SmallIcon("1leftarrow"));
         break;
 
-        case Qt::RightArrow:
+        case TQt::RightArrow:
             setPixmap(SmallIcon("1rightarrow"));
         break;
 
-        case Qt::UpArrow:
+        case TQt::UpArrow:
             setPixmap(SmallIcon("1uparrow"));
         break;
 
-        case Qt::DownArrow:
+        case TQt::DownArrow:
         default:
             setPixmap(SmallIcon("1downarrow"));
         break;
@@ -138,7 +138,7 @@ void HideButton::generateIcons()
     }
 
     TQImage image = pixmap()->convertToImage();
-    image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin);
+    image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin);
 
     TDEIconEffect effect;
 
@@ -198,5 +198,3 @@ void HideButton::resizeEvent(TQResizeEvent *)
 }
 
 #include "hidebutton.moc"
-
-// vim:ts=4:sw=4:et
diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h
index bb68929a1..c8c754857 100644
--- a/kicker/kicker/ui/hidebutton.h
+++ b/kicker/kicker/ui/hidebutton.h
@@ -25,11 +25,11 @@
 
 class HideButton : public TQButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     HideButton(TQWidget *parent, const char *name = 0);
-    void setArrowType(Qt::ArrowType arrow);
+    void setArrowType(TQt::ArrowType arrow);
     void setPixmap(const TQPixmap &pix);
 
   protected:
@@ -44,7 +44,7 @@ class HideButton : public TQButton
     bool m_highlight;
     TQPixmap m_normalIcon;
     TQPixmap m_activeIcon;
-    Qt::ArrowType m_arrow;
+    TQt::ArrowType m_arrow;
 
   protected slots:
     void slotSettingsChanged( int category );
@@ -52,5 +52,3 @@ class HideButton : public TQButton
 };
 
 #endif // HIDEBUTTON_H
-
-// vim:ts=4:sw=4:et
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index ea7894343..155584ab9 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -158,12 +158,12 @@ void KMenuItem::setup()
     float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.);
 
     const int expected_height = 38;
-    description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
-    title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 );
+    description_font_size = TQMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
+    title_font_size = TQMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 );
 
     //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl;
     TQListViewItem::setup();
-    setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView()))));
+    setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView())));
 }
 
 void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align)
@@ -278,7 +278,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column
     if ( m_description.isEmpty() )
         spacing = ( height() - f1h ) / 2;
 
-    int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) );
+    int right_triangle_size = pixelSize( 7, listView() );
 
     int right_margin = listView()->verticalScrollBar()->width();
     if ( m_has_children )
@@ -531,7 +531,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int
     int r = left_margin + margin * 2;
 
     const int min_font_size = 7;
-    int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) );
+    int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) );
 
     TQFont f1 = p->font();
     f1.setPixelSize( title_font_pixelSize );
@@ -635,16 +635,16 @@ ItemView::ItemView(TQWidget* parent, const char* name)
     setItemMargin(0);
     setSorting(-1);
     setTreeStepSize(38);
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
 
     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 );
 }
@@ -944,14 +944,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
     if (m_mouseMoveSelects) {
       if(i && i->isEnabled() && !i->isSelected() &&
          // FIXME: This is wrong if you drag over the items.
-         (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
+         (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0)
           TDEListView::setSelected(i, true);
       else if (!i && selectedItem())
           TDEListView::setSelected(selectedItem(), false);
     }
 
     if ( link_cursor )
-        setCursor( Qt::PointingHandCursor );
+        setCursor( TQt::PointingHandCursor );
     else
         unsetCursor();
 
@@ -999,7 +999,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e)
 
     if(i && i->isEnabled() && !i->isSelected() &&
        // FIXME: This is wrong if you drag over the items.
-       (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
+       (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0)
         TDEListView::setSelected(i, true);
     else if (!i && selectedItem())
         TDEListView::setSelected(selectedItem(), false);
@@ -1029,7 +1029,7 @@ TQDragObject * ItemView::dragObject()
           mask = *pix.mask();
       else {
 	  mask.resize(pix.size());
-	  mask.fill(Qt::color1);
+	  mask.fill(TQt::color1);
       }
 
       bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP );
@@ -1256,5 +1256,3 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
 }
 
 #include "itemview.moc"
-
-// vim:cindent:sw=4:
diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h
index 27807c939..bab0142c2 100644
--- a/kicker/kicker/ui/itemview.h
+++ b/kicker/kicker/ui/itemview.h
@@ -156,7 +156,7 @@ class ItemView : public TDEListView
 {
     friend class KMenuItem;
 
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ItemView(TQWidget* parent, const char* name = 0);
 
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 4362e91f1..768056473 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -52,6 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdetoolbarbutton.h>
 #include <twin.h>
 #include <popupmenutop.h>
+#include <tdeaccel.h>
 
 #include "client_mnu.h"
 #include "container_base.h"
@@ -86,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)",
@@ -95,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()
@@ -121,15 +122,12 @@ void PanelKMenu::hideMenu()
 {
     hide();
 
-#ifdef USE_QT4
-    // The hacks below aren't needed any more because Qt4 supports true transparency for the fading logout screen
-#else // USE_QT4
     // 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);
     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
     while (windowTimerTimedOut == false)
@@ -142,12 +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
     while (windowTimerTimedOut == false)
         kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
-#endif // USE_QT4
 }
 
 void PanelKMenu::windowClearTimeout()
@@ -245,13 +242,15 @@ void PanelKMenu::initialize()
         return;
     }
 
+    TDEAccel *accel = new TDEAccel(this);
+
     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(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+                   this, TQ_SLOT(paletteChanged()));
+        connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+                this, TQ_SLOT(paletteChanged()));
     }
     else
     {
@@ -265,14 +264,36 @@ void PanelKMenu::initialize()
     if (KickerSettings::useSearchBar()) {
         TQHBox* hbox = new TQHBox( this );
         TDEToolBarButton *clearButton = new TDEToolBarButton( "locationbar_erase", 0, hbox );
-        searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search..."));
-        hbox->setFocusPolicy(TQ_StrongFocus);
+
+	TQStringList cuts = TQStringList::split(";", KickerSettings::searchShortcut());
+	TQString placeholder;
+	switch( cuts.count() )
+	{
+	    case 0:
+	        placeholder = i18n(" Click here to search...");
+	        break;
+
+            case 1:
+	        placeholder = i18n(" Press '%1' to search...").arg(cuts[0]);
+		break;
+
+	    case 2:
+	        placeholder = i18n(" Press '%1' or '%2' to search...").arg(cuts[0], cuts[1]);
+		break;
+	}
+        searchEdit = new KPIM::ClickLineEdit( hbox, placeholder );
+
+        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, TQ_SLOT(slotFocusSearch()));
+		      
         insertItem(hbox, searchLineID, 0);
     } else {
         searchEdit = NULL;
@@ -369,7 +390,7 @@ void PanelKMenu::initialize()
         insertItem(KickerLib::menuIconSet("system-run"),
                    i18n("Run Command..."),
                    this,
-                   TQT_SLOT( slotRunCommand()));
+                   TQ_SLOT( slotRunCommand()));
         insertSeparator();
     }
 
@@ -377,8 +398,8 @@ void PanelKMenu::initialize()
     {
         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)) );
     }
 
     /*
@@ -388,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"))
     {
-        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"))
     {
-        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
@@ -507,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))),
+        kapp->desktop()->screen(kapp->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>"
@@ -634,7 +655,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e)
     TQPainter p(this);
     p.setClipRegion(e->region());
 
-    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
+    style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
                            colorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );
@@ -705,7 +726,14 @@ 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()));
+    }
+}
+
+void PanelKMenu::slotFocusSearch()
+{
+    if (indexOf(searchLineID) >=0 ) {
+        setActiveItem(indexOf(searchLineID));
     }
 }
 
@@ -719,12 +747,8 @@ void PanelKMenu::keyPressEvent(TQKeyEvent* e)
     // we follow konqueror.
     if (!searchEdit) return KPanelMenu::keyPressEvent(e);
 
-    if (e->key() == TQt::Key_Slash && !searchEdit->hasFocus()) {
-        if (indexOf(searchLineID) >=0 ) {
-            setActiveItem(indexOf(searchLineID));
-        }
-    }
-    else if (e->key() == TQt::Key_Escape && searchEdit->text().isEmpty() == false) {
+
+    if (e->key() == TQt::Key_Escape && searchEdit->text().isEmpty() == false) {
         searchEdit->clear();
     }
     else if (e->key() == TQt::Key_Delete && !searchEdit->hasFocus() &&
diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h
index 7c76f55ed..bb2056590 100644
--- a/kicker/kicker/ui/k_mnu.h
+++ b/kicker/kicker/ui/k_mnu.h
@@ -45,7 +45,7 @@ class Panel;
 
 class PanelKMenu : public PanelServiceMenu, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 k_dcop:
@@ -83,6 +83,7 @@ protected slots:
     void slotEditUserContact();
     void slotUpdateSearch(const TQString &searchtext);
     void slotClearSearch();
+    void slotFocusSearch();
     void paletteChanged();
     virtual void configChanged();
     void updateRecent();
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 7ccb447b4..834086f33 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -21,12 +21,21 @@
 
 ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <dmctl.h>
 #include <inttypes.h>
 
+#ifdef Q_OS_SOLARIS
+#include <sys/statvfs.h>
+#define statfs statvfs
+#endif /* Q_OS_SOLARIS */
+
 #include <tqimage.h>
 #include <tqpainter.h>
 #include <tqstyle.h>
@@ -52,7 +61,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <tdeglobalsettings.h>
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #endif
 #include <kiconloader.h>
@@ -112,16 +121,6 @@
 
 #include "config.h"
 
-#ifdef COMPILE_HALBACKEND
-#ifndef NO_QT3_DBUS_SUPPORT
-/* We acknowledge the the dbus API is unstable */
-#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/connection.h>
-#endif // NO_QT3_DBUS_SUPPORT
-
-#include <hal/libhal.h>
-#endif // COMPILE_HALBACKEND
-
 #ifdef __NetBSD__
 #define statfs statvfs
 #endif
@@ -207,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();
 
@@ -229,7 +228,7 @@ KMenu::KMenu()
     setupUi();
 
     m_userInfo->setBackgroundMode( PaletteBase );
-    TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid );
+    TQColor userInfoColor = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Mid );
     if ( tqGray( userInfoColor.rgb() ) > 120 )
         userInfoColor = userInfoColor.dark( 200 );
     else
@@ -237,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;
 
@@ -285,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);
@@ -301,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);
@@ -332,7 +331,7 @@ KMenu::KMenu()
     m_searchResultsWidget->setItemMargin(4);
 //    m_searchResultsWidget->setIconSize(16);
     m_searchActions = new ItemView (m_searchWidget, "m_searchActions");
-    m_searchActions->setFocusPolicy(TQ_NoFocus);
+    m_searchActions->setFocusPolicy(TQWidget::NoFocus);
     m_searchActions->setItemMargin(4);
     m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet"));
     m_searchInternet->setPixmap(0,icon);
@@ -342,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();
@@ -384,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);
@@ -443,38 +442,6 @@ KMenu::KMenu()
     search_tab_top_left.load( locate("data", "kicker/pics/search-tab-top-left.png" ) );
     search_tab_top_right.load( locate("data", "kicker/pics/search-tab-top-right.png" ) );
     search_tab_top_center.load( locate("data", "kicker/pics/search-tab-top-center.png" ) );
-
-#ifdef COMPILE_HALBACKEND
-    m_halCtx = NULL;
-    m_halCtx = libhal_ctx_new();
-
-    DBusError error;
-    dbus_error_init(&error);
-    m_dbusConn = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
-    if (!m_dbusConn) {
-        dbus_error_free(&error);
-        libhal_ctx_free(m_halCtx);
-        m_halCtx = NULL;
-    } else {
-        dbus_bus_register(m_dbusConn, &error);
-        if (dbus_error_is_set(&error)) {
-            dbus_error_free(&error);
-            libhal_ctx_free(m_halCtx);
-            m_dbusConn = NULL;
-            m_halCtx = NULL;
-        } else {
-            libhal_ctx_set_dbus_connection(m_halCtx, m_dbusConn);
-            if (!libhal_ctx_init(m_halCtx, &error)) {
-                if (dbus_error_is_set(&error)) {
-                    dbus_error_free(&error);
-                }
-                libhal_ctx_free(m_halCtx);
-                m_dbusConn = NULL;
-                m_halCtx = NULL;
-            }
-        }
-    }
-#endif
 }
 
 void KMenu::setupUi()
@@ -483,10 +450,10 @@ void KMenu::setupUi()
     m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) );
     m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) );
     m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) );
-   // m_stacker->setFocusPolicy( TQ_StrongFocus );
+   // m_stacker->setFocusPolicy( TQWidget::StrongFocus );
     m_stacker->setLineWidth( 0 );
-    m_stacker->setFocusPolicy(TQ_NoFocus);
-    connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*)));
+    m_stacker->setFocusPolicy(TQWidget::NoFocus);
+    connect(m_stacker, TQ_SIGNAL(aboutToShow(TQWidget*)), TQ_SLOT(stackWidgetRaised(TQWidget*)));
 
     m_kcommand->setName("m_kcommand");
 }
@@ -497,15 +464,6 @@ KMenu::~KMenu()
 
     clearSubmenus();
     delete m_filterData;
-
-#ifdef COMPILE_HALBACKEND
-    if (m_halCtx) {
-        DBusError error;
-        dbus_error_init(&error);
-        libhal_ctx_shutdown(m_halCtx, &error);
-        libhal_ctx_free(m_halCtx);
-    }
-#endif
 }
 
 bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
@@ -522,16 +480,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         TQPoint p;
 
         if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) {
-            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
             p = me->globalPos();
         }
         else if (e->type() == TQEvent::Wheel) {
-            TQWheelEvent* we = TQT_TQWHEELEVENT(e);
+            TQWheelEvent* we = static_cast<TQWheelEvent*>(e);
             p = we->globalPos();
         }
 
         while (receiver) {
-            if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
+            if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
                 TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p));
                 if (s && s->identifier() == ApplicationsTab)
                     raiseWidget = m_browserView;
@@ -551,8 +509,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
 
             /* we do not want hover activation for the search line edit as this can be
              * pretty disturbing */
-            if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) ||
-                 ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) &&
+            if ( (receiver == m_searchPixmap ||
+                 ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) &&
                  ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel
                    || e->type() == TQEvent::MouseButtonPress ) ) ) &&
                     !m_isShowing) {
@@ -564,25 +522,25 @@ 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;
         }
 
         if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) {
-            m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus);
+            m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus);
             m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ?
-                    TQ_StrongFocus : TQ_NoFocus);
+                    TQWidget::StrongFocus : TQWidget::NoFocus);
             setTabOrder(raiseWidget, m_searchResultsWidget);
             if (raiseWidget != m_stacker->visibleWidget()
-                && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus
+                && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus
                 && m_stacker->id(raiseWidget) >= 0) {
 
                 m_stacker->raiseWidget(raiseWidget);
                 return true;
             }
 
-            if (raiseWidget->focusPolicy() != TQ_NoFocus)
+            if (raiseWidget->focusPolicy() != TQWidget::NoFocus)
                 return false;
         }
 
@@ -604,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();
     }
 
@@ -631,7 +589,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         if (view)
         {
             bool handled = true;
-            switch (TQT_TQKEYEVENT(e)->key()) {
+            switch (static_cast<TQKeyEvent*>(e)->key()) {
                 case Key_Up:
                     if (view->selectedItem()) {
                         view->setSelected(view->selectedItem()->itemAbove(),true);
@@ -708,7 +666,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         r = true;
     }
 
-    if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker))
+    if (e->type() == TQEvent::Enter && receiver == m_stacker)
     {
         TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size());
         r.setSize(r.size()+TQSize(16,128));
@@ -785,8 +743,8 @@ void KMenu::paintSearchTab( bool active )
 
         m_tabBar->deactivateTabs(true);
 
-        p.setBrush( Qt::white );
-        p.setPen( Qt::NoPen );
+        p.setBrush( TQt::white );
+        p.setPen( TQt::NoPen );
 
         if ( m_orientation == BottomUp ) {
             search_tab_center.convertFromImage( search_tab_center.convertToImage().scale(search_tab_center.width(), m_searchFrame->height()));
@@ -1267,17 +1225,17 @@ 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(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+            this, TQ_SLOT(paletteChanged()));
+    connect(kapp, 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()));
+    connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage()));
     m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout"));
 
     // load search field history
@@ -1374,10 +1332,7 @@ void KMenu::insertStaticExitItems()
     }
 
     bool maysd = false;
-#if defined(COMPILE_HALBACKEND)
-    if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
-        maysd = true;
-#elif defined(__TDE_HAVE_TDEHWLIB)
+#if defined(WITH_TDEHWLIB)
     TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
     if( rootDevice ) {
         maysd = rootDevice->canPowerOff();
@@ -1490,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 *)
@@ -1579,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))),
+        kapp->desktop()->screen(kapp->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>"
@@ -1797,7 +1752,7 @@ void KMenu::setOrientation(MenuOrientation orientation)
 
     m_orientation=orientation;
 
-    m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor);
+    m_resizeHandle->setCursor(m_orientation == BottomUp ? TQt::sizeBDiagCursor : TQt::sizeFDiagCursor);
 
     TQPixmap pix;
     if ( m_orientation == BottomUp )
@@ -2046,7 +2001,7 @@ void KMenu::createNewProgramList()
     m_seenPrograms = KickerSettings::firstSeenApps();
     m_newInstalledPrograms.clear();
 
-    m_currentDate = TQDate::currentDate().toString(Qt::ISODate);
+    m_currentDate = TQDate::currentDate().toString(TQt::ISODate);
 
     bool initialize = (m_seenPrograms.count() == 0);
 
@@ -2108,7 +2063,7 @@ void KMenu::createNewProgramList(TQString relPath)
                             else {
                                 ++it_find;
                                 if (*(it_find)!="-") {
-                                   TQDate date = TQDate::fromString(*(it_find),Qt::ISODate);
+                                   TQDate date = TQDate::fromString(*(it_find),TQt::ISODate);
                                    if (date.daysTo(TQDate::currentDate())<3) {
                                       if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end())
                                          m_newInstalledPrograms+=s->storageId();
@@ -2328,7 +2283,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width,
 void KMenu::clearSearchResults(bool showHelp)
 {
     m_searchResultsWidget->clear();
-    m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus);
+    m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus);
     setTabOrder(m_kcommand, m_searchResultsWidget);
 
     if (showHelp) {
@@ -2810,7 +2765,7 @@ void KMenu::slotStartURL(const TQString& u)
 
 void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ )
 {
-    const TQObject* source = TQT_TQOBJECT_CONST(sender());
+    const TQObject* source = sender();
 
     if (!item)
         return;
@@ -2840,12 +2795,12 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
     }
 
     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());
 
-     if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView))
+     if (source==m_favoriteView)
      {
          hasEntries = true;
          m_popupMenu->insertItem(SmallIconSet("remove"),
@@ -2877,7 +2832,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
          }
      }
 
-     if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) {
+     if (source!=m_exitView) {
         if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) {
             if (hasEntries)
                 m_popupMenu->insertSeparator();
@@ -2917,7 +2872,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                i18n("Put Into Run Dialog"), PutIntoRunDialog);
             }
         }
-        if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
+        if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
             TQString uri;
             if (m_popupService)
                 uri = locate("apps", m_popupService->desktopEntryPath());
@@ -2954,7 +2909,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
         }
     }
 
-    if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) {
+    if (source==m_recentlyView) {
        m_popupMenu->insertSeparator();
        if (m_popupService)
          m_popupMenu->insertItem(SmallIconSet("history_clear"),
@@ -3024,7 +2979,7 @@ void KMenu::slotContextMenu(int selected)
 	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();
@@ -3790,27 +3745,7 @@ void KMenu::insertSuspendOption( int &nId, int &index )
     bool standby = false;
     bool suspend_disk = false;
     bool hybrid_suspend = false;
-#if defined(COMPILE_HALBACKEND)
-    suspend_ram = libhal_device_get_property_bool(m_halCtx,
-        "/org/freedesktop/Hal/devices/computer",
-        "power_management.can_suspend",
-        NULL);
-
-    standby = libhal_device_get_property_bool(m_halCtx,
-        "/org/freedesktop/Hal/devices/computer",
-        "power_management.can_standby",
-        NULL);
-
-    suspend_disk = libhal_device_get_property_bool(m_halCtx,
-        "/org/freedesktop/Hal/devices/computer",
-        "power_management.can_hibernate",
-        NULL);
-
-    hybrid_suspend = libhal_device_get_property_bool(m_halCtx,
-        "/org/freedesktop/Hal/devices/computer",
-        "power_management.can_suspend_hybrid",
-        NULL);
-#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
+#if defined(WITH_TDEHWLIB)
     TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
     if (rootDevice) {
         suspend_ram = rootDevice->canSuspend();
@@ -3882,49 +3817,7 @@ void KMenu::slotSuspend(int id)
         DCOPRef("kdesktop", "KScreensaverIface").call("lock()");
     }
 
-#if defined(COMPILE_HALBACKEND)
-    DBusMessage* msg = NULL;
-
-    if (m_dbusConn) {
-        // No Freeze support in HAL
-        if (id == SuspendType::Standby) {
-            msg = dbus_message_new_method_call(
-                              "org.freedesktop.Hal",
-                              "/org/freedesktop/Hal/devices/computer",
-                              "org.freedesktop.Hal.Device.SystemPowerManagement",
-                              "Standby");
-        } else if (id == SuspendType::Suspend) {
-            msg = dbus_message_new_method_call(
-                              "org.freedesktop.Hal",
-                              "/org/freedesktop/Hal/devices/computer",
-                              "org.freedesktop.Hal.Device.SystemPowerManagement",
-                              "Suspend");
-            int wakeup=0;
-            dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID);
-        } else if (id == SuspendType::Hibernate) {
-            msg = dbus_message_new_method_call(
-                              "org.freedesktop.Hal",
-                              "/org/freedesktop/Hal/devices/computer",
-                              "org.freedesktop.Hal.Device.SystemPowerManagement",
-                              "Hibernate");
-        } else if (id == SuspendType::HybridSuspend) {
-            msg = dbus_message_new_method_call(
-                              "org.freedesktop.Hal",
-                              "/org/freedesktop/Hal/devices/computer",
-                              "org.freedesktop.Hal.Device.SystemPowerManagement",
-                              "SuspendHybrid");
-            int wakeup=0;
-            dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID);
-        } else {
-            return;
-        }
-
-        if(dbus_connection_send(m_dbusConn, msg, NULL)) {
-            error = false;
-        }
-        dbus_message_unref(msg);
-    }
-#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
+#if defined(WITH_TDEHWLIB)
     TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
     if (rootDevice) {
         if (id == SuspendType::Freeze) {
@@ -3960,5 +3853,3 @@ void KMenu::runUserCommand()
     kapp->dcopClient()->send( appname, "KDesktopIface",
                               "popupExecuteCommand()", data );
 }
-
-// vim:cindent:sw=4:
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index acb80342b..b0e18e7cb 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -45,16 +45,6 @@
 
 #include <config.h>
 
-#ifdef COMPILE_HALBACKEND
-#ifndef NO_QT3_DBUS_SUPPORT
-/* We acknowledge the the dbus API is unstable */
-#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/connection.h>
-#endif // NO_QT3_DBUS_SUPPORT
-
-#include <hal/libhal.h>
-#endif // COMPILE_HALBACKEND
-
 class KickerClientMenu;
 class KickoffTabBar;
 class KBookmarkMenu;
@@ -88,7 +78,7 @@ enum OverflowCategoryState { None, Filling, NotNeeded };
 
 class KMenu : public KMenuBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY (bool TDEStyleMenuDropShadow READ useTDEStyleMenuDropShadow )
 
 public:
@@ -347,11 +337,6 @@ private:
     void fillOverflowCategory();
 
     TQString insertBreaks(const TQString& text, TQFontMetrics fm, int width, TQString leadInsert = TQString::null);
-
-#ifdef COMPILE_HALBACKEND
-    LibHalContext* m_halCtx;
-    DBusConnection *m_dbusConn;
-#endif
 };
 
 #endif
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index e6e66b441..977ec1089 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -199,7 +199,7 @@ void KickoffTabBar::layoutTabs()
         int w = TQMAX(st.width() / count(), parentWidget()->width() / count());
 
         TQRect r = tab->rect();
-        tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
+        tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this,
                     TQSize(w, h), TQStyleOption(tab))));
         x += tab->rect().width() - overlap;
     }
@@ -223,7 +223,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event)
 
 void KickoffTabBar::mousePressEvent( TQMouseEvent * e )
 {
-    if ( e->button() != Qt::LeftButton ) {
+    if ( e->button() != TQt::LeftButton ) {
 	e->ignore();
 	return;
     }
@@ -235,4 +235,3 @@ void KickoffTabBar::mousePressEvent( TQMouseEvent * e )
 }
 
 #include "kickoff_bar.moc"
-// vim:cindent:sw=4:
diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h
index 941f1144f..d5dcb8d3c 100644
--- a/kicker/kicker/ui/kickoff_bar.h
+++ b/kicker/kicker/ui/kickoff_bar.h
@@ -27,7 +27,7 @@
 
 class KickoffTabBar : public TQTabBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KickoffTabBar(TQWidget* parent, const char* name);
 
diff --git a/kicker/kicker/ui/media_watcher.h b/kicker/kicker/ui/media_watcher.h
index 604fcaabe..0f6cb6fae 100644
--- a/kicker/kicker/ui/media_watcher.h
+++ b/kicker/kicker/ui/media_watcher.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class MediaWatcher : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
     TQStringList m_devices;
diff --git a/kicker/kicker/ui/mykickoffsearchinterface.h b/kicker/kicker/ui/mykickoffsearchinterface.h
index b728718c4..4271766d8 100644
--- a/kicker/kicker/ui/mykickoffsearchinterface.h
+++ b/kicker/kicker/ui/mykickoffsearchinterface.h
@@ -28,7 +28,7 @@ using namespace KickoffSearch;
 
 class MyKickoffSearchInterface :public KickoffSearchInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MyKickoffSearchInterface( KMenu*, TQObject* parent, const char* name = 0 );
diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h
index d839a3b84..7aa839218 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().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu,
+        kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu,
                                     p, r, cg);
 
         if (!m_desktopName.isEmpty())
diff --git a/kicker/kicker/ui/quickbrowser_mnu.h b/kicker/kicker/ui/quickbrowser_mnu.h
index 01b12d09d..98a3eb4c4 100644
--- a/kicker/kicker/ui/quickbrowser_mnu.h
+++ b/kicker/kicker/ui/quickbrowser_mnu.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PanelQuickBrowser : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelQuickBrowser(TQWidget *parent=0, const char *name=0);
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/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h
index 895ded710..17b24b496 100644
--- a/kicker/kicker/ui/removeapplet_mnu.h
+++ b/kicker/kicker/ui/removeapplet_mnu.h
@@ -34,7 +34,7 @@ class ContainerArea;
 
 class PanelRemoveAppletMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelRemoveAppletMenu(ContainerArea* cArea, TQWidget* parent = 0, const char* name = 0);
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/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h
index 211edd771..d3b5d7237 100644
--- a/kicker/kicker/ui/removebutton_mnu.h
+++ b/kicker/kicker/ui/removebutton_mnu.h
@@ -34,7 +34,7 @@ class ContainerArea;
 
 class PanelRemoveButtonMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelRemoveButtonMenu( ContainerArea *cArea, TQWidget *parent=0, const char *name=0 );
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/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h
index bd6d03d89..4f5546449 100644
--- a/kicker/kicker/ui/removecontainer_mnu.h
+++ b/kicker/kicker/ui/removecontainer_mnu.h
@@ -30,7 +30,7 @@ class ContainerArea;
 
 class RemoveContainerMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RemoveContainerMenu(ContainerArea* cArea, TQWidget *parent=0, const char *name=0);
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/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h
index e77522bc8..847179caa 100644
--- a/kicker/kicker/ui/removeextension_mnu.h
+++ b/kicker/kicker/ui/removeextension_mnu.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PanelRemoveExtensionMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelRemoveExtensionMenu( TQWidget *parent=0, const char *name=0 );
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index b7e069706..e661ee1ea 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -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) {
@@ -571,7 +571,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev)
 
 void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
 {
-    if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable())
+    if (ev->button() == TQt::RightButton && !Kicker::the()->isKioskImmutable())
     {
         int id = idAt( ev->pos() );
 
@@ -590,7 +590,7 @@ 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())
@@ -696,7 +696,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
         }
 
 	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();
@@ -740,7 +740,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
         }
 
         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();
@@ -758,7 +758,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
     if (Kicker::the()->isKioskImmutable())
         return;
 
-    if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton )
+    if ( (ev->state() & TQt::LeftButton ) != TQt::LeftButton )
         return;
 
     TQPoint p = ev->pos() - startPos_;
@@ -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();
 
@@ -840,7 +840,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event)
 void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *)
 {
     // see PanelServiceMenu::dragEnterEvent why this is nescessary
-    if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos()))
+    if (!frameGeometry().contains(TQCursor::pos()))
     {
         KURLDrag::setTarget(0);
     }
@@ -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 9cbfaa068..a52e10d45 100644
--- a/kicker/kicker/ui/service_mnu.h
+++ b/kicker/kicker/ui/service_mnu.h
@@ -50,7 +50,7 @@ typedef TQMap<PanelServiceMenu*,int> PanelServiceMenuMap;
 
 class KDE_EXPORT PanelServiceMenu : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PanelServiceMenu(const TQString & label, const TQString & relPath,
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 62f7f055a..224cf427a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -114,19 +114,19 @@ KPanelApplet::Direction arrowToDirection(TQt::ArrowType p)
 {
     switch (p)
     {
-        case Qt::DownArrow:
+        case TQt::DownArrow:
             return KPanelApplet::Down;
         break;
 
-        case Qt::LeftArrow:
+        case TQt::LeftArrow:
             return KPanelApplet::Left;
         break;
 
-        case Qt::RightArrow:
+        case TQt::RightArrow:
             return KPanelApplet::Right;
         break;
 
-        case Qt::UpArrow:
+        case TQt::UpArrow:
         default:
             return KPanelApplet::Up;
         break;
@@ -464,20 +464,15 @@ TQIconSet menuIconSet(const TQString& icon)
 void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha)
 {
     static TQPixmap pix;
-    static TQColor last_color = Qt::black;
+    static TQColor last_color = TQt::black;
     static int last_alpha = 0;
     
     if (pix.isNull() || last_color != color || last_alpha != alpha)
     {
         TQImage img(16, 16, 32);
-#ifdef USE_QT4
+        img.setAlphaBuffer(false);
+        img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
         img.setAlphaBuffer(true);
-	img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
-#else // USE_QT4
-	img.setAlphaBuffer(false);
-	img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
-	img.setAlphaBuffer(true);
-#endif // USE_QT4
         pix.convertFromImage(img);
         last_color = color;
         last_alpha = alpha;
diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h
index 663987174..61ba2f0ea 100644
--- a/kicker/libkicker/global.h
+++ b/kicker/libkicker/global.h
@@ -57,7 +57,7 @@ KDE_EXPORT void colorize(TQImage& image);
 /**
  * Blend a color rectangle on a painter
  */
-KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = Qt::black, int alpha = 0x40);
+KDE_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
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 5ab6880aa..9951fe9e1 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -316,7 +316,7 @@
 
 <entry name="KMenuTileColor" type="Color" >
       <label>Color to use for Kmenu button background</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 <entry name="DesktopButtonTile" type="Path" >
@@ -325,7 +325,7 @@
 
 <entry name="DesktopButtonTileColor" type="Color" >
       <label>Color to use for Kmenu button background</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 <entry name="URLTile" type="Path" >
@@ -334,7 +334,7 @@
 
 <entry name="URLTileColor" type="Color" >
       <label>Color to use for Application, URL and special button backgrounds</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 <entry name="BrowserTile" type="Path" >
@@ -343,7 +343,7 @@
 
 <entry name="BrowserTileColor" type="Color" >
       <label>Color to use for Browser button background</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 <entry name="WindowListTile" type="Path" >
@@ -352,7 +352,7 @@
 
 <entry name="WindowListTileColor" type="Color" >
       <label>Color to use for Window List button background</label>
-      <default code="true">QColor()</default>
+      <default code="true">TQColor()</default>
    </entry>
 
 </group>
@@ -416,7 +416,12 @@
 
    <entry name="CustomKMenuIcon" key="CustomIcon" type="Path" >
       <label>Custom TDE Menu Button Icon</label>
-      <default code="true">QString("kmenu")</default>
+      <default code="true">TQString("kmenu")</default>
+   </entry>
+
+   <entry name="SearchShortcut" type="String" >
+     <label>Search shortcut</label>
+     <default>/</default>
    </entry>
 
 </group>
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 0a6000f37..c896c830a 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -76,13 +76,13 @@ KickerTip::KickerTip(TQWidget * parent)
       m_timer(0, "KickerTip::m_timer"),
       m_frameTimer(0, "KickerTip::m_frameTimer")
 {
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
     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(kapp, 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
@@ -283,10 +283,10 @@ void KickerTip::plainMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::color0);
+    m_mask.fill(TQt::color0);
 
-    maskPainter.setBrush(Qt::color1);
-    maskPainter.setPen(Qt::NoPen);
+    maskPainter.setBrush(TQt::color1);
+    maskPainter.setPen(TQt::NoPen);
     //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
     drawRoundRect(maskPainter, m_mask.rect());
     setMask(m_mask);
@@ -297,10 +297,10 @@ void KickerTip::dissolveMask()
 {
     TQPainter maskPainter(&m_mask);
 
-    m_mask.fill(Qt::color0);
+    m_mask.fill(TQt::color0);
 
-    maskPainter.setBrush(Qt::color1);
-    maskPainter.setPen(Qt::NoPen);
+    maskPainter.setBrush(TQt::color1);
+    maskPainter.setPen(TQt::NoPen);
     //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
     drawRoundRect(maskPainter, m_mask.rect());
 
@@ -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 b7332967f..7295b4efa 100644
--- a/kicker/libkicker/kickertip.h
+++ b/kicker/libkicker/kickertip.h
@@ -40,7 +40,7 @@ class TQTimer;
 
 class KDE_EXPORT KickerTip : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum MaskEffect { Plain, Dissolve };
diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp
index a933026d5..76f1b9d87 100644
--- a/kicker/libkicker/kshadowengine.cpp
+++ b/kicker/libkicker/kshadowengine.cpp
@@ -236,7 +236,7 @@ void KTextShadowEngine::drawText(TQPainter &p, const TQRect &tr, int tf, const T
 
     // draw text
     pixPainter.begin(&textPixmap);
-    pixPainter.setPen(Qt::white);
+    pixPainter.setPen(TQt::white);
     pixPainter.setFont(p.font()); // get the font from the root painter
     pixPainter.drawText(tr, tf, str);
     pixPainter.end();
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index a8e4bf1fa..8cdc4c664 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -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/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index aaac124c2..0708d0b5f 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
       m_arrowDirection(KPanelExtension::Bottom),
       m_popupDirection(KPanelApplet::Up),
       m_iconAlignment(AlignCenter),
-      m_orientation(Qt::Horizontal),
+      m_orientation(TQt::Horizontal),
       m_size((TDEIcon::StdSizes)-1),
       m_fontPercent(0.40),
       m_forceStandardCursor(forceStandardCursor)
@@ -93,8 +93,8 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
 
     installEventFilter(KickerTip::the());
 
-    connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int)));
-    connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int)));
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int)));
+    connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int)));
 }
 
 void PanelButton::configure()
@@ -196,7 +196,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d)
     setArrowDirection(KickerLib::directionToPopupPosition(d));
 }
 
-void PanelButton::setIconAlignment(TQ_Alignment align)
+void PanelButton::setIconAlignment(TQt::AlignmentFlags align)
 {
     m_iconAlignment = align;
     update();
@@ -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()));
     }
 }
 
@@ -305,7 +305,7 @@ int PanelButton::widthForHeight(int height) const
 
     // we only paint the text when horizontal, so make sure we're horizontal
     // before adding the text in here
-    if (orientation() == Qt::Horizontal && !m_buttonText.isEmpty())
+    if (orientation() == TQt::Horizontal && !m_buttonText.isEmpty())
     {
         TQFont f(font());
         //f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16)));
@@ -483,7 +483,7 @@ void PanelButton::dropEvent(TQDropEvent* e)
 
 void PanelButton::mouseMoveEvent(TQMouseEvent *e)
 {
-    if (!m_isLeftMouseButtonDown || (e->state() & Qt::LeftButton) == 0)
+    if (!m_isLeftMouseButtonDown || (e->state() & TQt::LeftButton) == 0)
     {
         return;
     }
@@ -501,7 +501,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e)
 
 void PanelButton::mousePressEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         m_lastLeftMouseButtonPress = e->pos();
         m_isLeftMouseButtonDown = true;
@@ -511,7 +511,7 @@ void PanelButton::mousePressEvent(TQMouseEvent *e)
 
 void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         m_isLeftMouseButtonDown = false;
 	
@@ -540,7 +540,7 @@ void PanelButton::drawButton(TQPainter *p)
     if (m_tileColor.isValid())
     {
         p->fillRect(rect(), m_tileColor);
-        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
+        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
     }
     else if (paletteBackgroundPixmap())
     {
@@ -560,7 +560,7 @@ void PanelButton::drawButton(TQPainter *p)
     else if (isDown() || isOn())
     {
         // Draw shapes to indicate the down state.
-        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
+        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
     }
 
     drawButtonLabel(p);
@@ -568,9 +568,9 @@ void PanelButton::drawButton(TQPainter *p)
     if (hasFocus() || m_hasAcceptedDrag)
     {
         int x1, y1, x2, y2;
-        TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
+        rect().coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
-        style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+        style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
         TQStyle::Style_Default, colorGroup().button());
     }
 }
@@ -582,7 +582,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
     if (m_tileColor.isValid())
     {
         p->fillRect(rect(), m_tileColor);
-        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
+        style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
     }
     else if (paletteBackgroundPixmap())
     {
@@ -596,10 +596,10 @@ void PanelButton::drawDeepButton(TQPainter *p)
 
     TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2);
     if (isDown() || isOn()) {
-        style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
+        style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
     }
     else {
-        style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
+        style().drawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
     }
 
     drawButtonLabel(p,0,FALSE);
@@ -607,9 +607,9 @@ void PanelButton::drawDeepButton(TQPainter *p)
     if (hasFocus() || m_hasAcceptedDrag)
     {
         int x1, y1, x2, y2;
-        TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
+        rect().coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
-        style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+        style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
         TQStyle::Style_Default, colorGroup().button());
     }
 }
@@ -645,7 +645,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
     else if (m_iconAlignment & AlignBottom)
         y = (height() - icon.height());
 
-    if (!m_buttonText.isEmpty() && orientation() == Qt::Horizontal)
+    if (!m_buttonText.isEmpty() && orientation() == TQt::Horizontal)
     {
         int h = height();
         int w = width();
@@ -749,7 +749,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
                 r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
                 break;
             case KPanelExtension::Floating:
-                if (orientation() == Qt::Horizontal)
+                if (orientation() == TQt::Horizontal)
                 {
                     e = TQStyle::PE_ArrowDown;
                     r.moveBy(0, height() - arrowSize);
@@ -772,7 +772,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
         {
             flags |= TQStyle::Style_Down;
         }
-        style().tqdrawPrimitive(e, p, r, colorGroup(), flags);
+        style().drawPrimitive(e, p, r, colorGroup(), flags);
     }
 }
 
@@ -795,7 +795,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
 
     if (proposed_size < 0)
     {
-        proposed_size = (orientation() == Qt::Horizontal) ? height() : width();
+        proposed_size = (orientation() == TQt::Horizontal) ? height() : width();
     }
 
     // determine the upper limit on the size.  Normally, this is panelSize,
@@ -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()));
     }
 }
 
@@ -996,8 +996,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
 {
     if (e->type() == TQEvent::MouseMove)
     {
-        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())) &&
+        TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+        if (rect().contains(mapFromGlobal(me->globalPos())) &&
             ((me->state() & ControlButton) != 0 ||
              (me->state() & ShiftButton) != 0))
         {
@@ -1008,8 +1008,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
     else if (e->type() == TQEvent::MouseButtonPress ||
              e->type() == TQEvent::MouseButtonDblClick)
     {
-        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             m_pressedDuringPopup = true;
             return true;
@@ -1017,8 +1017,8 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e)
     }
     else if (e->type() == TQEvent::MouseButtonRelease)
     {
-        TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
-        if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(me->globalPos())))
+        TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
+        if (rect().contains(mapFromGlobal(me->globalPos())))
         {
             if (m_pressedDuringPopup && m_popup)
             {
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index 80b26f377..cea132680 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -45,7 +45,7 @@ class KShadowEngine;
  */
 class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -263,7 +263,7 @@ public slots:
 
 protected:
 
-    void setIconAlignment(TQ_Alignment align);
+    void setIconAlignment(TQt::AlignmentFlags align);
     /**
      * Subclasses must implement this to define the name of the button which is
      * used to identify this button for saving and loading. It must be unique
@@ -406,7 +406,7 @@ private:
     TQPixmap m_iconz; // mouse over
     KPanelExtension::Position m_arrowDirection;
     KPanelApplet::Direction m_popupDirection;
-    TQ_Alignment m_iconAlignment;
+    TQt::AlignmentFlags m_iconAlignment;
     Orientation m_orientation;
     int m_size;
     double m_fontPercent;
@@ -422,7 +422,7 @@ private:
  */
 class KDE_EXPORT PanelPopupButton : public PanelButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
    /**
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index ec06b30c9..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);
@@ -57,7 +57,7 @@ Panner::Panner( TQWidget* parent, const char* name )
     // layout
     _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
     _layout->addWidget(_clipper, 1);
-    setOrientation(Qt::Horizontal);
+    setOrientation(TQt::Horizontal);
 }
 
 Panner::~Panner() 
@@ -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();
@@ -97,12 +97,12 @@ void Panner::createScrollButtons()
 
 void Panner::setupButtons()
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         if (_luSB)
         {
-            _luSB->setArrowType(Qt::LeftArrow);
-            _rdSB->setArrowType(Qt::RightArrow);
+            _luSB->setArrowType(TQt::LeftArrow);
+            _rdSB->setArrowType(TQt::RightArrow);
             _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
             _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
             TQToolTip::add(_luSB, i18n("Scroll left"));
@@ -115,8 +115,8 @@ void Panner::setupButtons()
     {
         if (_luSB)
         {
-            _luSB->setArrowType(Qt::UpArrow);
-            _rdSB->setArrowType(Qt::DownArrow);
+            _luSB->setArrowType(TQt::UpArrow);
+            _rdSB->setArrowType(TQt::DownArrow);
             _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
             _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
             TQToolTip::add(_luSB, i18n("Scroll up"));
@@ -149,7 +149,7 @@ void Panner::resizeEvent( TQResizeEvent* )
 
 void Panner::scrollRightDown()
 {
-    if(orientation() == Qt::Horizontal) // scroll right
+    if(orientation() == TQt::Horizontal) // scroll right
         scrollBy( _step, 0 );
     else // scroll down
         scrollBy( 0, _step );
@@ -159,7 +159,7 @@ void Panner::scrollRightDown()
 
 void Panner::scrollLeftUp()
 {
-    if(orientation() == Qt::Horizontal) // scroll left
+    if(orientation() == TQt::Horizontal) // scroll left
         scrollBy( -_step, 0 );
     else // scroll up
         scrollBy( 0, -_step );
@@ -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();
@@ -197,7 +197,7 @@ void Panner::reallyUpdateScrollButtons()
     
     _updateScrollButtonsTimer->stop();
 
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         delta = contentsWidth() - width();
     }
@@ -336,7 +336,7 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin )
 
 bool Panner::eventFilter( TQObject *obj, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_viewport) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_clipper) ) 
+    if ( obj == _viewport || obj == _clipper ) 
     {
         switch ( e->type() ) 
         {
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index 7ae68d096..36305bb0c 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -33,7 +33,7 @@ class TQTimer;
 
 class KDE_EXPORT Panner : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Panner( TQWidget* parent, const char* name = 0 );
@@ -41,8 +41,8 @@ public:
 
     TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
 
-    Qt::Orientation orientation() const { return _orient; }
-    virtual void setOrientation(Qt::Orientation orientation);
+    TQt::Orientation orientation() const { return _orient; }
+    virtual void setOrientation(TQt::Orientation orientation);
     
     TQWidget *viewport() const { return _viewport; }
     
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 67c90b81a..79fd19915 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -42,15 +42,15 @@
 SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandardCursor)
     : TQButton(parent, name),
       m_highlight(false),
-      m_orientation(Qt::Horizontal),
+      m_orientation(TQt::Horizontal),
       m_forceStandardCursor(forceStandardCursor)
 {
     setBackgroundOrigin( AncestorOrigin );
 
-    connect( kapp, TQT_SIGNAL( settingsChanged( int ) ),
-       TQT_SLOT( slotSettingsChanged( int ) ) );
-    connect( kapp, TQT_SIGNAL( iconChanged( int ) ),
-       TQT_SLOT( slotIconChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( settingsChanged( int ) ),
+       TQ_SLOT( slotSettingsChanged( int ) ) );
+    connect( kapp, TQ_SIGNAL( iconChanged( int ) ),
+       TQ_SLOT( slotIconChanged( int ) ) );
 
     kapp->addKipcEventMask( KIPC::SettingsChanged );
     kapp->addKipcEventMask( KIPC::IconChanged );
@@ -65,7 +65,7 @@ void SimpleButton::setPixmap(const TQPixmap &pix)
     update();
 }
 
-void SimpleButton::setOrientation(Qt::Orientation orientation)
+void SimpleButton::setOrientation(TQt::Orientation orientation)
 {
     m_orientation = orientation;
     update();
@@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p )
         if (m_highlight || isDown() || isOn()) {
             int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
             if (isDown() || isOn()) flags |= TQStyle::Style_Down;
-            style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
+            style().drawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
         }
     }
 
@@ -220,7 +220,7 @@ void SimpleButton::resizeEvent( TQResizeEvent * )
 }
 
 
-SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name, bool forceStandardCursor)
+SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name, bool forceStandardCursor)
     : SimpleButton(parent, name, forceStandardCursor),
       m_forceStandardCursor(forceStandardCursor)
 {
@@ -234,7 +234,7 @@ TQSize SimpleArrowButton::sizeHint() const
     return TQSize( 12, 12 );
 }
 
-void SimpleArrowButton::setArrowType(Qt::ArrowType a)
+void SimpleArrowButton::setArrowType(TQt::ArrowType a)
 {
     if (_arrow != a) 
     {
@@ -243,7 +243,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a)
     }
 }
 
-Qt::ArrowType SimpleArrowButton::arrowType() const
+TQt::ArrowType SimpleArrowButton::arrowType() const
 {
     return _arrow;
 }
@@ -255,15 +255,15 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft;
     switch (_arrow)
     {
-        case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
-        case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
-        case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
-        case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
+        case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
+        case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
+        case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
+        case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
     }
 
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().drawPrimitive(pe, p, r, colorGroup(), flags);
 
     if (m_forceStandardCursor) {
         SimpleButton::drawButton(p);
@@ -285,5 +285,3 @@ void SimpleArrowButton::leaveEvent( TQEvent *e )
 }
 
 #include "simplebutton.moc"
-
-// vim:ts=4:sw=4:et
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index bbfcbd79d..7f1718273 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -28,12 +28,12 @@
 
 class KDE_EXPORT SimpleButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE);
         void setPixmap(const TQPixmap &pix);
-        void setOrientation(Qt::Orientation orientaton);
+        void setOrientation(TQt::Orientation orientaton);
         TQSize sizeHint() const;
         TQSize minimumSizeHint() const;
 
@@ -55,7 +55,7 @@ class KDE_EXPORT SimpleButton : public TQButton
         TQPixmap m_normalIcon;
         TQPixmap m_activeIcon;
         TQPixmap m_disabledIcon;
-        Qt::Orientation m_orientation;
+        TQt::Orientation m_orientation;
         bool m_forceStandardCursor;
         class SimpleButtonPrivate;
         SimpleButtonPrivate* d;
@@ -63,10 +63,10 @@ class KDE_EXPORT SimpleButton : public TQButton
 
 class KDE_EXPORT SimpleArrowButton: public SimpleButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
-        SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::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;
     
@@ -74,18 +74,16 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
         virtual void enterEvent( TQEvent *e );
         virtual void leaveEvent( TQEvent *e );
         virtual void drawButton(TQPainter *p);
-        Qt::ArrowType arrowType() const;
+        TQt::ArrowType arrowType() const;
     
     public slots:
-        void setArrowType(Qt::ArrowType a);
+        void setArrowType(TQt::ArrowType a);
     
     private:
-        Qt::ArrowType _arrow;
+        TQt::ArrowType _arrow;
         bool m_forceStandardCursor;
         bool _inside;
 };
 
 
 #endif // HIDEBUTTON_H
-
-// vim:ts=4:sw=4:et
diff --git a/kicker/menuext/find/findmenu.h b/kicker/menuext/find/findmenu.h
index b8c3e3d96..85dd0e04d 100644
--- a/kicker/menuext/find/findmenu.h
+++ b/kicker/menuext/find/findmenu.h
@@ -30,7 +30,7 @@ class TQStringList;
 
 class FindMenu : public KPanelMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
     FindMenu( TQWidget* parent, const char* name, const TQStringList &/*args*/ );
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index c2b3712cc..089a8ac93 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -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;
 
@@ -175,5 +175,3 @@ void KateSessionMenu::reloadSessionsList()
   reinitialize();
   exec();
 }
-
-// kate: space-indent: on; indent-width 2; replace-tabs on;
diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h
index 2558ad702..b6a10e885 100644
--- a/kicker/menuext/kate/katesessionmenu.h
+++ b/kicker/menuext/kate/katesessionmenu.h
@@ -24,7 +24,7 @@
 #include <kpanelmenu.h>
 
 class KateSessionMenu : public KPanelMenu {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KateSessionMenu( TQWidget *parent=0, const char *name=0, const TQStringList& /*args*/=TQStringList() );
     ~KateSessionMenu();
@@ -42,5 +42,3 @@ class KateSessionMenu : public KPanelMenu {
 };
 
 #endif // _KateSessionMenu_h_
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kicker/menuext/konq-profiles/konqy_menu.h b/kicker/menuext/konq-profiles/konqy_menu.h
index ba3bb19f7..927f1ec6e 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.h
+++ b/kicker/menuext/konq-profiles/konqy_menu.h
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class KonquerorProfilesMenu : public KPanelMenu
 {
-   Q_OBJECT
+   TQ_OBJECT
 
    public:
       KonquerorProfilesMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/);
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index c9439c8db..2e196186f 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -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();
@@ -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)
diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h
index 4272fbaf9..68473693f 100644
--- a/kicker/menuext/konsole/konsole_mnu.h
+++ b/kicker/menuext/konsole/konsole_mnu.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class KonsoleMenu : public KPanelMenu/*, public KPReloadObject*/
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleMenu(TQWidget *parent, const char *name, const TQStringList& /* args */);
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 9ace6483e..b2249d858 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -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/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index a1d2f54de..f7231fd24 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -14,7 +14,7 @@ class KonsoleMenu;
 
 class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel );
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 0860cc123..840b3b8f6 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -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() );
@@ -168,7 +168,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected()
     if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
     a = (TDEAction*)sender();
     b = a->text();
-    m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
+    m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
                                ( (TDEAction *)sender() )->text() /* Title */ );
 }
 
@@ -177,7 +177,7 @@ void KonsoleBookmarkMenu::slotNSBookmarkSelected()
     TDEAction *a;
     TQString b;
 
-    TQString link(TQT_TQOBJECT_CONST(sender())->name()+8);
+    TQString link(sender()->name()+8);
     a = (TDEAction*)sender();
     b = a->text();
     m_kOwner->openBookmarkURL( link, /*URL */
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h
index 103b6bc19..4bb08a798 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.h
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.h
@@ -23,7 +23,7 @@ class KonsoleBookmarkMenu;
 
 class KonsoleBookmarkMenu : public KBookmarkMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleBookmarkMenu( KBookmarkManager* mgr,
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 534387394..5440c1ed7 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -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()
@@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
 {
     KPanelMenu::mouseMoveEvent(ev);
 
-    if ((ev->state() & Qt::LeftButton) != Qt::LeftButton)
+    if ((ev->state() & TQt::LeftButton) != TQt::LeftButton)
     {
         return;
     }
@@ -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();
 
@@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event)
 void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/)
 {
     // see PrefMenu::dragEnterEvent why this is nescessary
-    if (!TQT_TQRECT_OBJECT(frameGeometry()).contains(TQCursor::pos()))
+    if (!frameGeometry().contains(TQCursor::pos()))
     {
         KURLDrag::setTarget(0);
     }
@@ -246,7 +246,7 @@ void PrefMenu::initialize()
     {
         insertItem(KickerLib::menuIconSet("kcontrol"),
                    i18n("Trinity Control Center"),
-                   this, TQT_SLOT(launchControlCenter()));
+                   this, TQ_SLOT(launchControlCenter()));
         insertSeparator();
     }
 
@@ -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/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h
index 10befe6b2..a56391ece 100644
--- a/kicker/menuext/prefmenu/prefmenu.h
+++ b/kicker/menuext/prefmenu/prefmenu.h
@@ -34,7 +34,7 @@ typedef TQPtrList<TQPopupMenu> PopupMenuList;
 
 class PrefMenu : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         PrefMenu(TQWidget *parent,
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 19adfa868..90c84ee32 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -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();
@@ -111,10 +111,10 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) {
 void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
 	KPanelMenu::mouseMoveEvent(e);
 
-	if (!(e->state() & Qt::LeftButton))
+	if (!(e->state() & TQt::LeftButton))
 		return;
 
-	if (!TQT_TQRECT_OBJECT(rect()).contains(_mouseDown))
+	if (!rect().contains(_mouseDown))
 		return;
 
 	int dragLength = (e->pos() - _mouseDown).manhattanLength();
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.h b/kicker/menuext/recentdocs/recentdocsmenu.h
index 487a9fe94..2ec65a1a4 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.h
+++ b/kicker/menuext/recentdocs/recentdocsmenu.h
@@ -31,7 +31,7 @@ class TQPoint;
 
 class RecentDocsMenu : public KPanelMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	RecentDocsMenu(TQWidget* parent, const char* name, const TQStringList &/*args*/);
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index aeaff8e94..8c0a8407a 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -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();
 
diff --git a/kicker/menuext/remote/remotemenu.h b/kicker/menuext/remote/remotemenu.h
index 607e1fc64..327cc79b2 100644
--- a/kicker/menuext/remote/remotemenu.h
+++ b/kicker/menuext/remote/remotemenu.h
@@ -26,7 +26,7 @@
 
 class RemoteMenu : public KPanelMenu, public KDirNotify
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
     public:
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/system/systemmenu.h b/kicker/menuext/system/systemmenu.h
index 1efbc3c57..26263af81 100644
--- a/kicker/menuext/system/systemmenu.h
+++ b/kicker/menuext/system/systemmenu.h
@@ -27,7 +27,7 @@
 
 class SystemMenu : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         SystemMenu(TQWidget *parent, const char *name,
diff --git a/kicker/menuext/tdeprint/print_mnu.h b/kicker/menuext/tdeprint/print_mnu.h
index 47c9e609e..4be9b80a5 100644
--- a/kicker/menuext/tdeprint/print_mnu.h
+++ b/kicker/menuext/tdeprint/print_mnu.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class PrintMenu : public KPanelMenu, public KPReloadObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/);
diff --git a/kicker/menuext/tom/Makefile.am b/kicker/menuext/tom/Makefile.am
index 0f9f7c081..16a46a9dc 100644
--- a/kicker/menuext/tom/Makefile.am
+++ b/kicker/menuext/tom/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/../../libkicker -I$(srcdir)/../../ui -I$(srcdir)/../../co
 
 kde_module_LTLIBRARIES = kickermenu_tom.la
 
-kickermenu_tom_la_SOURCES = tom.cc
+kickermenu_tom_la_SOURCES = tom.cpp
 kickermenu_tom_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kickermenu_tom_la_LIBADD = $(LIB_TDEUI)
 #$(top_builddir)/kicker/ui/libkicker_ui.la 
@@ -16,4 +16,4 @@ tomdata_DATA = destinations
 tomdatadir = $(kde_datadir)/kicker/tom
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/libkickermenu_tom.pot
+	$(XGETTEXT) *.cpp -o $(podir)/libkickermenu_tom.pot
diff --git a/kicker/menuext/tom/README b/kicker/menuext/tom/README
index 926ae0e81..7fe6eb332 100644
--- a/kicker/menuext/tom/README
+++ b/kicker/menuext/tom/README
@@ -60,6 +60,6 @@ What should be the default task entry format be:
     c) App Name (Task Name)  <-- silly option =)
 Should "Run A Command..." be replaced by an inline combobox?
     Pros: It's more obvious and will work even if kdesktop is gone. The widget
-          is already written (in tom.cc)
+          is already written (in tom.cpp)
     Cons: It makes it stand out too much over other entries, takes up more room
           and isn't as powerful as the full minicli
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cpp
index 0fa85a1e3..973c52ee9 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cpp
@@ -105,7 +105,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
             l1->setPixmap(foo);
             runLayout->addWidget(l1);*/
             /*TQLabel* l2 = new TQLabel(i18n("&Run: "), this);
-            l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+            l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
             l2->setBuddy(this);
             runLayout->addWidget(l2);*/
             m_runEdit = new KHistoryCombo(this);
@@ -116,21 +116,21 @@ class runMenuWidget : public TQWidget, public QMenuItem
             TQSettings settings;
             if (settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled")
             {
-                setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
-                //l1->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
-                //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
-                m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+                setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+                //l1->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+                //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+                m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
             }
             else
             {
-                /*setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
-                l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
-                l2->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
-                m_runEdit->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);*/
+                /*setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+                l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+                l2->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+                m_runEdit->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);*/
                 //l1->setAutoMask(true);
-                //l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
-                //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
-                //m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+                //l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+                //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+                //m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
             }
 
             setMinimumHeight(TDEIcon::SizeMedium + 2);
@@ -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();
@@ -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(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
     }*/
 
     // TASKS
@@ -486,7 +486,7 @@ void TOM::initialize()
     }
     else if (kapp->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);
 
@@ -512,7 +512,7 @@ void TOM::initialize()
     // if we have no destinations, put the run command here
     if (numDests == 0 && kapp->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()
@@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e)
 
     TQPainter p(this);
 
-    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
+    style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
                            colorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );
diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h
index b67f2bd6c..7e7b9e5ec 100644
--- a/kicker/menuext/tom/tom.h
+++ b/kicker/menuext/tom/tom.h
@@ -32,7 +32,7 @@ typedef TQMap<int, KService::Ptr> TaskMap;
 
 class TOM : public KPanelMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         TOM(TQWidget *parent = 0, const char *name = 0);
@@ -102,7 +102,7 @@ class TOMFactory : public KLibFactory
 
     protected:
         TQObject* createObject(TQObject *parent = 0, const char *name = 0,
-                              const char *classname = TQOBJECT_OBJECT_NAME_STRING,
+                              const char *classname = "TQObject",
                               const TQStringList& args = TQStringList());
 };
 
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index ac2f969d8..daf6312d9 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -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)
@@ -258,8 +258,8 @@ void AppletProxy::dock(const TQCString& callbackID)
     DCOPClient* dcop = kapp->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;
 
diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h
index 4c504022f..59fb375b7 100644
--- a/kicker/proxy/appletproxy.h
+++ b/kicker/proxy/appletproxy.h
@@ -36,7 +36,7 @@ class KickerPluginManager;
 
 class AppletProxy : public TQObject, DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     AppletProxy(TQObject* parent, const char* name = 0);
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index c210e7b9e..e91d7ac7f 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -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/extensiondebugger.h b/kicker/proxy/extensiondebugger.h
index 0f4719b9f..fd1cba1af 100644
--- a/kicker/proxy/extensiondebugger.h
+++ b/kicker/proxy/extensiondebugger.h
@@ -29,7 +29,7 @@ class KPanelExtension;
 
 class ExtensionContainer : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ExtensionContainer(KPanelExtension *extension, TQWidget* parent = 0, const char* name = 0);
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 13c40e67b..4168bc14a 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -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)
@@ -198,8 +198,8 @@ void ExtensionProxy::dock(const TQCString& callbackID)
     DCOPClient* dcop = kapp->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;
 
diff --git a/kicker/proxy/extensionproxy.h b/kicker/proxy/extensionproxy.h
index 88bc0a325..d32b8f70b 100644
--- a/kicker/proxy/extensionproxy.h
+++ b/kicker/proxy/extensionproxy.h
@@ -35,7 +35,7 @@ class KPanelExtension;
 
 class ExtensionProxy : public TQObject, DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ExtensionProxy(TQObject* parent, const char* name = 0);
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 29c06da89..ac0133668 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "taskbar.h"
 #include "taskbar.moc"
 
-#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
+#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
 
 TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name )
     : Panner( parent, name ),
@@ -81,7 +81,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
 
     // init
     setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
-    m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp);
+    m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp);
 
     // setup animation frames
     for (int i = 1; i < 11; i++)
@@ -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(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+    keys = new TDEGlobalAccel( this );
 #include "taskbarbindings.cpp"
     keys->readSettings();
     keys->updateConnections();
@@ -174,31 +174,40 @@ KTextShadowEngine *TaskBar::textShadowEngine()
     return m_textShadowEngine;
 }
 
-
-TQSize TaskBar::sizeHint() const
+int TaskBar::buttonHeight() const
 {
-    // get our minimum height based on the minimum button height or the
-    // height of the font in use, which is largest
     TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
-    int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
-                          fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+    int bh = TQMAX(fm.height(), READ_MERGED_TASKBAR_SETTING(minimumButtonHeight));
+
+    if(showIcons())
+    {
+        bh = TQMAX(bh, READ_MERGED_TASKBAR_SETTING(iconSize));
+    }
+
+    return bh + 2;
+}
+
+int TaskBar::buttonWidth() const
+{
+    return TQMAX(BUTTON_MIN_WIDTH, READ_MERGED_TASKBAR_SETTING(iconSize)) + 2;
+}
 
-    return TQSize(BUTTON_MIN_WIDTH, minButtonHeight);
+
+TQSize TaskBar::sizeHint() const
+{
+    return TQSize(buttonWidth(), buttonHeight());
 }
 
 TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
 {
-    // get our minimum height based on the minimum button height or the
-    // height of the font in use, which is largest
-    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
-    int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
-                          fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+    // get our minimum height based on the minimum button height, the icon size or the
+    // height of the font in use, whichever is largest
 
     if ( p == KPanelExtension::Left || p == KPanelExtension::Right )
     {
         // Vertical layout
         // Minimum space allows for one icon, the window list button and the up/down scrollers
-        int minHeight = minButtonHeight*3;
+        int minHeight = buttonHeight()*3;
         if (minHeight > maxSize.height())
             return maxSize;
         return TQSize(maxSize.width(), minHeight);
@@ -207,7 +216,7 @@ TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
     {
         // Horizontal layout
         // Minimum space allows for one column of icons, the window list button and the left/right scrollers
-        int min_width=BUTTON_MIN_WIDTH*3;
+        int min_width=buttonWidth()*3;
         if (min_width > maxSize.width())
             return maxSize;
         return TQSize(min_width, maxSize.height());
@@ -233,16 +242,18 @@ void TaskBar::configure()
     bool wasDisplayIconsNText = m_displayIconsNText;
     bool wasShowOnlyIconified = m_showOnlyIconified;
     int  wasShowTaskStates = m_showTaskStates;
+    int  wasIconSize = m_iconSize;
 
-    m_showAllWindows = READ_MERGED_TASBKAR_SETTING(showAllWindows);
-    m_sortByDesktop = m_showAllWindows && READ_MERGED_TASBKAR_SETTING(sortByDesktop);
-    m_displayIconsNText = READ_MERGED_TASBKAR_SETTING(displayIconsNText);
-    m_showOnlyIconified = READ_MERGED_TASBKAR_SETTING(showOnlyIconified);
-    m_cycleWheel = READ_MERGED_TASBKAR_SETTING(cycleWheel);
-    m_showTaskStates = READ_MERGED_TASBKAR_SETTING(showTaskStates);
+    m_showAllWindows = READ_MERGED_TASKBAR_SETTING(showAllWindows);
+    m_sortByDesktop = m_showAllWindows && READ_MERGED_TASKBAR_SETTING(sortByDesktop);
+    m_displayIconsNText = READ_MERGED_TASKBAR_SETTING(displayIconsNText);
+    m_showOnlyIconified = READ_MERGED_TASKBAR_SETTING(showOnlyIconified);
+    m_cycleWheel = READ_MERGED_TASKBAR_SETTING(cycleWheel);
+    m_showTaskStates = READ_MERGED_TASKBAR_SETTING(showTaskStates);
+    m_iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
 
     m_currentScreen = -1;    // Show all screens or re-get our screen
-    m_showOnlyCurrentScreen = (READ_MERGED_TASBKAR_SETTING(showCurrentScreenOnly) &&
+    m_showOnlyCurrentScreen = (READ_MERGED_TASKBAR_SETTING(showCurrentScreenOnly) &&
                               TQApplication::desktop()->isVirtualDesktop() &&
                               TQApplication::desktop()->numScreens() > 1);
 
@@ -250,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);
 
@@ -264,7 +275,8 @@ void TaskBar::configure()
         wasDisplayIconsNText != m_displayIconsNText ||
         wasCycleWheel != m_cycleWheel ||
         wasShowOnlyIconified != m_showOnlyIconified ||
-        wasShowTaskStates != m_showTaskStates)
+        wasShowTaskStates != m_showTaskStates ||
+        wasIconSize != m_iconSize)
     {
         // relevant settings changed, update our task containers
         for (TaskContainer::Iterator it = containers.begin();
@@ -275,12 +287,12 @@ void TaskBar::configure()
         }
     }
 
-    if (m_sortByAppPrev != READ_MERGED_TASBKAR_SETTING(sortByApp)) {
-        m_sortByAppPrev = READ_MERGED_TASBKAR_SETTING(sortByApp);
+    if (m_sortByAppPrev != READ_MERGED_TASKBAR_SETTING(sortByApp)) {
+        m_sortByAppPrev = READ_MERGED_TASKBAR_SETTING(sortByApp);
         reSort();
     }
 
-    TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASBKAR_SETTING(showThumbnails));
+    TaskManager::the()->setXCompositeEnabled(READ_MERGED_TASKBAR_SETTING(showThumbnails));
 
     reLayoutEventually();
 }
@@ -374,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()
@@ -409,7 +421,7 @@ void TaskBar::showTaskContainer(TaskContainer* container)
     }
 
     // try to place the container after one of the same app
-    if (READ_MERGED_TASBKAR_SETTING(sortByApp))
+    if (READ_MERGED_TASKBAR_SETTING(sortByApp))
     {
         TaskContainer::Iterator it = containers.begin();
         for (; it != containers.end(); ++it)
@@ -731,14 +743,12 @@ void TaskBar::reLayout()
     // number of rows simply depends on our height which is either the
     // minimum button height or the height of the font in use, whichever is
     // largest
-    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
-    int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
-                          fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+    int minButtonHeight = buttonHeight();
 
     // horizontal layout
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
-        int bwidth=BUTTON_MIN_WIDTH;
+        int bwidth=buttonWidth();
         int rows = contentsRect().height() / minButtonHeight;
         if (rows<1)
           rows=1;
@@ -752,20 +762,20 @@ void TaskBar::reLayout()
         int bpr = static_cast<int>(ceil(static_cast<double>(list.count()) / rows));
 
         // adjust content size
-        if ( contentsRect().width() < bpr * BUTTON_MIN_WIDTH )
+        if ( contentsRect().width() < bpr * bwidth )
         {
-            resizeContents( bpr * BUTTON_MIN_WIDTH, contentsRect().height() );
+            resizeContents( bpr * bwidth, contentsRect().height() );
         }
 
         // maximum number of buttons per row
-        int mbpr = contentsRect().width() / BUTTON_MIN_WIDTH;
+        int mbpr = contentsRect().width() / bwidth;
 
         // expand button width if space permits and the taskbar is not in 'icons only' mode
         if (mbpr > bpr)
         {
             if (!showIcons() || showText())
               bwidth = contentsRect().width() / bpr;
-            int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth);
+            int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth);
             if (maxWidth > 0 && bwidth > maxWidth)
             {
                 bwidth = maxWidth;
@@ -844,7 +854,7 @@ void TaskBar::reLayout()
         }
     }
     
-    TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry()));
+    TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry()));
 }
 
 void TaskBar::setViewportBackground()
@@ -987,9 +997,7 @@ int TaskBar::taskCount() const
 
 int TaskBar::maximumButtonsWithoutShrinking() const
 {
-    TQFontMetrics fm(TDEGlobalSettings::taskbarFont());
-    int minButtonHeight = fm.height() > READ_MERGED_TASBKAR_SETTING(minimumButtonHeight) ?
-                          fm.height() : READ_MERGED_TASBKAR_SETTING(minimumButtonHeight);
+    int minButtonHeight = buttonHeight();
     int rows = contentsRect().height() / minButtonHeight;
 
     if (rows < 1)
@@ -997,9 +1005,9 @@ int TaskBar::maximumButtonsWithoutShrinking() const
         rows = 1;
     }
 
-    if ( orientation() == Qt::Horizontal ) {
+    if ( orientation() == TQt::Horizontal ) {
         // maxWidth of 0 means no max width, drop back to default
-        int maxWidth = READ_MERGED_TASBKAR_SETTING(maximumButtonWidth);
+        int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth);
         if (maxWidth == 0)
         {
             maxWidth = BUTTON_MAX_WIDTH;
@@ -1017,8 +1025,8 @@ int TaskBar::maximumButtonsWithoutShrinking() const
 
 bool TaskBar::shouldGroup() const
 {
-    return READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupAlways ||
-           ((READ_MERGED_TASBKAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull &&
+    return READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupAlways ||
+           ((READ_MERGED_TASKBAR_SETTING(groupTasks) == m_settingsObject->GroupWhenFull &&
              taskCount() > maximumButtonsWithoutShrinking()));
 }
 
@@ -1166,7 +1174,7 @@ void TaskBar::activateNextTask(bool forward)
 void TaskBar::wheelEvent(TQWheelEvent* e)
 {
 
-    if(READ_MERGED_TASBKAR_SETTING(cycleWheel)) {
+    if(READ_MERGED_TASKBAR_SETTING(cycleWheel)) {
 
         if (e->delta() > 0)
         {
@@ -1246,7 +1254,7 @@ TQImage* TaskBar::blendGradient(const TQSize& size)
 
 void TaskBar::sortContainersByDesktop(TaskContainer::List& list)
 {
-    typedef TQValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector;
+    typedef TQValueVector<TQPair<int, TQPair<int, TaskContainer*> > > SortVector;
     SortVector sorted;
     sorted.resize(list.count());
     int i = 0;
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 0ab614a61..dc34129e0 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -70,7 +70,7 @@ namespace TaskMoveDestination
 
 class TaskBar : public Panner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent = 0, const char *name = 0 );
@@ -137,37 +137,40 @@ protected:
     void moveEvent( TQMoveEvent* );
     bool idMatch( const TQString& id1, const TQString& id2 );
     TaskContainer::List filteredContainers();
+    int buttonHeight() const;
+    int buttonWidth() const;
 
 private:
     void sortContainersByDesktop(TaskContainer::List& list);
     void setViewportBackground();
 
-    bool			          blocklayout;
-    bool			          m_showAllWindows;
-    bool			          m_cycleWheel;
-    int 			          m_currentScreen;    // The screen to show, -1 for all screens
-    bool			          m_showOnlyCurrentScreen;
-    bool			          m_sortByDesktop;
+    bool                blocklayout;
+    bool                m_showAllWindows;
+    bool                m_cycleWheel;
+    int                 m_currentScreen;    // The screen to show, -1 for all screens
+    bool                m_showOnlyCurrentScreen;
+    bool                m_sortByDesktop;
     int                 m_displayIconsNText;
-    bool			          m_showOnlyIconified;
-    int				          m_showTaskStates;
-    ArrowType 			    arrowType;
-    TaskContainer::List	containers;
-    TaskContainer::List	m_hiddenContainers;
-    TaskContainer::List	m_deletableContainers;
-    PixmapList			    frames;
+    bool                m_showOnlyIconified;
+    int                 m_showTaskStates;
+    int                 m_iconSize;
+    ArrowType           arrowType;
+    TaskContainer::List containers;
+    TaskContainer::List m_hiddenContainers;
+    TaskContainer::List m_deletableContainers;
+    PixmapList          frames;
     int                 maximumButtonsWithoutShrinking() const;
     bool                shouldGroup() const;
     bool                isGrouping;
     void                reGroup();
     TDEGlobalAccel*     keys;
-    KTextShadowEngine*	m_textShadowEngine;
-    bool			          m_ignoreUpdates;
-    bool			          m_sortByAppPrev;
-    TQTimer			        m_relayoutTimer;
-    TQImage			        m_blendGradient;
-    TaskBarSettings*		m_settingsObject;
-    TaskBarSettings*		m_globalSettingsObject;
+    KTextShadowEngine*  m_textShadowEngine;
+    bool                m_ignoreUpdates;
+    bool                m_sortByAppPrev;
+    TQTimer             m_relayoutTimer;
+    TQImage             m_blendGradient;
+    TaskBarSettings*    m_settingsObject;
+    TaskBarSettings*    m_globalSettingsObject;
 };
 
 #endif
diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg
index 95596ad34..86ea32dca 100644
--- a/kicker/taskbar/taskbar.kcfg
+++ b/kicker/taskbar/taskbar.kcfg
@@ -75,9 +75,9 @@
                     <label>Only Running</label>
                 </choice>
             </choices>
-	    <default>ShowAll</default>
+      <default>ShowAll</default>
             <label>Show tasks with state:</label>
-	    <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis>
+      <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis>
         </entry>
         <entry key="SortByDesktop" type="Bool" >
             <default>true</default>
@@ -91,9 +91,10 @@
         </entry>
         <entry key="MaximumButtonWidth" type="Int" >
             <default>200</default>
-            <min>0</min>
-            <label></label>
-            <whatsthis></whatsthis>
+            <min>50</min>
+            <max>500</max>
+            <label>Maximum button width</label>
+            <whatsthis>The maximum width to which a taskbar item can expand.</whatsthis>
         </entry>
         <entry key="MinimumButtonHeight" type="Int" >
             <default>18</default>
@@ -172,19 +173,20 @@
             <label>Draw taskbar entries "flat" and not as a button</label>
             <whatsthis>Turning this option on will cause the taskbar to draw visible button frames for each entry in the taskbar. By default, this option is off.</whatsthis>
         </entry>
+        <entry key="ShowButtonOnHover" type="Bool" >
+            <default>true</default>
+            <label>Show a visible button frame on the task the cursor is positioned over</label>
+            <whatsthis>Turning this option on will cause the taskbar to draw a visible button frame around the item currently under the mouse. By default, this option is on.</whatsthis>
+        </entry>
         <entry key="HaloText" type="Bool" >
             <default>false</default>
             <label>Draw taskbar text with a halo around it</label>
             <whatsthis>Turning this option on will cause the taskbar to draw fancier text that has an outline around it. While this is useful for transparent panels or particularly dark panel backgrounds, it is slower.</whatsthis>
         </entry>
-        <entry key="ShowButtonOnHover" type="Bool" >
-            <default>true</default>
-            <label>Show a visible button frame on the task the cursor is positioned over</label>
-        </entry>
         <entry key="ShowThumbnails" type="Bool" >
             <default>false</default>
             <label>Show thumbnails instead of icons in the mouse-over effects</label>
-            <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively.</p></whatsthis>
+            <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively. This options needs a TWin compositor in order to work.</p></whatsthis>
         </entry>
         <entry key="ThumbnailMaxDimension" type="UInt" >
             <default>100</default>
@@ -198,18 +200,21 @@
         </entry>
         <entry name="ActiveTaskTextColor" type="Color" >
             <label>Color to use for active task button text</label>
-            <default code="true">QColor()</default>
+            <default code="true">TQColor()</default>
             <whatsthis>This color is used for displaying text on taskbar button for task which is active at the moment.</whatsthis>
         </entry>
         <entry name="InactiveTaskTextColor" type="Color" >
             <label>Color to use for inactive tasks button text</label>
-            <default code="true">QColor()</default>
+            <default code="true">TQColor()</default>
             <whatsthis>This color is used for displaying text on taskbar button for tasks other than active.</whatsthis>
         </entry>
         <entry name="TaskBackgroundColor" type="Color" >
             <label>Color to use for taskbar buttons background</label>
-            <default code="true">QColor()</default>
+            <default code="true">TQColor()</default>
             <whatsthis>This color is used for displaying background of taskbar buttons.</whatsthis>
         </entry>
+        <entry name="IconSize" type="UInt" >
+            <default>16</default>
+        </entry>
     </group>
 </kcfg>
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 a891cf64e..efde7dd2c 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -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;
@@ -207,7 +207,7 @@ void TaskBarContainer::preferences()
 
 void TaskBarContainer::orientationChange(Orientation o)
 {
-    if (o == Qt::Horizontal)
+    if (o == TQt::Horizontal)
      {
         if (windowListButton)
         {
@@ -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 7fc13241f..a8b078d67 100644
--- a/kicker/taskbar/taskbarcontainer.h
+++ b/kicker/taskbar/taskbarcontainer.h
@@ -38,7 +38,7 @@ class TaskBarSettings;
 
 class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index cc533f0b9..5a8464cd5 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -26,6 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <assert.h>
 
+#ifdef Q_OS_SOLARIS
+#include <procfs.h>
+#endif /* SunOS */
+
 #include <tqbitmap.h>
 #include <tqcolor.h>
 #include <tqcursor.h>
@@ -45,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>
@@ -62,8 +66,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "taskcontainer.h"
 #include "taskcontainer.moc"
 
-#define READ_MERGED_TASBKAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
-#define READ_MERGED_TASBKAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x))
+#define READ_MERGED_TASKBAR_SETTING(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->x():m_settingsObject->x())
+#define READ_MERGED_TASKBAR_ACTION(x) ((m_settingsObject->useGlobalSettings())?m_globalSettingsObject->action(x):m_settingsObject->action(x))
 
 static Bool netwm_atoms_created = False;
 static Atom net_wm_pid = 0;
@@ -96,6 +100,18 @@ static void create_atoms(Display *d) {
 }
 
 bool is_process_resumable(pid_t pid) {
+#ifdef Q_OS_SOLARIS
+	TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid));
+	if (procStatFile.open(IO_ReadOnly)) {
+		TQByteArray statRaw = procStatFile.readAll();
+		lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data();
+
+		procStatFile.close();
+		if( inf->pr_sname == 'T' ) {
+			return true;
+		}
+	}
+#else /* default */
 	TQFile procStatFile(TQString("/proc/%1/stat").arg(pid));
 	if (procStatFile.open(IO_ReadOnly)) {
 		TQByteArray statRaw = procStatFile.readAll();
@@ -107,13 +123,9 @@ bool is_process_resumable(pid_t pid) {
 		if( state == "T" ) {
 			return true;
 		}
-		else {
-			return false;
-		}
-	}
-	else {
-		return false;
 	}
+#endif /* read process status */
+	return false;
 }
 
 TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name)
@@ -174,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);
 }
@@ -192,16 +204,18 @@ void TaskContainer::init()
 
     if (!netwm_atoms_created) create_atoms(TQPaintDevice::x11AppDisplay());
 
+    int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
     setWFlags(TQt::WNoAutoErase);
     setBackgroundMode(NoBackground);
-    animBg = TQPixmap(16, 16);
+    animBg = TQPixmap(iconSize, iconSize);
 
     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()
@@ -221,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()
@@ -242,7 +256,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
         return;
     }
 
-    const TQObject* source = TQT_TQOBJECT_CONST(sender());
+    const TQObject* source = sender();
     Task::Ptr task = 0;
     Task::List::const_iterator itEnd = tasks.constEnd();
     for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -265,7 +279,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
 
 void TaskContainer::iconChanged()
 {
-    const TQObject* source = TQT_TQOBJECT_CONST(sender());
+    const TQObject* source = sender();
     Task::Ptr task = 0;
     Task::List::const_iterator itEnd = tasks.constEnd();
     for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -366,11 +380,11 @@ void TaskContainer::checkAttention(const Task::Ptr t)
 void TaskContainer::attentionTimerFired()
 {
     assert( attentionState != -1 );
-    if (attentionState < READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations)*2)
+    if (attentionState < READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations)*2)
     {
         ++attentionState;
     }
-    else if (READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) < 1000)
+    else if (READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) < 1000)
     {
         attentionTimer.stop();
     }
@@ -390,9 +404,22 @@ TQSizePolicy TaskContainer::sizePolicy() const
 
 void TaskContainer::resizeEvent( TQResizeEvent * )
 {
-    // calculate the icon rect
-    TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
-    iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
+    recalculateIconRect();
+}
+
+void TaskContainer::recalculateIconRect()
+{
+    iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
+    if(taskBar->showText())
+    {
+        TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
+        iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - iconSize) / 2, iconSize, iconSize), this );
+    }
+    else
+    {
+        iconRect = TQStyle::visualRect( TQRect((width() - iconSize) / 2, (height() - iconSize) / 2, iconSize, iconSize), this );
+    }
 }
 
 void TaskContainer::add(Task::Ptr task)
@@ -415,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)
@@ -581,13 +608,14 @@ void TaskContainer::drawButton(TQPainter *p)
     TQPixmap *pm((TQPixmap*)p->device());
     TQPixmap pixmap; // icon
     Task::Ptr task = 0;
-    bool iconified = !READ_MERGED_TASBKAR_SETTING(showOnlyIconified);
-    bool halo = READ_MERGED_TASBKAR_SETTING(haloText);
-    bool alwaysDrawButtons = READ_MERGED_TASBKAR_SETTING(drawButtons);
+    bool iconified = !READ_MERGED_TASKBAR_SETTING(showOnlyIconified);
+    bool halo = READ_MERGED_TASKBAR_SETTING(haloText);
+    bool alwaysDrawButtons = READ_MERGED_TASKBAR_SETTING(drawButtons);
     bool drawButton = alwaysDrawButtons ||
                       (m_mouseOver && !halo && isEnabled() &&
-                       READ_MERGED_TASBKAR_SETTING(showButtonOnHover));
+                       READ_MERGED_TASKBAR_SETTING(showButtonOnHover));
     TQFont font(TDEGlobalSettings::taskbarFont());
+    recalculateIconRect();
 
     // draw sunken if we contain the active task
     bool active = false;
@@ -608,7 +636,7 @@ void TaskContainer::drawButton(TQPainter *p)
 
         if (task->demandsAttention())
         {
-            demandsAttention = attentionState == READ_MERGED_TASBKAR_SETTING(attentionBlinkIterations) ||
+            demandsAttention = attentionState == READ_MERGED_TASKBAR_SETTING(attentionBlinkIterations) ||
                                attentionState % 2 == 0;
         }
     }
@@ -616,15 +644,15 @@ void TaskContainer::drawButton(TQPainter *p)
     font.setBold(active);
 
     TQColorGroup colors = palette().active();
-    
-    if (READ_MERGED_TASBKAR_SETTING(useCustomColors))
+
+    if (READ_MERGED_TASKBAR_SETTING(useCustomColors))
     {
-        colors.setColor( TQColorGroup::Button, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor));
-        colors.setColor( TQColorGroup::Background, READ_MERGED_TASBKAR_SETTING(taskBackgroundColor) );
-        colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) );
-        colors.setColor( TQColorGroup::Text, READ_MERGED_TASBKAR_SETTING(inactiveTaskTextColor) );
+        colors.setColor( TQColorGroup::Button, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor));
+        colors.setColor( TQColorGroup::Background, READ_MERGED_TASKBAR_SETTING(taskBackgroundColor) );
+        colors.setColor( TQColorGroup::ButtonText, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) );
+        colors.setColor( TQColorGroup::Text, READ_MERGED_TASKBAR_SETTING(inactiveTaskTextColor) );
     }
-    
+
     if (demandsAttention)
     {
         if (!drawButton)
@@ -638,7 +666,7 @@ void TaskContainer::drawButton(TQPainter *p)
             for (int i = 0; i < 2; ++i)
             {
                 line = KickerLib::blendColors(line, colors.background());
-                p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+                p->setPen(TQPen(line, 1, TQt::SolidLine, TQt::RoundCap, TQt::RoundJoin));
                 r.addCoords(-1, -1, 1, 1);
                 p->drawRect(r);
             }
@@ -659,7 +687,7 @@ void TaskContainer::drawButton(TQPainter *p)
     // get the task icon
     if (task)
     {
-        pixmap = task->pixmap();
+        pixmap = task->icon(iconSize, iconSize, true);
     }
 
     bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
@@ -671,13 +699,13 @@ void TaskContainer::drawButton(TQPainter *p)
     // draw button background
     if (drawButton)
     {
-        if (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) {
-            style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
+        if (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) {
+            style().drawPrimitive(TQStyle::PE_ButtonBevel, p,
                               TQRect(1, 1, width()-3, height()-2),
                               colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised);
         }
         else {
-            style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
+            style().drawPrimitive(TQStyle::PE_ButtonTool, p,
                               TQRect(1, 1, width()-2, height()-2),
                               colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised);
         }
@@ -690,21 +718,21 @@ void TaskContainer::drawButton(TQPainter *p)
     }
 
     TQString text = name();  // find text
-    int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + 16 + 2 : 0;
+    int textPos = ( taskBar->showIcons() && (!pixmap.isNull() || m_startup)) ? 2 + iconSize + 2 : 0;
 
     // show icons
     if (taskBar->showIcons())
     {
       if (pixmap.isNull() && m_startup)
-          pixmap = SmallIcon(m_startup->icon());
+          pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
 
       if ( !pixmap.isNull() )
       {
-          // make sure it is no larger than 16x16
-          if ( pixmap.width() > 16 || pixmap.height() > 16 )
+          // make sure it is no larger than icon size
+          if ( pixmap.width() > iconSize || pixmap.height() > iconSize )
           {
               TQImage tmp = pixmap.convertToImage();
-              pixmap.convertFromImage( tmp.smoothScale( 16, 16 ) );
+              pixmap.convertFromImage( tmp.smoothScale( iconSize, iconSize ) );
           }
 
           // fade out the icon when minimized
@@ -718,28 +746,36 @@ void TaskContainer::drawButton(TQPainter *p)
       }
 
       // modified overlay icon
-      if (taskBar->showText())
+      static TQString modStr = "[" + i18n( "modified" ) + "]";
+      int modStrPos = text.find( modStr );
+      if (modStrPos >= 0)
       {
-        static TQString modStr = "[" + i18n( "modified" ) + "]";
-        int modStrPos = text.find( modStr );
-        if (modStrPos >= 0)
+        TQRect r;
+        TQPixmap modPixmap = SmallIcon("modified");
+        if (iconified)
         {
-          // +1 because we include a space after the closing brace.
-          text.remove(modStrPos, modStr.length() + 1);
-          TQPixmap modPixmap = SmallIcon("modified");
+            TDEIconEffect::semiTransparent(modPixmap);
+        }
 
-          // draw modified overlay
-          if (!modPixmap.isNull())
-          {
-            TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - 16) / 2, 16, 16), this);
-            if (iconified)
+        if (taskBar->showText()) // has text
+        {
+            // +1 because we include a space after the closing brace.
+            text.remove(modStrPos, modStr.length() + 1);
+
+            // draw modified overlay
+            if (!modPixmap.isNull())
             {
-              TDEIconEffect::semiTransparent(modPixmap);
+                r = TQStyle::visualRect(TQRect(br.x() + textPos,(height() - iconSize) / 2, iconSize, iconSize), this);
+                textPos += iconSize + 2;
             }
-            p->drawPixmap(r, modPixmap);
-            textPos += 16 + 2;
-          }
-        }
+         }
+         else if (taskBar->showIcons()) // has only icon
+         {
+             r = TQRect(0, 0, iconSize / 2, iconSize / 2);
+             r.moveBottomRight(iconRect.bottomRight());
+         }
+
+         p->drawPixmap(r, modPixmap);
       }
     }
 
@@ -765,9 +801,9 @@ void TaskContainer::drawButton(TQPainter *p)
           }
           else // hack for the dotNET style and others
           {
-              if (READ_MERGED_TASBKAR_SETTING(useCustomColors))
+              if (READ_MERGED_TASKBAR_SETTING(useCustomColors))
               {
-                  textPen = TQPen(READ_MERGED_TASBKAR_SETTING(activeTaskTextColor));
+                  textPen = TQPen(READ_MERGED_TASKBAR_SETTING(activeTaskTextColor));
               }
               else
               {
@@ -775,7 +811,7 @@ void TaskContainer::drawButton(TQPainter *p)
               }
           }
 
-          int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0;
+          int availableWidth = width() - (br.x() * 2) - textPos - 2 - (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())?2:0;
           if (m_filteredTasks.count() > 1)
           {
               availableWidth -= 8;
@@ -852,16 +888,16 @@ void TaskContainer::drawButton(TQPainter *p)
     }
 
     // draw popup arrow
-    if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASBKAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())))
+    if ((m_filteredTasks.count() > 1) && (!(READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons())))
     {
         TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft;
 
         switch (arrowType)
         {
-            case Qt::LeftArrow:  e = TQStyle::PE_ArrowLeft;  break;
-            case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break;
-            case Qt::UpArrow:    e = TQStyle::PE_ArrowUp;    break;
-            case Qt::DownArrow:  e = TQStyle::PE_ArrowDown;  break;
+            case TQt::LeftArrow:  e = TQStyle::PE_ArrowLeft;  break;
+            case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break;
+            case TQt::UpArrow:    e = TQStyle::PE_ArrowUp;    break;
+            case TQt::DownArrow:  e = TQStyle::PE_ArrowDown;  break;
         }
 
         int flags = TQStyle::Style_Enabled;
@@ -872,7 +908,7 @@ void TaskContainer::drawButton(TQPainter *p)
             flags |= TQStyle::Style_Down;
         }
 
-        style().tqdrawPrimitive(e, p, ar, colors, flags);
+        style().drawPrimitive(e, p, ar, colors, flags);
     }
     
     // draw mouse over frame in transparent mode
@@ -979,7 +1015,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
         return;
     }
 
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         m_dragStartPos = e->pos();
     }
@@ -994,15 +1030,15 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
     // Other actions will be handled in mouseReleaseEvent
     switch (e->button())
     {
-        case Qt::LeftButton:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton);
+        case TQt::LeftButton:
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
             break;
-        case Qt::MidButton:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton);
+        case TQt::MidButton:
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
             break;
-        case Qt::RightButton:
+        case TQt::RightButton:
         default:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton);
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
             break;
     }
 
@@ -1018,14 +1054,14 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
 {
     m_dragStartPos = TQPoint();
 
-    if (!READ_MERGED_TASBKAR_SETTING(drawButtons))
+    if (!READ_MERGED_TASKBAR_SETTING(drawButtons))
     {
         setDown(false);
     }
 
     // This is to avoid the flicker caused by redrawing the
     // button as unpressed just before it's activated.
-    if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos()))
+    if (!rect().contains(e->pos()))
     {
         TQToolButton::mouseReleaseEvent(e);
         return;
@@ -1035,15 +1071,15 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
 
     switch (e->button())
     {
-        case Qt::LeftButton:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->LeftButton);
+        case TQt::LeftButton:
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
             break;
-        case Qt::MidButton:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->MiddleButton);
+        case TQt::MidButton:
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
             break;
-        case Qt::RightButton:
+        case TQt::RightButton:
         default:
-            buttonAction = READ_MERGED_TASBKAR_ACTION(m_settingsObject->RightButton);
+            buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
             break;
     }
 
@@ -1061,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)
@@ -1223,7 +1259,7 @@ void TaskContainer::popupMenu(int action)
             return;
         }
 
-        m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL);
+        m_menu = new TaskRMBMenu(m_filteredTasks, taskBar->showAllWindows(), (READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange))?makeTaskMoveMenu():NULL);
     }
     else
     {
@@ -1274,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;
@@ -1328,11 +1364,6 @@ void TaskContainer::mouseMoveEvent( TQMouseEvent* e )
 
 bool TaskContainer::startDrag(const TQPoint& pos)
 {
-    if (m_filteredTasks.count() != 1)
-    {
-        return false;
-    }
-
     int delay = TDEGlobalSettings::dndEventDelay();
 
     if ((m_dragStartPos - pos).manhattanLength() > delay)
@@ -1375,7 +1406,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
             if ( TQApplication::widgetAt( p, true ) == this )
             {
                 if (me->type() == TQEvent::MouseButtonPress &&
-                    me->button() == Qt::LeftButton)
+                    me->button() == TQt::LeftButton)
                 {
                     m_dragStartPos = mapFromGlobal(p);
                 }
@@ -1393,10 +1424,10 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
         {
             if (!m_dragStartPos.isNull())
             {
-                TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+                TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
                 TQPoint p(me->globalPos());
 
-                if (me->state() & Qt::LeftButton &&
+                if (me->state() & TQt::LeftButton &&
                     TQApplication::widgetAt(p, true) == this)
                 {
                     kdDebug() << "event move" << endl;
@@ -1452,7 +1483,7 @@ void TaskContainer::dragEnterEvent( TQDragEnterEvent* e )
         return;
     }
 
-    if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp)))
+    if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp)))
     {
         e->accept();
     }
@@ -1480,7 +1511,7 @@ void TaskContainer::dropEvent( TQDropEvent* e )
         return;
     }
 
-    if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp)))
+    if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASKBAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASKBAR_SETTING(sortByApp)))
     {
         if (taskBar->taskMoveHandler(TaskMoveDestination::Position, TaskDrag::decode(e), TQWidget::mapTo(taskBar, e->pos()))) {
             e->accept();
@@ -1631,10 +1662,10 @@ void TaskContainer::updateFilteredTaskList()
     {
         Task::Ptr t = *it;
         if ((taskBar->showAllWindows() || t->isOnCurrentDesktop()) &&
-            (!READ_MERGED_TASBKAR_SETTING(showOnlyIconified) || t->isIconified()))
+            (!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;
@@ -1652,15 +1683,15 @@ void TaskContainer::updateFilteredTaskList()
             if (pid < 0) {
                 m_filteredTasks.append(t);
             }
-            else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) {
+            else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) != m_settingsObject->ShowAll) {
                 if (is_process_resumable(pid)) {
-                    if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
+                    if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
                         m_filteredTasks.append(t);
                     }
-                    else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
+                    else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
                         m_filteredTasks.append(t);
                     }
-                    else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
+                    else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
                         t->publishIconGeometry( TQRect());
                     }
                     else {
@@ -1668,13 +1699,13 @@ void TaskContainer::updateFilteredTaskList()
                     }
                 }
                 else {
-                    if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
+                    if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowAll) {
                         m_filteredTasks.append(t);
                     }
-                    else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
+                    else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowStopped) {
                         t->publishIconGeometry( TQRect());
                     }
-                    else if (READ_MERGED_TASBKAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
+                    else if (READ_MERGED_TASKBAR_SETTING(showTaskStates) == m_settingsObject->ShowRunning) {
                         m_filteredTasks.append(t);
                     }
                     else {
@@ -1695,7 +1726,7 @@ void TaskContainer::updateFilteredTaskList()
     // sort container list by desktop
     if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1)
     {
-        TQValueVector<QPair<int, Task::Ptr> > sorted;
+        TQValueVector<TQPair<int, Task::Ptr> > sorted;
         sorted.resize(m_filteredTasks.count());
         int i = 0;
 
@@ -1710,7 +1741,7 @@ void TaskContainer::updateFilteredTaskList()
         qHeapSort(sorted);
 
         m_filteredTasks.clear();
-        for (TQValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin();
+        for (TQValueVector<TQPair<int, Task::Ptr> >::iterator it = sorted.begin();
              it != sorted.end();
              ++it)
         {
@@ -1742,6 +1773,8 @@ void TaskContainer::settingsChanged()
 
 void TaskContainer::updateKickerTip(KickerTip::Data& data)
 {
+    int iconSize = READ_MERGED_TASKBAR_SETTING(iconSize);
+
     if (m_startup)
     {
         data.message = m_startup->text();
@@ -1749,7 +1782,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
         data.subtext = i18n("Loading application ...");
         data.icon = TDEGlobal::iconLoader()->loadIcon(m_startup->icon(),
                                                     TDEIcon::Small,
-                                                    TDEIcon::SizeMedium,
+						    iconSize,
                                                     TDEIcon::DefaultState,
                                                     0, true);
         return;
@@ -1761,21 +1794,18 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
     
     if (m_filteredTasks.count() > 0)
     {
-        if (READ_MERGED_TASBKAR_SETTING(showThumbnails) &&
+        if (READ_MERGED_TASKBAR_SETTING(showThumbnails) &&
             m_filteredTasks.count() == 1)
         {
             Task::Ptr t = m_filteredTasks.first();
     
-            pixmap = t->thumbnail(READ_MERGED_TASBKAR_SETTING(thumbnailMaxDimension));
+            pixmap = t->thumbnail(READ_MERGED_TASKBAR_SETTING(thumbnailMaxDimension));
         }
     
         if (pixmap.isNull() && tasks.count())
         {
             // try to load icon via net_wm
-            pixmap = KWin::icon(tasks.last()->window(),
-                                TDEIcon::SizeMedium,
-                                TDEIcon::SizeMedium,
-                                true);
+            pixmap = KWin::icon(tasks.last()->window(), iconSize, iconSize, true);
         }
     
         // Collect all desktops the tasks are on. Sort naturally.
@@ -1809,7 +1839,7 @@ void TaskContainer::updateKickerTip(KickerTip::Data& data)
             }
         }
     
-        if (READ_MERGED_TASBKAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1)
+        if (READ_MERGED_TASKBAR_SETTING(showAllWindows) && KWin::numberOfDesktops() > 1)
         {
             if (desktopMap.isEmpty())
             {
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h
index edaf337b4..0ae864185 100644
--- a/kicker/taskbar/taskcontainer.h
+++ b/kicker/taskbar/taskcontainer.h
@@ -39,7 +39,7 @@ typedef TQValueList<TQPixmap*> PixmapList;
 
 class TaskContainer : public TQToolButton, public KickerTip::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     typedef TQValueList<TaskContainer*> List;
@@ -117,6 +117,8 @@ protected:
     void popupMenu(int);
 
     void updateFilteredTaskList();
+    void updateIconSize();
+    void recalculateIconRect();
 
 protected slots:
     void animationTimerFired();
@@ -144,6 +146,7 @@ private:
     PixmapList                  frames;
     int                         attentionState;
     TQRect                      iconRect;
+    int                         iconSize;
     TQPixmap                    animBg;
     Task::List                  tasks;
     Task::List                  m_filteredTasks;
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 1be54ca8b..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);
     }
 }
@@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch()
 
 void TaskLMBMenu::mousePressEvent( TQMouseEvent* e )
 {
-    if (e->button() == Qt::LeftButton)
+    if (e->button() == TQt::LeftButton)
     {
         m_dragStartPos = e->pos();
     }
diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h
index 7eedc115b..4c20819b6 100644
--- a/kicker/taskmanager/tasklmbmenu.h
+++ b/kicker/taskmanager/tasklmbmenu.h
@@ -53,7 +53,7 @@ private:
 
 class KDE_EXPORT TaskLMBMenu : public TQPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TaskLMBMenu(const Task::List& list, TQWidget *parent = 0, const char *name = 0);
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 33df1ddd6..54bf6d919 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -61,16 +61,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 +99,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 +1305,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 +1313,7 @@ void Task::updateThumbnail()
 
     if (!_grab.isNull())
     {
-       TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail()));
+       TQTimer::singleShot(200, this, TQ_SLOT(generateThumbnail()));
     }
 }
 
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 2753218c8..3771d29a6 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -70,7 +70,7 @@ typedef TQValueList<WId> WindowList;
  */
 class KDE_EXPORT Task: public TQObject, public TDEShared
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName )
     TQ_PROPERTY( TQString iconicName READ iconicName )
     TQ_PROPERTY( TQString visibleIconicNameWithState READ visibleIconicNameWithState )
@@ -513,7 +513,7 @@ public:
  */
 class KDE_EXPORT Startup: public TQObject, public TDEShared
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString text READ text )
     TQ_PROPERTY( TQString bin READ bin )
     TQ_PROPERTY( TQString icon READ icon )
@@ -567,7 +567,7 @@ private:
  */
 class KDE_EXPORT TaskManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( int currentDesktop READ currentDesktop )
     TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops )
 
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index 58682196b..943160d26 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -78,7 +78,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,21 +88,21 @@ 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));
 
@@ -115,28 +115,28 @@ void TaskRMBMenu::fillMenu(Task::Ptr t)
         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));
 }
 
 void TaskRMBMenu::fillMenu()
 {
-	int id;
-	setCheckable( true );
+    int id;
+    setCheckable( true );
 
     Task::List::iterator itEnd = tasks.end();
     for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it)
     {
-		Task::Ptr t = (*it);
+        Task::Ptr t = (*it);
 
-		id = insertItem( TQIconSet( t->pixmap() ),
-				 t->visibleNameWithState(),
-		                 new TaskRMBMenu(t, this) );
-		setItemChecked( id, t->isActive() );
-		connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) );
-	}
+        id = insertItem( TQIconSet( t->pixmap() ),
+                         t->visibleNameWithState(),
+		         new TaskRMBMenu(t, this) );
+        setItemChecked( id, t->isActive() );
+        connectItem( id, t, TQ_SLOT( activateRaiseOrIconify() ) );
+    }
 
-	insertSeparator();
+    insertSeparator();
 
     bool enable = false;
 
@@ -144,7 +144,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,48 +159,55 @@ 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)
     {
-		if( !(*it)->isIconified() ) {
-			enable = true;
-			break;
-		}
-	}
-	setItemEnabled( id, enable );
+        if( !(*it)->isIconified() ) {
+            enable = true;
+            break;
+        }
+    }
+    setItemEnabled( id, enable );
 
-	enable = false;
+    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)
     {
         if( !(*it)->isMaximized() ) {
-			enable = true;
-			break;
-		}
-	}
-	setItemEnabled( id, enable );
+            enable = true;
+            break;
+        }
+    }
+    setItemEnabled( id, enable );
 
-	enable = false;
+    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)
     {
-		if( (*it)->isIconified() || (*it)->isMaximized() ) {
-			enable = true;
-			break;
-		}
-	}
-	setItemEnabled( id, enable );
+        if( (*it)->isIconified() || (*it)->isMaximized() ) {
+            enable = true;
+            break;
+        }
+    }
+    setItemEnabled( id, enable );
+
+    insertSeparator();
+
+    enable = false;
 
-	insertSeparator();
+    if (taskMoveMenu) {
+        taskMoveMenu->reparent(this, taskMoveMenu->getWFlags(), taskMoveMenu->geometry().topLeft(), FALSE);
+        insertItem(i18n("Move Task Button"), taskMoveMenu);
 
-	enable = false;
+        insertSeparator();
+    }
 
-	insertItem( SmallIcon( "remove" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) );
+    insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQ_SLOT( slotCloseAll() ) );
 }
 
 TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t)
@@ -212,17 +219,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())
@@ -238,7 +245,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() );
 
@@ -246,7 +253,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 );
 	}
@@ -259,14 +266,14 @@ 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 );
 	}
 
diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h
index 76b209ca7..a73d83d3a 100644
--- a/kicker/taskmanager/taskrmbmenu.h
+++ b/kicker/taskmanager/taskrmbmenu.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class KDE_EXPORT TaskRMBMenu : public TQPopupMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TaskRMBMenu(const Task::List&, bool showAll = true, TQPopupMenu* moveMenu = NULL, TQWidget *parent = 0, const char *name = 0);
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index aaaf95232..ac47f4d9b 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) by Andrew Stanley-Jones
    Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
diff --git a/klipper/applet.h b/klipper/applet.h
index 3f1ee3361..acf4e1083 100644
--- a/klipper/applet.h
+++ b/klipper/applet.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
 
    Copyright (C) Andrew Stanley-Jones
@@ -29,7 +28,7 @@ class KlipperAppletWidget;
 
 class KlipperApplet : public KPanelApplet
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
     KlipperApplet(const TQString& configFile, Type t = Normal, int actions = 0,
                   TQWidget *parent = 0, const char *name = 0);
@@ -50,7 +49,7 @@ private:
 
 class KlipperAppletWidget : public KlipperWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 k_dcop:
     int newInstance();
diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp
index cc2f3877f..a2f5368a8 100644
--- a/klipper/clipboardpoll.cpp
+++ b/klipper/clipboardpoll.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
 
    Copyright (C) 2003 by Lubos Lunak <l.lunak@kde.org>
@@ -109,13 +108,13 @@ 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( kapp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged()));
+    connect( kapp->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;
-    selection.last_change = clipboard.last_change = GET_QT_X_TIME(); // don't trigger right after startup
+    selection.last_change = clipboard.last_change = get_tqt_x_time(); // don't trigger right after startup
     selection.last_owner = XGetSelectionOwner( tqt_xdisplay(), XA_PRIMARY );
 #ifdef NOISY_KLIPPER_
     kdDebug() << "(1) Setting last_owner for =" << "selection" << ":" << selection.last_owner << endl;
@@ -152,7 +151,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
 #ifdef NOISY_KLIPPER_
             kdDebug() << "SELECTION CHANGED (XFIXES)" << endl;
 #endif
-            SET_QT_X_TIME(ev->timestamp);
+            set_tqt_x_time(ev->timestamp);
             emit clipboardChanged( true );
         }
         else if( ev->selection == xa_clipboard && !kapp->clipboard()->ownsClipboard())
@@ -160,7 +159,7 @@ bool ClipboardPoll::x11Event( XEvent* e )
 #ifdef NOISY_KLIPPER_
             kdDebug() << "CLIPBOARD CHANGED (XFIXES)" << endl;
 #endif
-            SET_QT_X_TIME(ev->timestamp);
+            set_tqt_x_time(ev->timestamp);
             emit clipboardChanged( false );
         }
     }
@@ -270,9 +269,9 @@ bool ClipboardPoll::checkTimestamp( SelectionData& data )
         return false;
     }
     XDeleteProperty( tqt_xdisplay(), winId(), data.timestamp_atom );
-    XConvertSelection( tqt_xdisplay(), data.atom, xa_timestamp, data.timestamp_atom, winId(), GET_QT_X_TIME() );
+    XConvertSelection( tqt_xdisplay(), data.atom, xa_timestamp, data.timestamp_atom, winId(), get_tqt_x_time() );
     data.waiting_for_timestamp = true;
-    data.waiting_x_time = GET_QT_X_TIME();
+    data.waiting_x_time = get_tqt_x_time();
 #ifdef REALLY_NOISY_KLIPPER_
     kdDebug() << "WAITING TIMESTAMP:" << ( data.atom == XA_PRIMARY ) << endl;
 #endif
diff --git a/klipper/clipboardpoll.h b/klipper/clipboardpoll.h
index f0579a4cb..a8d078e35 100644
--- a/klipper/clipboardpoll.h
+++ b/klipper/clipboardpoll.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2003 by Lubos Lunak <l.lunak@kde.org>
 
@@ -28,7 +27,7 @@
 class ClipboardPoll
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         ClipboardPoll( TQWidget* parent );
     signals:
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index ad1ad93f0..0dfc7ede1 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
 
@@ -159,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
@@ -202,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 ) );
@@ -244,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;
@@ -292,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 );
@@ -305,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/configdialog.h b/klipper/configdialog.h
index 345a9f052..fec1f7eaa 100644
--- a/klipper/configdialog.h
+++ b/klipper/configdialog.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
 
@@ -44,7 +43,7 @@ class ConfigDialog;
 
 class GeneralWidget : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class ConfigDialog;
 
@@ -68,7 +67,7 @@ private:
 // only for use inside ActionWidget
 class AdvancedWidget : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     AdvancedWidget( TQWidget *parent = 0L, const char *name = 0L );
@@ -83,7 +82,7 @@ private:
 
 class ActionWidget : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class ConfigDialog;
 
@@ -119,7 +118,7 @@ private:
 
 /*class KeysWidget : public QVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class ConfigDialog;
 
@@ -134,7 +133,7 @@ private:
 
 class ConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConfigDialog( const ActionList *list, TDEGlobalAccel *accel, bool isApplet );
diff --git a/klipper/history.cpp b/klipper/history.cpp
index a02b37156..99db4eaba 100644
--- a/klipper/history.cpp
+++ b/klipper/history.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
    Copyright (C) by Andrew Stanley-Jones
@@ -30,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/history.h b/klipper/history.h
index 405041e0e..eaa7e58f3 100644
--- a/klipper/history.h
+++ b/klipper/history.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
    Copyright (C) Andrew Stanley-Jones
@@ -32,7 +31,7 @@ class QptrListIterator;
 
 class History : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     History( TQWidget* parent, const char* name );
     ~History();
diff --git a/klipper/historyimageitem.cpp b/klipper/historyimageitem.cpp
index 38767b42c..7c1cd858a 100644
--- a/klipper/historyimageitem.cpp
+++ b/klipper/historyimageitem.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
diff --git a/klipper/historyimageitem.h b/klipper/historyimageitem.h
index f9a79d89c..fee81d1eb 100644
--- a/klipper/historyimageitem.h
+++ b/klipper/historyimageitem.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp
index e035856d7..9b592fb0c 100644
--- a/klipper/historyitem.cpp
+++ b/klipper/historyitem.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
diff --git a/klipper/historyitem.h b/klipper/historyitem.h
index b0ab0bc53..2dba8a4e1 100644
--- a/klipper/historyitem.h
+++ b/klipper/historyitem.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
diff --git a/klipper/historystringitem.cpp b/klipper/historystringitem.cpp
index 85a4ede4d..154b8d539 100644
--- a/klipper/historystringitem.cpp
+++ b/klipper/historystringitem.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
diff --git a/klipper/historystringitem.h b/klipper/historystringitem.h
index a142fbe2e..e4d80b033 100644
--- a/klipper/historystringitem.h
+++ b/klipper/historystringitem.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp
index ea8fb7ffd..648084893 100644
--- a/klipper/historyurlitem.cpp
+++ b/klipper/historyurlitem.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
diff --git a/klipper/historyurlitem.h b/klipper/historyurlitem.h
index 7908721c8..54a40c069 100644
--- a/klipper/historyurlitem.h
+++ b/klipper/historyurlitem.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp
index 7029d4411..8db1f5fe8 100644
--- a/klipper/klipperbindings.cpp
+++ b/klipper/klipperbindings.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) by Andrew Stanley-Jones
 
@@ -19,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 )
@@ -28,9 +27,9 @@
 
 	keys->insert( "Program:klipper", i18n("Clipboard") );
 
-	DEF( I18N_NOOP("Show Klipper Popup-Menu"), ALT+CTRL+Qt::Key_V, WIN+CTRL+Qt::Key_V, slotPopupMenu() );
-	DEF( I18N_NOOP("Manually Invoke Action on Current Clipboard"), ALT+CTRL+Qt::Key_R, WIN+CTRL+Qt::Key_R, slotRepeatAction() );
-	DEF( I18N_NOOP("Enable/Disable Clipboard Actions"), ALT+CTRL+Qt::Key_X, WIN+CTRL+Qt::Key_X, toggleURLGrabber() );
+	DEF( I18N_NOOP("Show Klipper Popup-Menu"), ALT+CTRL+TQt::Key_V, WIN+CTRL+TQt::Key_V, slotPopupMenu() );
+	DEF( I18N_NOOP("Manually Invoke Action on Current Clipboard"), ALT+CTRL+TQt::Key_R, WIN+CTRL+TQt::Key_R, slotRepeatAction() );
+	DEF( I18N_NOOP("Enable/Disable Clipboard Actions"), ALT+CTRL+TQt::Key_X, WIN+CTRL+TQt::Key_X, toggleURLGrabber() );
 
 #undef DEF
 #undef WIN
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index 5ca29ef4f..38cd51aa5 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
    Copyright (C) by Andrew Stanley-Jones
@@ -46,16 +45,16 @@ namespace {
 #ifdef DEBUG_EVENTS__
 kdbgstream& operator<<( kdbgstream& stream,  const TQKeyEvent& e ) {
     stream << "(TQKeyEvent(text=" << e.text() << ",key=" << e.key() << ( e.isAccepted()?",accepted":",ignored)" ) << ",count=" << e.count();
-    if ( e.state() & Qt::AltButton ) {
+    if ( e.state() & TQt::AltButton ) {
         stream << ",ALT";
     }
-    if ( e.state() & Qt::ControlButton ) {
+    if ( e.state() & TQt::ControlButton ) {
         stream << ",CTRL";
     }
-    if ( e.state() & Qt::MetaButton ) {
+    if ( e.state() & TQt::MetaButton ) {
         stream << ",META";
     }
-    if ( e.state() & Qt::ShiftButton ) {
+    if ( e.state() & TQt::ShiftButton ) {
         stream << ",SHIFT";
     }
     if ( e.isAutoRepeat() ) {
@@ -113,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() {
@@ -146,7 +145,7 @@ void KlipperPopup::buildFromScratch() {
     m_filterWidget = new KLineEditBlackKey( this, "Klipper filter widget" );
     insertTitle( SmallIcon( "klipper" ), i18n("Klipper - Clipboard Tool"));
     m_filterWidgetId = insertItem( m_filterWidget, m_filterWidgetId, 1 );
-    m_filterWidget->setFocusPolicy( TQ_NoFocus );
+    m_filterWidget->setFocusPolicy( TQWidget::NoFocus );
     setItemVisible( m_filterWidgetId,  false );
     m_filterWidget->hide();
     TQString lastGroup;
@@ -250,15 +249,15 @@ void KlipperPopup::keyPressEvent( TQKeyEvent* e ) {
     // widget, except a few used for navigation:
     // These go to the superobject.
     switch( e->key() ) {
-    case Qt::Key_Up:
-    case Qt::Key_Down:
-    case Qt::Key_Right:
-    case Qt::Key_Left:
-    case Qt::Key_Tab:
-    case Qt::Key_Backtab:
-    case Qt::Key_Escape:
-    case Qt::Key_Return:
-    case Qt::Key_Enter:
+    case TQt::Key_Up:
+    case TQt::Key_Down:
+    case TQt::Key_Right:
+    case TQt::Key_Left:
+    case TQt::Key_Tab:
+    case TQt::Key_Backtab:
+    case TQt::Key_Escape:
+    case TQt::Key_Return:
+    case TQt::Key_Enter:
     {
 #ifdef DEBUG_EVENTS__
         kdDebug() << "Passing this event to ancestor (TDEPopupMenu): " << e << endl;
diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h
index ea800c675..f374a9978 100644
--- a/klipper/klipperpopup.h
+++ b/klipper/klipperpopup.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
    Copytight (C) by Andrew Stanley-Jones
@@ -37,7 +36,7 @@ class KLineEdit;
  */
 class KlipperPopup : public TDEPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KlipperPopup( History* history, TQWidget* parent=0, const char* name=0 );
diff --git a/klipper/main.cpp b/klipper/main.cpp
index 0cdc73af3..4fc686f67 100644
--- a/klipper/main.cpp
+++ b/klipper/main.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) Andrew Stanley-Jones
 
@@ -30,7 +29,7 @@
 #include "toplevel.h"
 #include "version.h"
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <qxembed.h> // schroder
 #endif
 
@@ -52,7 +51,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
 
   // 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 1c427834a..20f8139a1 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
@@ -40,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() {
@@ -99,7 +98,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
     } else {
         const TQSize max_size( m_menu_width,m_menu_height/4 );
         if ( image.height() > max_size.height() || image.width() > max_size.width() ) {
-            image.convertFromImage( TQImage(image.convertToImage()).smoothScale( max_size, TQ_ScaleMin ) );
+            image.convertFromImage( TQImage(image.convertToImage()).smoothScale( max_size, TQImage::ScaleMin ) );
         }
         id = proxy_for_menu->insertItem( image,  -1,  index );
     }
@@ -109,7 +108,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item,
     Q_ASSERT( id != -1 ); // Be sure that the item was inserted.
     TQMenuItem* mi = proxy_for_menu->findItem( id );
     int fontheight = TQFontMetrics( proxy_for_menu->fontMetrics()  ).height();
-    int itemheight = proxy_for_menu->style().tqsizeFromContents(TQStyle::CT_PopupMenuItem,
+    int itemheight = proxy_for_menu->style().sizeFromContents(TQStyle::CT_PopupMenuItem,
                                                               proxy_for_menu,
                                                               TQSize( 0, fontheight ),
                                                               TQStyleOption(mi,10,0) ).height();
@@ -118,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 );
 
 }
@@ -152,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/popupproxy.h b/klipper/popupproxy.h
index bc99daea2..6ca010f8c 100644
--- a/klipper/popupproxy.h
+++ b/klipper/popupproxy.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
 
@@ -37,7 +36,7 @@ class KlipperPopup;
  */
 class PopupProxy : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 278e74bbb..b76c7472b 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
 
    Copyright (C) by Andrew Stanley-Jones
@@ -119,9 +118,6 @@ private:
 };
 
 extern bool tqt_qclipboard_bailout_hack;
-#if KDE_IS_VERSION( 15, 0, 0 )
-#error Check status of #80072 with Qt4.
-#endif
 
 static void ensureGlobalSyncOff(TDEConfig* config);
 
@@ -144,9 +140,10 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
     setBackgroundMode( X11ParentRelative );
     clip = kapp->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_pendingCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotCheckPending()));
+    connect( &m_setClipboardTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotDelayedSetClipboard()));
 
     m_history = new History( this, "main_history" );
 
@@ -159,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" );
@@ -190,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(kapp, 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" );
@@ -206,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
@@ -214,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 );
@@ -283,7 +280,7 @@ void KlipperWidget::clearClipboardHistory()
 
 void KlipperWidget::mousePressEvent(TQMouseEvent *e)
 {
-    if ( e->button() != Qt::LeftButton && e->button() != Qt::RightButton )
+    if ( e->button() != TQt::LeftButton && e->button() != TQt::RightButton )
         return;
 
     // if we only hid the menu less than a third of a second ago,
@@ -634,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() );
@@ -669,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() ) );
         }
     }
 }
@@ -789,8 +786,8 @@ bool KlipperWidget::blockFetchingNewData()
 //   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();
-    if( ( buttonstate & ( ShiftButton | Qt::LeftButton )) == ShiftButton // #85198
-        || ( buttonstate & Qt::LeftButton ) == Qt::LeftButton ) { // #80302
+    if( ( buttonstate & ( ShiftButton | TQt::LeftButton )) == ShiftButton // #85198
+        || ( buttonstate & TQt::LeftButton ) == TQt::LeftButton ) { // #80302
         m_pendingContentsCheck = true;
         m_pendingCheckTimer.start( 100, true );
         return true;
@@ -810,6 +807,41 @@ void KlipperWidget::slotCheckPending()
     newClipData( true ); // always selection
 }
 
+void KlipperWidget::slotDelayedSetClipboard()
+{
+    const HistoryItem *top = history()->first();
+    if (top)
+    {
+        if (bCheckForEmpty)
+        {
+            TQMimeSource *data = clip->data( bSavedSelectionMode ? TQClipboard::Selection : TQClipboard::Clipboard );
+            if ( !data )
+            {
+                kdWarning("No data in clipboard. This is not supposed to happen." );
+                return;
+            }
+
+            bool clipEmpty = ( data->format() == 0L );
+            if ( clipEmpty && bNoNullClipboard )
+            {
+                // keep old clipboard after someone set it to null
+#ifdef NOISY_KLIPPER
+                kdDebug() << "Resetting clipboard (Prevent empty clipboard)" << endl;
+#endif
+                setClipboard( *top, bSavedSelectionMode ? Selection : Clipboard );
+                return;
+            }
+        }
+        else
+        {
+#ifdef NOISY_KLIPPER
+            kdDebug() << "Syncing selection and clipboard" << endl;
+#endif
+            setClipboard( *top, bSavedSelectionMode ? Selection : Clipboard );
+        }
+    }
+}
+
 void KlipperWidget::checkClipData( bool selectionMode )
 {
     if ( ignoreClipboardChanges() ) // internal to klipper, ignoring TQSpinBox selections
@@ -869,15 +901,14 @@ void KlipperWidget::checkClipData( bool selectionMode )
     bool changed = data->serialNumber() != lastSerialNo;
     bool clipEmpty = ( data->format() == 0L );
 
-    if ( changed && clipEmpty && bNoNullClipboard ) {
-        const HistoryItem* top = history()->first();
-        if ( top ) {
-            // keep old clipboard after someone set it to null
-#ifdef NOISY_KLIPPER
-            kdDebug() << "Resetting clipboard (Prevent empty clipboard)" << endl;
-#endif
-            setClipboard( *top, selectionMode ? Selection : Clipboard );
-        }
+    if ( changed && clipEmpty && bNoNullClipboard )
+    {
+        // Make sure to call setClipboard() through the event loop.
+        // Using a direct call may crash another application that was
+        // changing the clipboard at the same time.
+        bSavedSelectionMode = selectionMode;
+        bCheckForEmpty = true;
+        m_setClipboardTimer.start(100, TRUE);
         return;
     }
 
@@ -946,11 +977,14 @@ void KlipperWidget::checkClipData( bool selectionMode )
 #ifdef NOISY_KLIPPER
         kdDebug() << "Synchronize?" << ( bSynchronize ? "yes" : "no" ) << endl;
 #endif
-        if ( bSynchronize ) {
-            const HistoryItem* topItem = history()->first();
-            if ( topItem ) {
-                setClipboard( *topItem, selectionMode ? Clipboard : Selection );
-            }
+        if ( bSynchronize )
+        {
+            // Make sure to call setClipboard() through the event loop.
+            // Using a direct call may crash another application that was
+            // changing the clipboard at the same time.
+            bSavedSelectionMode = !selectionMode; // inverted in order to sync
+            bCheckForEmpty = false;
+            m_setClipboardTimer.start(100, TRUE);
         }
     }
 
@@ -1019,10 +1053,10 @@ bool KlipperWidget::ignoreClipboardChanges() const
     TQWidget *focusWidget = tqApp->focusWidget();
     if ( focusWidget )
     {
-        if ( focusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
+        if ( focusWidget->inherits( "TQSpinBox" ) ||
              (focusWidget->parentWidget() &&
-              focusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
-              focusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
+              focusWidget->inherits("TQLineEdit") &&
+              focusWidget->parentWidget()->inherits("TQSpinWidget")) )
         {
             return true;
         }
@@ -1080,7 +1114,7 @@ void KlipperWidget::updateTimestamp()
 { // Qt3.3.0 and 3.3.1 use tqt_x_user_time for clipboard operations
     Time time = ( strcmp( tqVersion(), "3.3.1" ) == 0
                 || strcmp( tqVersion(), "3.3.0" ) == 0 )
-                ? GET_QT_X_USER_TIME() : GET_QT_X_TIME();
+                ? get_tqt_x_user_time() : get_tqt_x_time();
     static TQWidget* w = 0;
     if ( !w )
         w = new TQWidget;
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index b8526e59f..8a924a46f 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) by Andrew Stanley-Jones
    Copyright (C) 2004  Esben Mose Hansen <kde@mosehansen.dk>
@@ -43,7 +42,7 @@ class KlipperSessionManaged;
 
 class KlipperWidget : public TQWidget, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
 k_dcop:
@@ -155,6 +154,7 @@ private slots:
 
     void slotClearOverflow();
     void slotCheckPending();
+    void slotDelayedSetClipboard();
 
 private:
 
@@ -187,6 +187,8 @@ private:
     bool bSynchronize           :1;
     bool bSelectionTextOnly     :1;
     bool bIgnoreImages          :1;
+    bool bSavedSelectionMode    :1;
+    bool bCheckForEmpty         :1;
 
     /**
      * Avoid reacting to our own changes, using this
@@ -202,6 +204,7 @@ private:
     TDEConfig* m_config;
     TQTimer m_overflowClearTimer;
     TQTimer m_pendingCheckTimer;
+    TQTimer m_setClipboardTimer;
     bool m_pendingContentsCheck;
     ClipboardPoll* poll;
     static TDEAboutData* about_data;
@@ -212,7 +215,7 @@ private:
 
 class Klipper : public KlipperWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 k_dcop:
     int newInstance();
diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 684e08c26..078e38097 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) (C) 2000,2001,2002 by Carsten Pfeiffer <pfeiffer@kde.org>
 
@@ -62,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
     /*
@@ -164,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() );
@@ -280,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 fd97067dc..cf1c9c784 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) 2000 by Carsten Pfeiffer <pfeiffer@kde.org>
 
@@ -41,7 +40,7 @@ typedef TQPtrListIterator<ClipAction> ActionListIterator;
 
 class URLGrabber : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   URLGrabber( TDEConfig* config );
diff --git a/klipper/version.h b/klipper/version.h
index 758d59a6d..ce44571f5 100644
--- a/klipper/version.h
+++ b/klipper/version.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*-
 /* This file is part of the KDE project
    Copyright (C) Andrew Stanley-Jones
 
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 32dba3f3e..1cde09440 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -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 );
 
diff --git a/kmenuedit/basictab.h b/kmenuedit/basictab.h
index 724f1f339..89f7cd660 100644
--- a/kmenuedit/basictab.h
+++ b/kmenuedit/basictab.h
@@ -40,7 +40,7 @@ class MenuEntryInfo;
 
 class BasicTab : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BasicTab( TQWidget *parent=0, const char *name=0 );
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 8a90cfcd0..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());
@@ -80,25 +80,25 @@ void KMenuEdit::setupActions()
 
 void KMenuEdit::setupView()
 {
-    m_splitter = new TQSplitter(Qt::Horizontal, this);
+    m_splitter = new TQSplitter(TQt::Horizontal, this);
     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/kmenuedit.h b/kmenuedit/kmenuedit.h
index 15e5c797f..f08247ebd 100644
--- a/kmenuedit/kmenuedit.h
+++ b/kmenuedit/kmenuedit.h
@@ -30,7 +30,7 @@ class TDEToggleAction;
 
 class KMenuEdit : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMenuEdit( bool controlCenter, TQWidget *parent=0, const char *name=0 );
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 7f7e31dce..8340b4090 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -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();
@@ -310,7 +310,7 @@ void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr
 
 void TreeView::fill()
 {
-    TQApplication::setOverrideCursor(Qt::WaitCursor);
+    TQApplication::setOverrideCursor(TQt::WaitCursor);
     clear();
     fillBranch(m_rootFolder, 0);
     TQApplication::restoreOverrideCursor();
@@ -378,7 +378,7 @@ TreeItem *TreeView::createTreeItem(TreeItem *parent, TQListViewItem *after, Menu
    else
      item = new TreeItem(parent, after, entryInfo->menuId(),_init);
 
-   QString	name;
+   TQString	name;
 	 
    if (m_detailedMenuEntries && entryInfo->description.length() != 0)
    {
@@ -566,7 +566,7 @@ void TreeView::currentChanged(MenuEntryInfo *entryInfo)
     if (item == 0) return;
     if (entryInfo == 0) return;
 
-    QString	name;
+    TQString	name;
 	 
     if (m_detailedMenuEntries && entryInfo->description.length() != 0)
     {
diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h
index 3370f5bc2..c456d1c9c 100644
--- a/kmenuedit/treeview.h
+++ b/kmenuedit/treeview.h
@@ -88,7 +88,7 @@ private:
 class TreeView : public TDEListView
 {
     friend class TreeItem;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TreeView(bool controlCenter, TDEActionCollection *ac, TQWidget *parent=0, const char *name=0);
     ~TreeView();
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index 781643ff1..f73f25707 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -424,7 +424,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 +432,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 cd5353cfc..1df766960 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);
@@ -284,5 +284,3 @@ void KNetAttach::updateFinishButtonText(bool save)
 	finishButton()->setText(i18n("C&onnect"));
     }
 }
-
-// vim: ts=8 sw=4 noet
diff --git a/konqueror/CMakeLists.txt b/konqueror/CMakeLists.txt
index bd6f9d974..aa6091502 100644
--- a/konqueror/CMakeLists.txt
+++ b/konqueror/CMakeLists.txt
@@ -141,13 +141,13 @@ tde_add_library( ${target} STATIC_PIC
 set( target konqueror )
 
 set( ${target}_SRCS
-  konq_main.cc KonquerorIface.cc KonquerorIface.skel
-  KonqMainWindowIface.cc KonqMainWindowIface.skel
-  KonqViewIface.cc KonqViewIface.skel konq_guiclients.cc
-  konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc
-  konq_frame.cc konq_tabs.cc konq_actions.cc konq_profiledlg.cc
-  konq_factory.cc konq_combo.cc	konq_browseriface.cc
-  delayedinitializer.cc konq_mainwindow.cc konq_extensionmanager.cc
+  konq_main.cpp KonquerorIface.cpp KonquerorIface.skel
+  KonqMainWindowIface.cpp KonqMainWindowIface.skel
+  KonqViewIface.cpp KonqViewIface.skel konq_guiclients.cpp
+  konq_run.cpp konq_view.cpp konq_viewmgr.cpp konq_misc.cpp
+  konq_frame.cpp konq_tabs.cpp konq_actions.cpp konq_profiledlg.cpp
+  konq_factory.cpp konq_combo.cpp	konq_browseriface.cpp
+  delayedinitializer.cpp konq_mainwindow.cpp konq_extensionmanager.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog
index bdd198606..a6b8bed4c 100644
--- a/konqueror/ChangeLog
+++ b/konqueror/ChangeLog
@@ -5,14 +5,14 @@
 
 2001-05-05  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc: Set WDestructiveClose again when going
+	* konq_mainwindow.cpp: Set WDestructiveClose again when going
 	to fullscreen mode (Qt bug), to prevent Alt+F4 from crashing.
-	* konq_misc.cc: Only abort full-screen mode for windows on the
+	* konq_misc.cpp: Only abort full-screen mode for windows on the
 	current desktop.
 
 2001-05-01  Simon Hausmann  <simon@kde.org>
 
-	* konq_mainwindow.cc : moved the connect and disconnect calls
+	* konq_mainwindow.cpp : moved the connect and disconnect calls
 	to/from the highlighting signals of the actioncollections into
 	two separate methods, for cleanup, and use the qt child deletion
 	mechanism to delete the bookmark actioncollection
@@ -26,11 +26,11 @@
 	starts flickering like mad, when the window width is getting
 	small than the length of the url in the combobox.
 	
-	* konq_mainwindow.cc (initActions): use KonqGoURLAction
+	* konq_mainwindow.cpp (initActions): use KonqGoURLAction
 
 2001-04-27  Simon Hausmann  <simon@kde.org>
 
-	* konq_mainwindow.cc (goURL): new slot, sending a fake key
+	* konq_mainwindow.cpp (goURL): new slot, sending a fake key
 	event to the lineedit, acting like the user pressing return
 	(initActions): allocate a "Go" action and connect it to the
 	new goURL slot
@@ -39,22 +39,22 @@
 
 2001-04-07  Simon Hausmann  <simon@kde.org>
 
-	* konq_mainwindow.cc (slotReload): call m_currentView->lockHistory(),
+	* konq_mainwindow.cpp (slotReload): call m_currentView->lockHistory(),
 	to fix #23818
-	* konq_view.cc/h (reload): removed obsolete method
+	* konq_view.cpp/h (reload): removed obsolete method
 
 2001-03-31  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc(slotRunFinished): Stop wheel animation when a 
+	* konq_mainwindow.cpp(slotRunFinished): Stop wheel animation when a 
 	konqrun fails and we have no view.
 
 2001-03-25  Simon Hausmann  <simon@kde.org>
 
-	* iconview/konq_iconview.cc (KonqKfmIconView): specify a status text for
+	* iconview/konq_iconview.cpp (KonqKfmIconView): specify a status text for
 	some actions. Likewise for some actions in KonqDirPart. Also call
 	setHighlightingEnabled in the KonqDirPart constructor
 
-	* konq_mainwindow.cc (slotShowMenuBar): call saveMainWindowSettings and
+	* konq_mainwindow.cpp (slotShowMenuBar): call saveMainWindowSettings and
 	TDEGlobal::config()->sync() after toggling the visiblity of the menubar,
 	just like it is done for toolbars.
 	(slotPartActivated): connect and disconnect to/from the actionStatusText
@@ -62,25 +62,25 @@
 
 2001-03-02  Simon Hausmann  <simon@kde.org>
 
-	* konq_view.cc, konq_browseriface.cc/h: Utilize and implement the newly
+	* konq_view.cpp, konq_browseriface.cpp/h: Utilize and implement the newly
 	  added KParts::BrowserInterface
 
 2001-02-06  Simon Hausmann  <simon@kde.org>
 	
-	* konq_mainwindow.cc (openBookmarkURL): Patch by 
+	* konq_mainwindow.cpp (openBookmarkURL): Patch by 
 	Marco Krohn <Marco.Krohn@stud.uni-hannover.de> to call openFilteredURL
 	instead of openURL. Allows environment variables in bookmarks and
 	other sugar.
 
 2001-01-28  Stephan Kulow  <coolo@kde.org>
 
-	* konq_mainwindow.cc (initActions): Plug the actions into a TDEAccel to
+	* konq_mainwindow.cpp (initActions): Plug the actions into a TDEAccel to
 	fix short cuts in full screen mode
 
 2001-01-16  Simon Hausmann  <simon@kde.org>
 
-	* konq_actions.cc (fillHistoryPopup),
-	  libkonq/kbookmarkmenu.cc (fillBookmarkMenu): When a Website has
+	* konq_actions.cpp (fillHistoryPopup),
+	  libkonq/kbookmarkmenu.cpp (fillBookmarkMenu): When a Website has
 	"&" in the Title, make sure to transform it into "&&" before
 	inserting it into a QPopupMenu (for history or for bookmarks) , to
 	avoid QPopupMenu interpreting it as accelerator.
@@ -88,30 +88,30 @@
 
 2001-01-15  David Faure  <faure@kde.org>
 
-	* konq_aboutpage.cc, konq_mainwindow.cc: Support for "about:konqueror".
+	* konq_aboutpage.cpp, konq_mainwindow.cpp: Support for "about:konqueror".
 	Credits to Simon for the part, and Torsten for the icons.
 
 2001-01-14  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc (loadItem): Use openView instead of view->openURL,
+	* konq_viewmgr.cpp (loadItem): Use openView instead of view->openURL,
 	so that "view-follows-view" is also applied on startup. Fixes #17679.
 
-	* konq_mainwindow.cc etc.: Lock to current location doesn't make the
+	* konq_mainwindow.cpp etc.: Lock to current location doesn't make the
 	view passive anymore. This allows to e.g. change the view mode.
 
-	* konq_frame.cc: Added Lock / Unlock to view statusbar's popupmenu.
+	* konq_frame.cpp: Added Lock / Unlock to view statusbar's popupmenu.
 
 2001-01-13  David Faure  <faure@kde.org>
 
-	* konq_dirpart.cc etc.: Always paste to current directory, even
+	* konq_dirpart.cpp etc.: Always paste to current directory, even
 	when an item is selected.
 
 2001-01-12  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc (loadViewProfile): Set active part before loading
+	* konq_viewmgr.cpp (loadViewProfile): Set active part before loading
 	URL, so that the URL appears in the location bar.
 
-	* konq_mainwindow.cc, konq_dirpart.cc: Store find part into history,
+	* konq_mainwindow.cpp, konq_dirpart.cpp: Store find part into history,
 	in order to restore it when pressing back.
 
 2001-01-11  David Faure  <faure@kde.org>
@@ -132,7 +132,7 @@
 
 2001-01-08  Simon Hausmann  <simon@kde.org>
 
-	* KonquerorIface.cc (openBrowserWindow),
+	* KonquerorIface.cpp (openBrowserWindow),
 	(createNewWindow),
 	(createNewWindow), 
 	(createBrowserWindowFromProfile),
@@ -150,14 +150,14 @@
 	
 2000-12-28  Simon Hausmann  <simon@kde.org>
 
-	* konq_viewmgr.cc (loadViewProfile): When loading an empty profile
+	* konq_viewmgr.cpp (loadViewProfile): When loading an empty profile
 	(in particular the webbrowsing one) , activate the clear_location
 	action. This gives the focus to the location bar -> the user can
 	type in an url right away when loading the webbrowsing profile
 
 2000-12-27  Simon Hausmann  <simon@kde.org>
 
-	* konq_mainwindow.cc (enableAllActions): for iterating over all actions
+	* konq_mainwindow.cpp (enableAllActions): for iterating over all actions
 	don't use the action( int index ) method of TDEActionCollection but instead
 	retrieve a QValueList<TDEAction *> and iterate over that, as the =+(int)
 	operator of QDictIterator isn't really fast
@@ -166,16 +166,16 @@
 	
 2000-12-12  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc: Fixed saving of profiles containing views
+	* konq_viewmgr.cpp: Fixed saving of profiles containing views
 	"locked to their current location". The attribute was missing from 
 	the profile.
 
-	* konq_mainwindow.cc: Save and restore the preferred service in for 
+	* konq_mainwindow.cpp: Save and restore the preferred service in for 
 	each toolbar 'viewmode' button.
 
 2000-12-10  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc, konq_view.*, browserextension.*: Fixed
+	* konq_mainwindow.cpp, konq_view.*, browserextension.*: Fixed
 	the initial state of the common actions (cut,copy,paste etc.).
 	Had to move all the handling of the action states to browserextension.
 
@@ -203,7 +203,7 @@
 
 2000-12-08  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc (openURL): Support for about:blank
+	* konq_mainwindow.cpp (openURL): Support for about:blank
 	Fix for severe problems with the activation of the standard actions.
 	The state of the action is now stored in each KonqView.
 	
@@ -220,77 +220,77 @@
 
 2000-12-06  Matthias Elter <elter@kde.org>
 
-	* konq_mainwindow.cc: Turned the Configure submenu into a single dialog.
+	* konq_mainwindow.cpp: Turned the Configure submenu into a single dialog.
 
 2000-12-02  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc (slotToolFind): "Find Files" now embeds the kfind
+	* konq_mainwindow.cpp (slotToolFind): "Find Files" now embeds the kfind
 	part, and the result of the search is connected to the current directory
 	part. "Close" or opening any other URL closes the 'find' part.
 	Thanks to Eric Coquelle for the kfind classes, and to jpmartin for 
 	pushing us to do this :)
 
-	* konq_viewmgr.cc: Support for suicidal passive views, more arguments 
+	* konq_viewmgr.cpp: Support for suicidal passive views, more arguments 
 	to splitView and splitWindow.
 
-	* konq_guiclients.cc: Duplicated code removed, uses splitWindow now.
+	* konq_guiclients.cpp: Duplicated code removed, uses splitWindow now.
 
 2000-11-30  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc: Use current profile in "New Window" to fix #16283.
+	* konq_mainwindow.cpp: Use current profile in "New Window" to fix #16283.
 
 2000-11-28  David Faure  <faure@kde.org>
 
-	* konq_actions.cc: Accel (Alt+O in English) to give focus to location bar,
+	* konq_actions.cpp: Accel (Alt+O in English) to give focus to location bar,
 	shown by the label.
 
-	* konq_profiledlg.cc: Ported to TDEListView to fix problems with selection.
+	* konq_profiledlg.cpp: Ported to TDEListView to fix problems with selection.
 
 2000-11-26  David Faure  <faure@kde.org>
 
-	* konq_misc.cc, kfmclient.cc, KonquerorIface.cc: Speed up for URLs opened
+	* konq_misc.cpp, kfmclient.cpp, KonquerorIface.cpp: Speed up for URLs opened
 	from another process using KRun (e.g. kdesktop's Minicli), by passing the
 	mimetype through to konqueror.
 
 2000-11-25  David Faure  <faure@kde.org>
 
-	* konq_misc.cc: Fixed location bar not showing the URL asap.
+	* konq_misc.cpp: Fixed location bar not showing the URL asap.
 	
-	* konq_mainwindow.cc : Icons for the configure submenu.
+	* konq_mainwindow.cpp : Icons for the configure submenu.
 
-	* konq_actions.cc : KonqHistoryAction turned into TDEToolBarPopupAction.
+	* konq_actions.cpp : KonqHistoryAction turned into TDEToolBarPopupAction.
 	Drag the "Location" label to start a drag with the current URL.
 
 2000-11-25  Simon Hausmann  <simon@kde.org>
 
-	* konq_view.cc (connectPart): Install new url event filter for plain
+	* konq_view.cpp (connectPart): Install new url event filter for plain
 	krops and for browserviews with the enableURLDropHandling property enabled
 	(eventFilter): New eventfilter which listens for url drop events
 
 Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* konq_mainwindow.cc: Completion handling overhauled. We have
+	* konq_mainwindow.cpp: Completion handling overhauled. We have
 	one KonqHistoryManager, which holds a TDECompletion object and syncs
 	the history with the completion.
 
-	* konq_view.cc: 
+	* konq_view.cpp: 
 	set m_bAborted before calling slotCompleted in 	slotCanceled()
 	feed the history manager
 
-	* konq_actions.cc: use KonqHistoryCombo that doesn't mess with the
+	* konq_actions.cpp: use KonqHistoryCombo that doesn't mess with the
 	competion-object, we do our own synchronization now.
 	
 	* libkonq/ added konq_history*
 	
 2000-11-22  David Faure  <faure@kde.org>
 
-	* konq_listview.cc: Added "Default" Icon Size, which corresponds to 
+	* konq_listview.cpp: Added "Default" Icon Size, which corresponds to 
 	TDEIcon::Small (but when switching to icon view, it becomes whatever's 
 	configured for the "Desktop" group).
 
 2000-11-21  David Faure  <faure@kde.org>
 
-	* konq_listview.cc: Case Insensitive Sort option, on by default.
+	* konq_listview.cpp: Case Insensitive Sort option, on by default.
 
 	* Views: Major rework of the "delayed mimetypes determination" feature,
 	to make it available to the list view. This makes the list view
@@ -303,30 +303,30 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 2000-11-17  David Faure  <faure@kde.org>
 
-	* konq_profiledlg.cc: Made checkbox states persistent (saved to config)
+	* konq_profiledlg.cpp: Made checkbox states persistent (saved to config)
 
-	* konq_run.cc: Check that when we call KRun from KonqRun, it's not going
+	* konq_run.cpp: Check that when we call KRun from KonqRun, it's not going
 	to launch another konqueror.
-	* konq_guiclients.cc: Build toggle-view actions in the actioncollection 
+	* konq_guiclients.cpp: Build toggle-view actions in the actioncollection 
 	of the mainwindow, so that it's possible to assign them a shortcut.
 
 2000-11-16  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc: Patch by Keunwoo Lee <klee@cs.washington.edu> to
+	* konq_viewmgr.cpp: Patch by Keunwoo Lee <klee@cs.washington.edu> to
 	implement dynamic accels for the profile submenu.
 
 2000-11-15  David Faure  <faure@kde.org>
 
-	* konq_drag.cc: Export URLs as text/plain as well.
+	* konq_drag.cpp: Export URLs as text/plain as well.
 
-	* konq_mainwindow.cc: Implemented auto-saving of toolbars (TDEMainWindow),
+	* konq_mainwindow.cpp: Implemented auto-saving of toolbars (TDEMainWindow),
 	removed "Save Settings".
 	Fixed "clicking on directory in dirtree uses wrong view mode for dirs".
-	* konq_iconview.cc: Added +/- buttons for changing the icon size.
+	* konq_iconview.cpp: Added +/- buttons for changing the icon size.
 
 2000-11-06  David Faure  <faure@kde.org>
 
-	* konq_operations.cc: statURL, calls a slot when it stat'ed
+	* konq_operations.cpp: statURL, calls a slot when it stat'ed
 	the url and created a tdefileitem for it.
 	Used in doDrop when the destination's tdefileitem is unknown. Fixes #14739.
 	Also, KPropsDlg now does a similar thing when called with a KURL.
@@ -336,30 +336,30 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* konqueror.rc: Moved the "open with" actions to the Location menu,
 	and added a separator to the action list.
 
-	* konq_view.cc (connectPart): moved call to setSaveViewPropertiesLocally
+	* konq_view.cpp (connectPart): moved call to setSaveViewPropertiesLocally
 	(used to be in various places in KonqMW) so that the flag is
 	also correct when switching views.
 
-	* konq_dirpart.cc and directory views: apply background color and pixmap
+	* konq_dirpart.cpp and directory views: apply background color and pixmap
 	to the viewport(), and updated konq_iconview to do the same. This fixes
 	many inconsistencies, and makes resizing a window much faster & smoother.
 	Note that it has to be the viewport and not the widget, otherwise in the
 	listview, the box between the scrollbars appears colored/pixmap-ed.
 
-	* konq_mainwindow.cc: action renamed View Properties Saved In Directory
+	* konq_mainwindow.cpp: action renamed View Properties Saved In Directory
 
 2000-11-04  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc: now takes care of enableAllActions.
+	* konq_viewmgr.cpp: now takes care of enableAllActions.
 	Show led and active statusbar even in the tree+icon configuration
 	(the rule is now "more than one view", not "more than one activeable 
 	view"). This should remove some confusion.
 
-	* konq_frame.cc: "Remove View" in RMB on statusbar.
+	* konq_frame.cpp: "Remove View" in RMB on statusbar.
 	Don't try to activate passive views when clicking statusbar.
 	Different background color on statusbar for active view.
 
-	* konq_mainwindow.cc: Fixes for "Remove Active View" enabling,
+	* konq_mainwindow.cpp: Fixes for "Remove Active View" enabling,
 	to avoid ending up with a lonely embedded konsole, and some
 	cleanup of code for enabling other view-related actions.
 	Introducing updateViewActions for common code between enableAllActions
@@ -393,10 +393,10 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 2000-10-22  David Faure  <faure@kde.org>
 
-	* dirtree/konq_dirtree.cc: Fixed support for devices in the directory 
+	* dirtree/konq_dirtree.cpp: Fixed support for devices in the directory 
 	tree. It currently requires MountPoint in the device desktop file.
 
-	* listview/konq_textviewwidget.cc: Only the Name column is now
+	* listview/konq_textviewwidget.cpp: Only the Name column is now
 	selected, and used as a drop area - like in other listviews.
 	This requires the fix in TDEListView to work properly.
 
@@ -406,7 +406,7 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 2000-10-20  David Faure  <faure@kde.org>
 
-	* konq_misc.cc: Use webbrowsing profile for *.html *.htm as well.
+	* konq_misc.cpp: Use webbrowsing profile for *.html *.htm as well.
 
 2000-10-20  Simon Hausmann  <hausmann@kde.org>
 
diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cpp
index a18301a2f..5f3cbd14f 100644
--- a/konqueror/KonqMainWindowIface.cc
+++ b/konqueror/KonqMainWindowIface.cpp
@@ -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.cc b/konqueror/KonqViewIface.cpp
index 77bfbb61c..77bfbb61c 100644
--- a/konqueror/KonqViewIface.cc
+++ b/konqueror/KonqViewIface.cpp
diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cpp
index cd3ed7591..db87e39ed 100644
--- a/konqueror/KonquerorIface.cc
+++ b/konqueror/KonquerorIface.cpp
@@ -51,7 +51,7 @@ KonquerorIface::~KonquerorIface()
 
 DCOPRef KonquerorIface::openBrowserWindow( const TQString &url )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KonqMainWindow *res = KonqMisc::createSimpleWindow( KURL(url) );
     if ( !res )
         return DCOPRef();
@@ -77,7 +77,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQCString
 
 DCOPRef KonquerorIface::createNewWindowWithSelection( const TQString &url, TQStringList filesToSelect )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KonqMainWindow *res = KonqMisc::createNewWindow( KURL(url), KParts::URLArgs(), false, filesToSelect );
     if ( !res )
         return DCOPRef();
@@ -92,7 +92,7 @@ DCOPRef KonquerorIface::createNewWindowWithSelectionASN( const TQString &url, TQ
 
 DCOPRef KonquerorIface::createNewWindow( const TQString &url, const TQString &mimetype, bool tempFile )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KParts::URLArgs args;
     args.serviceType = mimetype;
     // Filter the URL, so that "kfmclient openURL gg:foo" works also when konq is already running
@@ -112,7 +112,7 @@ DCOPRef KonquerorIface::createNewWindowASN( const TQString &url, const TQString
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString &path )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( const TQString &path ) " << endl;
     kdDebug(1202) << path << endl;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, TQString::null );
@@ -129,7 +129,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path,
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfile( const TQString & path, const TQString &filename )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     kdDebug(1202) << "void KonquerorIface::createBrowserWindowFromProfile( path, filename ) " << endl;
     kdDebug(1202) << path << "," << filename << endl;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename );
@@ -147,7 +147,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileASN( const TQString &path,
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString & path, const TQString &filename, const TQString &url )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url) );
     if ( !res )
         return DCOPRef();
@@ -163,7 +163,7 @@ DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURLASN( const TQString
 
 DCOPRef KonquerorIface::createBrowserWindowFromProfileAndURL( const TQString &path, const TQString &filename, const TQString &url, const TQString &mimetype )
 {
-    SET_QT_X_USER_TIME(0);
+    set_tqt_x_user_time(0);
     KParts::URLArgs args;
     args.serviceType = mimetype;
     KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename, KURL(url), args );
@@ -254,7 +254,7 @@ bool KonquerorIface::processCanBeReused( int screen )
     if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" ))
     {
         allowed_parts.clear();
-        // is duplicated in client/kfmclient.cc
+        // is duplicated in client/kfmclient.cpp
         allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
                       << TQString::fromLatin1( "konq_multicolumnview.desktop" )
                       << TQString::fromLatin1( "konq_sidebartng.desktop" )
diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am
index e84ddffcf..a81cabe84 100644
--- a/konqueror/Makefile.am
+++ b/konqueror/Makefile.am
@@ -22,23 +22,23 @@ METASOURCES = AUTO
 include_HEADERS = KonquerorIface.h
 
 libkonqueror_intern_la_SOURCES = konq_settingsxt.kcfgc
-konqueror_la_SOURCES = konq_main.cc \
-	    KonquerorIface.cc KonquerorIface.skel \
-	    KonqMainWindowIface.cc KonqMainWindowIface.skel \
-	    KonqViewIface.cc KonqViewIface.skel \
-	    konq_guiclients.cc \
-	    konq_run.cc konq_view.cc konq_viewmgr.cc \
-	    konq_misc.cc \
-	    konq_frame.cc \
-	    konq_tabs.cc \
-	    konq_actions.cc \
-	    konq_profiledlg.cc \
-	    konq_factory.cc \
-	    konq_combo.cc	\
-	    konq_browseriface.cc \
-	    delayedinitializer.cc \
-	    konq_mainwindow.cc  \
-	    konq_extensionmanager.cc
+konqueror_la_SOURCES = konq_main.cpp \
+	    KonquerorIface.cpp KonquerorIface.skel \
+	    KonqMainWindowIface.cpp KonqMainWindowIface.skel \
+	    KonqViewIface.cpp KonqViewIface.skel \
+	    konq_guiclients.cpp \
+	    konq_run.cpp konq_view.cpp konq_viewmgr.cpp \
+	    konq_misc.cpp \
+	    konq_frame.cpp \
+	    konq_tabs.cpp \
+	    konq_actions.cpp \
+	    konq_profiledlg.cpp \
+	    konq_factory.cpp \
+	    konq_combo.cpp	\
+	    konq_browseriface.cpp \
+	    delayedinitializer.cpp \
+	    konq_mainwindow.cpp  \
+	    konq_extensionmanager.cpp
 
 konqueror_la_PCH = AUTO
 
@@ -59,14 +59,14 @@ konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC)
 # and make clean ; make konqueror_static in here.
 #check_PROGRAMS = konqueror_static
 #
-#konqueror_static_SOURCES = dummy.cc
+#konqueror_static_SOURCES = dummy.cpp
 #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libtdehtml.la
 #konqueror_static_LDFLAGS = $(all_libraries) -static
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc */*.rc >> rc.cpp
 	$(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp
-	$(XGETTEXT) -kaliasLocal rc.cpp *.h *.cc *view/*h *view/*cc  kedit*/*.h kedit*/*.cpp about/*.h about/*.cc remoteencodingplugin/*.cpp remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"` `find sidebar -name "*.h"` -o $(podir)/konqueror.pot
+	$(XGETTEXT) -kaliasLocal rc.cpp *.h *.cpp *view/*h *view/*.cpp  kedit*/*.h kedit*/*.cpp about/*.h about/*.cpp remoteencodingplugin/*.cpp remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"` `find sidebar -name "*.h"` -o $(podir)/konqueror.pot
 
 xdg_apps_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop \
 	kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop
diff --git a/konqueror/about/CMakeLists.txt b/konqueror/about/CMakeLists.txt
index 9d77c04be..ffa5d4b96 100644
--- a/konqueror/about/CMakeLists.txt
+++ b/konqueror/about/CMakeLists.txt
@@ -47,7 +47,7 @@ install( FILES
 set( target konq_aboutpage )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES konq_aboutpage.cc
+  SOURCES konq_aboutpage.cpp
   LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/about/Makefile.am b/konqueror/about/Makefile.am
index 0a33f9bb7..f4ede2182 100644
--- a/konqueror/about/Makefile.am
+++ b/konqueror/about/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = konq_aboutpage.la
 
 INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/libkonq $(all_includes)
-konq_aboutpage_la_SOURCES = konq_aboutpage.cc
+konq_aboutpage_la_SOURCES = konq_aboutpage.cpp
 konq_aboutpage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 konq_aboutpage_la_LIBADD = $(LIB_TDEHTML)
 
diff --git a/konqueror/about/intro.html b/konqueror/about/intro.html
index efa4d62a9..d9a2943cc 100644
--- a/konqueror/about/intro.html
+++ b/konqueror/about/intro.html
@@ -87,4 +87,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cpp
index cb2149f90..a18aa3eda 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cpp
@@ -54,7 +54,7 @@ KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, co
                                                       TQObject *parent, const char *name,
                                                       const char *, const TQStringList & )
 {
-    //KonqFrame *frame = tqt_dynamic_cast<KonqFrame *>( parentWidget );
+    //KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget );
     //if ( !frame ) return 0;
 
     return new KonqAboutPage( //frame->childView()->mainWindow(),
diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h
index a4192d570..1c359a89e 100644
--- a/konqueror/about/konq_aboutpage.h
+++ b/konqueror/about/konq_aboutpage.h
@@ -34,7 +34,7 @@ private:
 
 class KonqAboutPage : public TDEHTMLPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqAboutPage( /*KonqMainWindow *mainWindow,*/
                    TQWidget *parentWidget, const char *widgetName,
diff --git a/konqueror/about/launch.html b/konqueror/about/launch.html
index 6e84049a7..a9d569350 100644
--- a/konqueror/about/launch.html
+++ b/konqueror/about/launch.html
@@ -131,4 +131,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html
index 752c162da..be40c90bb 100644
--- a/konqueror/about/specs.html
+++ b/konqueror/about/specs.html
@@ -204,4 +204,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/about/tips.html b/konqueror/about/tips.html
index cf4a37862..085b630a8 100644
--- a/konqueror/about/tips.html
+++ b/konqueror/about/tips.html
@@ -124,4 +124,3 @@
   <div id="footer"><div id="footerL"/><div id="footerR"/></div>
 </body>
 </html>
-<!-- vim:set sw=2 et nocindent smartindent: -->
diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt
index 3ae477d32..fe45ce141 100644
--- a/konqueror/client/CMakeLists.txt
+++ b/konqueror/client/CMakeLists.txt
@@ -32,7 +32,7 @@ install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/tdecon
 set( target kfmclient )
 
 set( ${target}_SRCS
-  kfmclient.cc
+  kfmclient.cpp
   ${CMAKE_SOURCE_DIR}/konqueror/KonquerorIface.stub
   ${CMAKE_SOURCE_DIR}/kdesktop/KDesktopIface.stub
 )
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
index c66ed555c..872951b4e 100644
--- a/konqueror/client/Makefile.am
+++ b/konqueror/client/Makefile.am
@@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = kfmclient.la
 INCLUDES= -I.. $(all_includes)
 kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kfmclient_la_LIBADD =  $(LIB_TDEIO)
-kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
+kfmclient_la_SOURCES = kfmclient.cpp KonquerorIface.stub KDesktopIface.stub
 
 noinst_HEADERS = kfmclient.h
 METASOURCES = AUTO
@@ -16,7 +16,7 @@ KonquerorIface_DIR =  $(srcdir)/..
 KDesktopIface_DIR = $(top_srcdir)/kdesktop
 
 messages:
-	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
+	$(XGETTEXT) -kaliasLocal *.h *.cpp -o $(podir)/kfmclient.pot
 
 updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kfmclient_3_2.upd
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cpp
index c0f0c5c69..001734cdb 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cpp
@@ -181,7 +181,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
     TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
     cfg.setGroup( "Reusing" );
     TQStringList allowed_parts;
-    // is duplicated in ../KonquerorIface.cc
+    // is duplicated in ../KonquerorIface.cpp
     allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
                   << TQString::fromLatin1( "konq_multicolumnview.desktop" )
                   << TQString::fromLatin1( "konq_sidebartng.desktop" )
@@ -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;
@@ -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;
   }
diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h
index 1e17279c6..f46f3d06f 100644
--- a/konqueror/client/kfmclient.h
+++ b/konqueror/client/kfmclient.h
@@ -25,7 +25,7 @@
 
 class clientApp : public TDEApplication
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /** Parse command-line arguments and "do it" */
   static bool doIt();
diff --git a/konqueror/delayedinitializer.cc b/konqueror/delayedinitializer.cpp
index c8ab89722..a635fb1ac 100644
--- a/konqueror/delayedinitializer.cc
+++ 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;
 }
@@ -50,6 +50,3 @@ void DelayedInitializer::slotInitialize()
 }
 
 #include "delayedinitializer.moc"
-
-/* vim: et sw=4
- */
diff --git a/konqueror/delayedinitializer.h b/konqueror/delayedinitializer.h
index a9119ba58..c52fe04b0 100644
--- a/konqueror/delayedinitializer.h
+++ b/konqueror/delayedinitializer.h
@@ -24,7 +24,7 @@
 
 class DelayedInitializer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DelayedInitializer( int eventType, TQObject *parent, const char *name = 0 );
 
@@ -41,5 +41,3 @@ private:
 };
 
 #endif
-/* vim: et sw=4
- */
diff --git a/konqueror/iconview/CMakeLists.txt b/konqueror/iconview/CMakeLists.txt
index e88884b47..f308f226a 100644
--- a/konqueror/iconview/CMakeLists.txt
+++ b/konqueror/iconview/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES konq_iconview.rc konq_multicolumnview.rc DESTINATION ${DATA_INSTA
 set( target konq_iconview )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES konq_iconview.cc
+  SOURCES konq_iconview.cpp
   LINK konq-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/iconview/Makefile.am b/konqueror/iconview/Makefile.am
index bc685d997..34b4f31a8 100644
--- a/konqueror/iconview/Makefile.am
+++ b/konqueror/iconview/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = konq_iconview.la
 
 METASOURCES = AUTO
 
-konq_iconview_la_SOURCES = konq_iconview.cc
+konq_iconview_la_SOURCES = konq_iconview.cpp
 konq_iconview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 konq_iconview_la_LIBADD = $(top_builddir)/libkonq/libkonq.la
 
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cpp
index 5efc1e751..04b973f8f 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ 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,15 +270,15 @@ 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();
-    TDERadioAction *sort_action = tqt_dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1()));
+    TDERadioAction *sort_action = dynamic_cast<TDERadioAction *>(actionCollection()->action(sortcrit.latin1()));
     if(sort_action!=NULL) sort_action->activate();
 
     m_paSortDirsFirst = new TDEToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" );
@@ -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,67 +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, TQT_SIGNAL( mouseDoubleClicked(TQIconViewItem*)),
-             this, TQT_SLOT( slotDoubleClicked(TQIconViewItem*)) );
+    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;
@@ -401,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...
@@ -412,6 +410,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
     //    m_pIconView->calculateGridX();
 
     setViewMode( mode );
+
+    m_pActivateDoubleClickTimer = new TQTimer(this);
 }
 
 KonqKfmIconView::~KonqKfmIconView()
@@ -427,6 +427,13 @@ KonqKfmIconView::~KonqKfmIconView()
     delete m_pProps;
     //no need for that, KParts deletes our widget already ;-)
     //    delete m_pIconView;
+    m_pActivateDoubleClickTimer->stop();
+    delete m_pActivateDoubleClickTimer;
+    if (m_pTimeoutRefreshTimer)
+    {
+      m_pTimeoutRefreshTimer->stop();
+      delete m_pTimeoutRefreshTimer;
+    }
 }
 
 const KFileItem * KonqKfmIconView::currentItem()
@@ -436,7 +443,7 @@ const KFileItem * KonqKfmIconView::currentItem()
 
 void KonqKfmIconView::slotPreview( bool toggle )
 {
-    TQCString name = TQT_TQOBJECT_CONST(sender())->name(); // e.g. clipartthumbnail (or audio/, special case)
+    TQCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case)
     if (name == "iconview_preview_all")
     {
         m_pProps->setShowingPreview( toggle );
@@ -832,7 +839,7 @@ void KonqKfmIconView::slotContextMenuRequested(TQIconViewItem* _item, const TQPo
 
 void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item, const TQPoint&)
 {
-    if ( _button == Qt::RightButton && !_item )
+    if ( _button == TQt::RightButton && !_item )
     {
         // Right click on viewport
         KFileItem * item = m_dirLister->rootItem();
@@ -869,21 +876,40 @@ void KonqKfmIconView::slotMouseButtonPressed(int _button, TQIconViewItem* _item,
 
 void KonqKfmIconView::slotMouseButtonClicked(int _button, TQIconViewItem* _item, const TQPoint& )
 {
-    if( _button == Qt::MidButton )
+    if (_button == TQt::MidButton)
+    {
         mmbClicked( _item ? static_cast<KFileIVI*>(_item)->item() : 0L );
+    }
+    else if (!_item && _button == TQt::LeftButton)
+    {
+        if (m_pActivateDoubleClickTimer->isActive())
+        {
+            m_pActivateDoubleClickTimer->stop();
+            slotDoubleClicked(_item);
+        }
+        else
+        {
+            m_pActivateDoubleClickTimer->start(TQApplication::doubleClickInterval(), true);
+        }
+    }
 }
 
 void KonqKfmIconView::slotDoubleClicked(TQIconViewItem *_item)
 { 
-    if (!_item)
+    if (!_item && KonqFMSettings::settings()->doubleClickMoveToParent())
     {
         KParts::URLArgs args;
         args.trustedSource = true;
-        KURL upURL = m_dirLister->url().upURL();
+        KURL baseURL(m_dirLister->url().internalReferenceURL());
+        if (baseURL.isEmpty())
+        {
+            baseURL = m_dirLister->url();
+        }
+        KURL upURL = baseURL.upURL();
         if (!upURL.isEmpty())
-	{  
-	m_extension->openURLRequest(upURL, args);
-	}
+        {
+            m_extension->openURLRequest(upURL, args);
+        }
     }
 }
   
@@ -1124,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);
         }
@@ -1140,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);
     }
@@ -1159,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....
        }
@@ -1179,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....
        }
@@ -1269,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 );
 
@@ -1549,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/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
index 5c1584efc..f0713fcde 100644
--- a/konqueror/iconview/konq_iconview.h
+++ b/konqueror/iconview/konq_iconview.h
@@ -44,7 +44,7 @@ class IconViewBrowserExtension;
 class KonqKfmIconView : public KonqDirPart
 {
   friend class IconViewBrowserExtension; // to access m_pProps
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool supportsUndo READ supportsUndo )
   TQ_PROPERTY( TQString viewMode READ viewMode WRITE setViewMode )
 public:
@@ -224,6 +224,7 @@ protected:
   KonqIconViewWidget *m_pIconView;
 
   TQTimer *m_pTimeoutRefreshTimer;
+  TQTimer *m_pActivateDoubleClickTimer;
 
   TQPtrDict<KFileIVI> m_itemDict; // maps KFileItem * -> KFileIVI *
 
@@ -238,7 +239,7 @@ protected:
 
 class IconViewBrowserExtension : public KonqDirPartBrowserExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class KonqKfmIconView; // so that it can emit our signals
 public:
   IconViewBrowserExtension( KonqKfmIconView *iconView );
@@ -274,9 +275,9 @@ private:
   bool m_bSaveViewPropertiesLocally;
 };
 
-class SpringLoadingManager : public QObject
+class SpringLoadingManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 private:
     SpringLoadingManager();
     static SpringLoadingManager *s_self;
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 1313ccd38..395da6a5d 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -80,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() {
@@ -394,7 +392,7 @@ void ActionsImpl::slotImport() {
     // kdDebug() << "ActionsImpl::slotImport() where sender()->name() == "
     //           << sender()->name() << endl;
     ImportCommand* import
-        = ImportCommand::performImport(TQT_TQOBJECT_CONST(sender())->name()+6, KEBApp::self());
+        = ImportCommand::performImport(sender()->name()+6, KEBApp::self());
     if (!import)
         return;
     CmdHistory::self()->addCommand(import);
@@ -446,7 +444,7 @@ void ActionsImpl::slotPrint() {
 
     s_appId = kapp->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/actionsimpl.h b/konqueror/keditbookmarks/actionsimpl.h
index 11cd70d57..f0137245b 100644
--- a/konqueror/keditbookmarks/actionsimpl.h
+++ b/konqueror/keditbookmarks/actionsimpl.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
 
@@ -23,9 +21,9 @@
 
 #include <tqobject.h>
 
-class ActionsImpl : public QObject
+class ActionsImpl : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    bool save();
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index 95ae0707f..45da6db7a 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -1,4 +1,3 @@
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
 
@@ -232,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;
@@ -247,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);
@@ -257,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/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h
index 8565616ed..782a7ece7 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.h
+++ b/konqueror/keditbookmarks/bookmarkinfo.h
@@ -1,4 +1,3 @@
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -30,7 +29,7 @@
 class TQTimer;
 
 class BookmarkLineEdit : public KLineEdit {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BookmarkLineEdit( TQWidget * );
 public slots:
@@ -39,7 +38,7 @@ public slots:
 
 
 class BookmarkInfoWidget : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BookmarkInfoWidget(TQWidget * = 0, const char * = 0);
     void showBookmark(const KBookmark &bk);
diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp
index c30d890e3..35374136f 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.cpp
+++ b/konqueror/keditbookmarks/bookmarkiterator.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -29,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();
 }
 
@@ -39,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/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h
index 0931ccaf7..8f5df481a 100644
--- a/konqueror/keditbookmarks/bookmarkiterator.h
+++ b/konqueror/keditbookmarks/bookmarkiterator.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
 
@@ -28,9 +26,9 @@
 class KEBListViewItem;
 class BookmarkIteratorHolder;
 
-class BookmarkIterator : public QObject
+class BookmarkIterator : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    BookmarkIterator(TQValueList<KBookmark> bks);
diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp
index f69c01ca5..6f228e565 100644
--- a/konqueror/keditbookmarks/commands.cpp
+++ b/konqueror/keditbookmarks/commands.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h
index 84268a698..92e56bed5 100644
--- a/konqueror/keditbookmarks/commands.h
+++ b/konqueror/keditbookmarks/commands.h
@@ -1,4 +1,3 @@
-// kate: space-indent on; indent-width 3; replace-tabs on;
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp
index 570445cae..b02f0af16 100644
--- a/konqueror/keditbookmarks/dcop.cpp
+++ b/konqueror/keditbookmarks/dcop.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -39,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/dcop.h b/konqueror/keditbookmarks/dcop.h
index 6914f2db4..441ff8c9e 100644
--- a/konqueror/keditbookmarks/dcop.h
+++ b/konqueror/keditbookmarks/dcop.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
 
@@ -25,7 +23,7 @@
 
 class KBookmarkEditorIface : public TQObject, public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    KBookmarkEditorIface();
diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp
index 681883883..1865986b6 100644
--- a/konqueror/keditbookmarks/exporters.cpp
+++ b/konqueror/keditbookmarks/exporters.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
 
diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp
index f4e2183ea..73cbd9ced 100644
--- a/konqueror/keditbookmarks/favicons.cpp
+++ b/konqueror/keditbookmarks/favicons.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
 
@@ -85,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(kapp, "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/favicons.h b/konqueror/keditbookmarks/favicons.h
index 3be46d35f..a2e4036bc 100644
--- a/konqueror/keditbookmarks/favicons.h
+++ b/konqueror/keditbookmarks/favicons.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
 
@@ -47,7 +45,7 @@ class FavIconUpdater;
 
 class FavIconsItr : public BookmarkIterator
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    FavIconsItr(TQValueList<KBookmark> bks);
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index e809a12e0..104db0048 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h
index 0550e46f0..fd6aec917 100644
--- a/konqueror/keditbookmarks/importers.h
+++ b/konqueror/keditbookmarks/importers.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -35,7 +33,7 @@
 // part pure
 class ImportCommand : public TQObject, public KCommand, public IKEBCommand
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    ImportCommand()
       : KCommand(), m_utf8(false), m_folder(false), m_cleanUpCmd(0L)
diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h
index c7031a377..36e94f535 100644
--- a/konqueror/keditbookmarks/kebsearchline.h
+++ b/konqueror/keditbookmarks/kebsearchline.h
@@ -24,7 +24,7 @@
 
 class KEBSearchLine : public TDEListViewSearchLine
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KEBSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0);
 
diff --git a/konqueror/keditbookmarks/kinsertionsort.h b/konqueror/keditbookmarks/kinsertionsort.h
index 5f71184ed..67645db16 100644
--- a/konqueror/keditbookmarks/kinsertionsort.h
+++ b/konqueror/keditbookmarks/kinsertionsort.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
  
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 92eb1c48b..f5a8474cc 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -231,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);
     }
 
@@ -648,7 +646,7 @@ class KeyPressEater : public TQObject {
 bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) {
     if (pe->type() == TQEvent::KeyPress) {
         TQKeyEvent *k = (TQKeyEvent *) pe;
-        if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab)
+        if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab)
                 && !(k->state() & ControlButton || k->state() & AltButton)
            ) {
             if (m_allowedToTab) {
@@ -657,7 +655,7 @@ bool KeyPressEater::eventFilter(TQObject *, TQEvent *pe) {
             }
             return true;
         } else {
-            m_allowedToTab = (k->key() == Qt::Key_Escape || k->key() == Qt::Key_Enter);
+            m_allowedToTab = (k->key() == TQt::Key_Escape || k->key() == TQt::Key_Enter);
         }
     }
     return false;
@@ -718,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) {
@@ -913,7 +911,7 @@ void KEBListViewItem::setOpen(bool open) {
 void KEBListViewItem::greyStyle(TQColorGroup &cg) {
   int h, s, v;
   cg.background().hsv(&h, &s, &v);
-  TQColor color = (v > 180 && v < 220) ? (Qt::darkGray) : (Qt::gray);
+  TQColor color = (v > 180 && v < 220) ? (TQt::darkGray) : (TQt::gray);
   cg.setColor(TQColorGroup::Text, color);
 }
 
diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h
index f693c608f..15444c2a5 100644
--- a/konqueror/keditbookmarks/listview.h
+++ b/konqueror/keditbookmarks/listview.h
@@ -1,4 +1,3 @@
-// kate: space-indent on; indent-width 3; replace-tabs on;
 /* This file is part of the KDE project
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
 
@@ -82,7 +81,7 @@ private:
 
 class KEBListView : public TDEListView
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    enum { 
       NameColumn = 0,
@@ -129,7 +128,7 @@ private:
 // DESIGN - make some stuff private if possible
 class ListView : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    // init stuff
    void initListViews();
diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp
index d64f6bce7..94e08a357 100644
--- a/konqueror/keditbookmarks/main.cpp
+++ b/konqueror/keditbookmarks/main.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp
index 5a7b5ce04..707491741 100644
--- a/konqueror/keditbookmarks/testlink.cpp
+++ b/konqueror/keditbookmarks/testlink.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -90,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/testlink.h b/konqueror/keditbookmarks/testlink.h
index a224279df..831029c25 100644
--- a/konqueror/keditbookmarks/testlink.h
+++ b/konqueror/keditbookmarks/testlink.h
@@ -53,7 +53,7 @@ private:
 
 class TestLinkItr : public BookmarkIterator
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    TestLinkItr(TQValueList<KBookmark> bks);
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index d5a7c865c..d685e8dee 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -60,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
 }
@@ -140,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 &) {
@@ -185,7 +183,7 @@ TQString CurrentMgr::makeTimeStr(int b)
     TQDateTime dt;
     dt.setTime_t(b);
     return (dt.daysTo(TQDateTime::currentDateTime()) > 31)
-        ? TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
+        ? TDEGlobal::locale()->formatDate(dt.date(), false)
         : TDEGlobal::locale()->formatDateTime(dt, false);
 }
 
@@ -221,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();
@@ -231,7 +229,7 @@ KEBApp::KEBApp(
 
     m_bkinfo = new BookmarkInfoWidget(vsplitter);
 
-    vsplitter->setOrientation(Qt::Vertical);
+    vsplitter->setOrientation(TQt::Vertical);
     vsplitter->setSizes(TQValueList<int>() << h << 380
                                           << m_bkinfo->sizeHint().height() );
 
@@ -247,8 +245,8 @@ KEBApp::KEBApp(
 
     m_dcopIface = new KBookmarkEditorIface();
 
-    connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ),
-                               TQT_SLOT( slotClipboardDataChanged() ));
+    connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ),
+                               TQ_SLOT( slotClipboardDataChanged() ));
 
     ListView::self()->connectSignals();
 
@@ -339,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/toplevel.h b/konqueror/keditbookmarks/toplevel.h
index 7dd056d8d..33a60073e 100644
--- a/konqueror/keditbookmarks/toplevel.h
+++ b/konqueror/keditbookmarks/toplevel.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2000 David Faure <faure@kde.org>
    Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org>
@@ -46,7 +44,7 @@ struct SelcAbilities {
 };
 
 class CmdHistory : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CmdHistory(TDEActionCollection *collection);
     virtual ~CmdHistory() { ; }
@@ -74,7 +72,7 @@ class KBookmark;
 class KBookmarkManager;
 
 class CurrentMgr : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     typedef enum {HTMLExport, OperaExport, IEExport, MozillaExport, NetscapeExport} ExportType;
 
@@ -109,7 +107,7 @@ private:
 };
 
 class KEBApp : public TDEMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static KEBApp* self() { return s_topLevel; }
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index ad55793e0..377026411 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -1,5 +1,3 @@
-// -*- indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
 
@@ -97,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);
@@ -108,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;
     }
@@ -117,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());
@@ -151,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/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h
index 44a19af40..0e0e8b336 100644
--- a/konqueror/keditbookmarks/updater.h
+++ b/konqueror/keditbookmarks/updater.h
@@ -1,5 +1,3 @@
-// -*- mode:cperl; cperl-indent-level:4; cperl-continued-statement-offset:4; indent-tabs-mode:nil -*-
-// vim: set ts=4 sts=4 sw=4 et:
 /* This file is part of the KDE project
    Copyright (C) 2003 Alexander Kellett <lypanov@kde.org>
 
@@ -27,9 +25,9 @@
 #include <tdeparts/part.h>
 #include <tdeparts/browserinterface.h>
 
-class FavIconWebGrabber : public QObject
+class FavIconWebGrabber : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url);
     ~FavIconWebGrabber() {}
@@ -47,7 +45,7 @@ class FavIconBrowserInterface;
 
 class FavIconUpdater : public KonqFavIconMgr 
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FavIconUpdater(TQObject *parent, const char *name);
@@ -77,7 +75,7 @@ private:
 
 class FavIconBrowserInterface : public KParts::BrowserInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FavIconBrowserInterface(FavIconUpdater *view, const char *name)
         : KParts::BrowserInterface(view, name), m_view(view) {
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cpp
index 934c326f7..fa93bca57 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cpp
@@ -94,14 +94,14 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
     return -1;
 
   // Go menu
-  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
+  if ( widget->inherits("TQPopupMenu") )
   {
     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 !
@@ -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_actions.h b/konqueror/konq_actions.h
index 134c8996f..cf399e986 100644
--- a/konqueror/konq_actions.h
+++ b/konqueror/konq_actions.h
@@ -33,7 +33,7 @@ class TQPopupMenu;
  */
 class KonqBidiHistoryAction : public TDEAction
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
     KonqBidiHistoryAction( const TQString & text, TQObject* parent = 0, const char* name = 0 );
 
@@ -70,7 +70,7 @@ private:
 
 class KonqLogoAction : public TDEAction
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
     KonqLogoAction( const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
     KonqLogoAction( const TQString& text, int accel,
@@ -95,7 +95,7 @@ private:
 
 class KonqViewModeAction : public TDERadioAction
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqViewModeAction( const TQString &text, const TQString &icon,
                         TQObject *parent, const char *name );
@@ -126,7 +126,7 @@ protected:
 
 class KonqMostOftenURLSAction : public TDEActionMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqMostOftenURLSAction( const TQString& text, TQObject *parent,
diff --git a/konqueror/konq_browseriface.cc b/konqueror/konq_browseriface.cpp
index ebec2ef04..ebec2ef04 100644
--- a/konqueror/konq_browseriface.cc
+++ b/konqueror/konq_browseriface.cpp
diff --git a/konqueror/konq_browseriface.h b/konqueror/konq_browseriface.h
index 1564a73e2..49f8414d3 100644
--- a/konqueror/konq_browseriface.h
+++ b/konqueror/konq_browseriface.h
@@ -7,7 +7,7 @@ class KonqView;
 
 class KonqBrowserInterface : public KParts::BrowserInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( uint historyLength READ historyLength )
 public:
     KonqBrowserInterface( KonqView *view, const char *name );
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cpp
index 17075a529..ef65a5412 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cpp
@@ -95,7 +95,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
           : KHistoryCombo( parent, name ),
             m_returnPressed( false ), 
             m_permanent( false ),
-            m_modifier( Qt::NoButton ),
+            m_modifier( TQt::NoButton ),
 	    m_pageSecurity( KonqMainWindow::NotCrypted )
 {
     setInsertionPolicy( NoInsertion );
@@ -122,14 +122,14 @@ 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();
@@ -396,10 +396,10 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev )
     // Handle Ctrl+Del/Backspace etc better than the Qt widget, which always
     // jumps to the next whitespace.
     TQLineEdit *edit = lineEdit();
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) {
+    if ( o == edit ) {
         int type = ev->type();
         if ( type == TQEvent::KeyPress ) {
-            TQKeyEvent *e = TQT_TQKEYEVENT( ev );
+            TQKeyEvent *e = static_cast<TQKeyEvent*>( ev );
 
             if ( e->key() == Key_Return || e->key() == Key_Enter ) {
                 m_modifier = e->state();
@@ -537,7 +537,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
 {
     m_dragStart = TQPoint(); // null QPoint
 
-    if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) {
+    if ( e->button() == TQt::LeftButton && pixmap( currentItem()) ) {
         // check if the pixmap was clicked
         int x = e->pos().x();
         int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
@@ -548,7 +548,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
         }
     }
 
-    if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
+    if ( e->button() == TQt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
         // check if the lock icon was clicked
         int x = e->pos().x();
         int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x();
@@ -566,7 +566,7 @@ void KonqCombo::mouseMoveEvent( TQMouseEvent *e )
     if ( m_dragStart.isNull() || currentText().isEmpty() )
         return;
 
-    if ( e->state() & Qt::LeftButton &&
+    if ( e->state() & TQt::LeftButton &&
          (e->pos() - m_dragStart).manhattanLength() >
          TDEGlobalSettings::dndEventDelay() )
     {
@@ -591,7 +591,7 @@ void KonqCombo::slotActivated( const TQString& text )
     applyPermanent();
     m_returnPressed = true;
     emit activated( text, m_modifier );
-    m_modifier = Qt::NoButton;
+    m_modifier = TQt::NoButton;
 }
 
 void KonqCombo::setConfig( TDEConfig *kc )
@@ -651,7 +651,7 @@ void KonqCombo::setPageSecurity( int pageSecurity )
 
 bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2)
 {
-    // Taken from tdehtml/misc/helper.cc
+    // Taken from tdehtml/misc/helper.cpp
 #define HUE_DISTANCE 40
 #define CONTRAST_DISTANCE 10
 
@@ -731,7 +731,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
     if ( !text().isEmpty() ) {
         TQString squeezedText = KStringHandler::rPixelSqueeze( text(), listBox()->fontMetrics(), urlWidth );
         painter->drawText( pmWidth, 0, urlWidth + pmWidth, itemHeight, 
-                           Qt::AlignLeft | Qt::AlignTop, squeezedText );
+                           TQt::AlignLeft | TQt::AlignTop, squeezedText );
 
         //painter->setPen( TDEGlobalSettings::inactiveTextColor() );
         squeezedText = KStringHandler::rPixelSqueeze( title, listBox()->fontMetrics(), titleWidth );
@@ -739,7 +739,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
         font.setItalic( true );
         painter->setFont( font );
         painter->drawText( entryWidth - titleWidth, 0, titleWidth,
-                           itemHeight, Qt::AlignLeft | Qt::AlignTop, squeezedText );
+                           itemHeight, TQt::AlignLeft | TQt::AlignTop, squeezedText );
     }
 }
 
diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h
index 0bfe76a87..9a46d763f 100644
--- a/konqueror/konq_combo.h
+++ b/konqueror/konq_combo.h
@@ -32,7 +32,7 @@ class TDEConfig;
 // KComboBox would do fine.
 class KonqCombo : public KHistoryCombo
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqCombo( TQWidget *parent, const char *name );
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cpp
index ab5080596..861fe0fff 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cpp
@@ -1,5 +1,5 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*-
-    konq_extensionmanager.cc - Extension Manager for Konqueror
+/*
+    konq_extensionmanager.cpp - Extension Manager for Konqueror
 
     Copyright (c) 2003      by Martijn Klingens      <klingens@kde.org>
     Copyright (c) 2004      by Arend van Beelen jr.  <arend@auton.nl>
@@ -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_extensionmanager.h b/konqueror/konq_extensionmanager.h
index ac1f466b3..b70a2d5db 100644
--- a/konqueror/konq_extensionmanager.h
+++ b/konqueror/konq_extensionmanager.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset:4 -*-
+/*
 
     konq_extensionmanager.h - Extension Manager for Konqueror
 
@@ -33,7 +33,7 @@ namespace KParts { class ReadOnlyPart; }
  */
 class KonqExtensionManager : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KonqExtensionManager(TQWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart);
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cpp
index d89cbf9a6..0a69c1c8c 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cpp
@@ -64,17 +64,17 @@ 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" ) )
       kdError(1202) << "Part " << obj << " (" << obj->className() << ") doesn't inherit KParts::ReadOnlyPart !" << endl;
 
   KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>( obj );
-  TQFrame* frame = ::tqqt_cast<TQFrame*>( part->widget() );
+  TQFrame* frame = ::tqt_cast<TQFrame*>( part->widget() );
   if (frame)
   {
       frame->setFrameStyle( TQFrame::NoFrame );
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cpp
index 0acf39b49..32ca35650 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cpp
@@ -68,7 +68,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
     setSizeGripEnabled( false );
 
     m_led = new TQLabel( this );
-    m_led->setAlignment( Qt::AlignCenter );
+    m_led->setAlignment( TQt::AlignCenter );
     m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
     addWidget( m_led, 0, false ); // led (active view indicator)
     m_led->hide();
@@ -80,7 +80,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
     addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label
 
     m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" );
-    m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus);
+    m_pLinkedViewCheckBox->setFocusPolicy(TQWidget::NoFocus);
     m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
     TQWhatsThis::add( m_pLinkedViewCheckBox,
                      i18n("Checking this box on at least two views sets those views as 'linked'. "
@@ -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() );
 
@@ -173,15 +173,15 @@ void KonqFrameStatusBar::splitFrameMenu()
 
 bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e)
 {
-   if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pStatusLabel) && e->type()==TQEvent::MouseButtonPress)
+   if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress)
    {
       emit clicked();
       update();
-      if ( TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton)
+      if ( static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton)
          splitFrameMenu();
       return true;
    }
-   else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::ApplicationPaletteChange )
+   else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange )
    {
       unsetPalette();
       updateActiveStatus();
@@ -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 );
 }
 
@@ -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;
 }
@@ -397,7 +397,7 @@ bool KonqFrame::eventFilter(TQObject* /*obj*/, TQEvent *ev)
 {
    if (ev->type()==TQEvent::KeyPress)
    {
-      TQKeyEvent * keyEv = TQT_TQKEYEVENT(ev);
+      TQKeyEvent * keyEv = static_cast<TQKeyEvent*>(ev);
       if ((keyEv->key()==Key_Tab) && (keyEv->state()==ControlButton))
       {
          emit ((KonqFrameContainer*)parent())->ctrlTabPressed();
@@ -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 *)));
    }
 }
 
@@ -460,11 +460,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode )
 void
 KonqFrame::paintEvent( TQPaintEvent* )
 {
-#ifdef USE_QT4
-   #warning [INFO] Repaint call disabled in Qt4 to prevent recursive repaint (which otherwise occurs for unknown reasons)
-#else // USE_QT4
    m_pStatusBar->repaint();
-#endif // USE_QT4
 }
 
 void KonqFrame::slotRemoveView()
@@ -534,9 +530,9 @@ void KonqFrameContainer::saveConfig( TDEConfig* config, const TQString &prefix,
 
   //write orientation
   TQString o;
-  if( orientation() == Qt::Horizontal )
+  if( orientation() == TQt::Horizontal )
     o = TQString::fromLatin1("Horizontal");
-  else if( orientation() == Qt::Vertical )
+  else if( orientation() == TQt::Vertical )
     o = TQString::fromLatin1("Vertical");
   config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o );
 
diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h
index e3ae0ba2a..77dd99689 100644
--- a/konqueror/konq_frame.h
+++ b/konqueror/konq_frame.h
@@ -64,7 +64,7 @@ namespace KParts
  */
 class KonqCheckBox : public TQCheckBox
 {
-    Q_OBJECT // for classname
+    TQ_OBJECT // for classname
 public:
     KonqCheckBox(TQWidget *parent=0, const char *name=0)
       :TQCheckBox( parent, name ) {}
@@ -80,7 +80,7 @@ protected:
  */
 class KonqFrameStatusBar : public KStatusBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
    public:
       KonqFrameStatusBar( KonqFrame *_parent = 0L, const char *_name = 0L );
@@ -198,7 +198,7 @@ protected:
 
 class KonqFrame : public TQWidget, public KonqFrameBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer = 0L,
@@ -346,7 +346,7 @@ protected:
 
 class KonqFrameContainer : public TQSplitter, public KonqFrameContainerBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX
 public:
   KonqFrameContainer( Orientation o,
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cpp
index 31647b0c3..2e3703151 100644
--- a/konqueror/konq_guiclients.cc
+++ 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()
@@ -235,7 +235,7 @@ TQPtrList<TDEAction> ToggleViewGUIClient::actions() const
 
 void ToggleViewGUIClient::slotToggleView( bool toggle )
 {
-  TQString serviceName = TQString::fromLatin1( TQT_TQOBJECT_CONST(sender())->name() );
+  TQString serviceName = TQString::fromLatin1( sender()->name() );
 
   bool horizontal = m_mapOrientation[ serviceName ];
 
@@ -244,7 +244,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
   if ( toggle )
   {
 
-    KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal,
+    KonqView *childView = viewManager->splitWindow( horizontal ? TQt::Vertical : TQt::Horizontal,
                                                     TQString::fromLatin1( "Browser/View" ),
                                                     serviceName,
                                                     !horizontal /* vertical = make it first */);
diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h
index 73d9b9a60..3fbaf9388 100644
--- a/konqueror/konq_guiclients.h
+++ b/konqueror/konq_guiclients.h
@@ -71,7 +71,7 @@ private:
 
 class ToggleViewGUIClient : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ToggleViewGUIClient( KonqMainWindow *mainWindow );
   virtual ~ToggleViewGUIClient();
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cpp
index ee1fc71db..ee1fc71db 100644
--- a/konqueror/konq_main.cc
+++ b/konqueror/konq_main.cpp
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cpp
index 10cf5c421..01cbf5a52 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cpp
@@ -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( kapp, "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( kapp, 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() )
@@ -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 )
@@ -476,11 +476,9 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
                               const TQString &_serviceType, KonqOpenURLRequest& req,
                               bool trustedSource )
 {
-#ifndef NDEBUG // needed for req.debug()
   kdDebug(1202) << "KonqMainWindow::openURL : url = '" << _url << "'  "
                 << "serviceType='" << _serviceType << "' req=" << req.debug()
                 << " view=" << _view << endl;
-#endif
 
   KURL url( _url );
   if (url.url().startsWith("$(")) {
@@ -543,6 +541,27 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url,
       return;
   }
 
+  // Default action for media encrypted disks is either lock or unlock based on current status
+  TQString lockingAction = TQString::null;
+  if (serviceType.contains("encrypted_locked")) {
+    lockingAction = "konqueror/servicemenus/media_unlock.desktop";
+  }
+  else if (serviceType.contains("encrypted_unlocked")) {
+    lockingAction = "konqueror/servicemenus/media_lock.desktop";
+  }
+  if (!lockingAction.isEmpty()) {
+    TQString lockingService = TDEGlobal::dirs()->findResource("data", lockingAction);
+      if (!lockingService.isEmpty()) {
+      TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, url.isLocalFile());
+      if (serviceList.count() == 1) {
+        KURL::List m_lstURLs;
+        m_lstURLs.append(url);
+        KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]);
+        return;
+      }
+    }
+  }
+
   TQString nameFilter = detectNameFilter( url );
   if ( !nameFilter.isEmpty() )
   {
@@ -680,7 +699,7 @@ 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() ) );
   }
 }
 
@@ -698,6 +717,27 @@ bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView
      return false; // execute, don't open
   // Contract: the caller of this method should ensure the view is stopped first.
 
+  // If trying to navigate to an encrypted disk, unlock it if necessary and then navigate to system:/media
+  if (serviceType.contains("encrypted"))
+  {
+    if (serviceType.contains("encrypted_locked"))
+    {
+      TQString lockingService = TDEGlobal::dirs()->findResource("data", "konqueror/servicemenus/media_unlock.desktop");
+      if (!lockingService.isEmpty())
+      {
+        TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, _url.isLocalFile());
+        if (serviceList.count() == 1)
+        {
+          KURL::List m_lstURLs;
+          m_lstURLs.append(_url);
+          KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]);
+        }
+      }
+    }
+    slotGoMedia();
+    return true;
+  }
+
 #ifndef NDEBUG
   kdDebug(1202) << "KonqMainWindow::openView " << serviceType << " " << _url << " " << childView << " req:" << req.debug() << endl;
 #endif
@@ -939,7 +979,7 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs
 {
   kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
 
-  KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() );
+  KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
   TQString frameName = args.frameName;
 
   if ( !frameName.isEmpty() )
@@ -1020,9 +1060,9 @@ 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_OBJECT_NAME_STRING ) ) {
+  while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) {
     viewFrame = nextFrame;
     nextFrame = nextFrame->parent();
   }
@@ -1149,9 +1189,9 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
     {
         KParts::BrowserHostExtension *hostExtension = 0;
         KParts::ReadOnlyPart *ro_part = 0L;
-        KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender());
+        KParts::BrowserExtension *be = ::tqt_cast<KParts::BrowserExtension *>(sender());
         if (be)
-            ro_part = ::tqqt_cast<KParts::ReadOnlyPart *>(be->parent());
+            ro_part = ::tqt_cast<KParts::ReadOnlyPart *>(be->parent());
         if ( findChildView( ro_part, args.frameName, &mainWindow, &hostExtension, &part ) )
         {
             // Found a view. If url isn't empty, we should open it - but this never happens currently
@@ -1270,7 +1310,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
 // well. If the WM has support for _NET_WM_USER_TIME, it will be just set to 0 (=don't focus on show),
 // and the WM should take care of it itself.
     bool wm_usertime_support = false;
-    Time saved_last_input_time = GET_QT_X_USER_TIME();
+    Time saved_last_input_time = get_tqt_x_user_time();
     if ( windowArgs.lowerWindow )
     {
         NETRootInfo wm_info( tqt_xdisplay(), NET::Supported );
@@ -1280,7 +1320,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
         // *sigh*, and I thought nobody would need TQWidget::dontFocusOnShow().
         // Avoid Qt's support for user time by setting it to 0, and
         // set the property ourselves.
-            SET_QT_X_USER_TIME(0);
+            set_tqt_x_user_time(0);
             KWin::setUserTime( mainWindow->winId(), 0 );
         }
         // Put below the current window before showing, in case that actually works with the WM.
@@ -1293,7 +1333,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
 
     if ( windowArgs.lowerWindow )
     {
-        SET_QT_X_USER_TIME(saved_last_input_time);
+        set_tqt_x_user_time(saved_last_input_time);
         if( !wm_usertime_support )
         { // No WM support. Let's try ugly tricks.
             mainWindow->lower();
@@ -1468,7 +1508,7 @@ void KonqMainWindow::slotOpenLocation()
 
 void KonqMainWindow::slotToolFind()
 {
-  kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << TQT_TQOBJECT_CONST(sender())->className() << endl;
+  kdDebug(1202) << "KonqMainWindow::slotToolFind sender:" << sender()->className() << endl;
 
   if ( m_currentView && m_currentView->part()->inherits("KonqDirPart") )
   {
@@ -1495,10 +1535,10 @@ 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 ( TQT_TQOBJECT_CONST(sender())->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below
+  else if ( sender()->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below
   {
       KURL url;
       if ( m_currentView && m_currentView->url().isLocalFile() )
@@ -1510,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);
   }
 }
@@ -1547,7 +1587,7 @@ void KonqMainWindow::slotOpenWith()
   KURL::List lst;
   lst.append( m_currentView->url() );
 
-  TQString serviceName = TQT_TQOBJECT_CONST(sender())->name();
+  TQString serviceName = sender()->name();
 
   TDETrader::OfferList offers = m_currentView->appServiceOffers();
   TDETrader::OfferList::ConstIterator it = offers.begin();
@@ -1565,7 +1605,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
   if ( !toggle )
     return;
 
-  TQString modeName = TQT_TQOBJECT_CONST(sender())->name();
+  TQString modeName = sender()->name();
 
   if ( m_currentView->service()->desktopEntryName() == modeName )
     return;
@@ -1824,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>"
@@ -1863,7 +1903,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat
 
     if( state & TQt::ControlButton ) // Ctrl Left/MMB
 	openFilteredURL( homeURL, req);
-    else if( state & Qt::MidButton )
+    else if( state & TQt::MidButton )
     {
         if(KonqSettings::mmbOpensTab())
 	    openFilteredURL( homeURL, req);
@@ -1880,7 +1920,7 @@ void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState stat
 
 void KonqMainWindow::slotHome()
 {
-    slotHome(TDEAction::UnknownActivation, Qt::LeftButton);
+    slotHome(TDEAction::UnknownActivation, TQt::LeftButton);
 }
 
 void KonqMainWindow::slotGoSystem()
@@ -1938,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;
   }
 
@@ -2002,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();
 }
 
@@ -2131,7 +2171,7 @@ void KonqMainWindow::applyKonqMainWindowSettings()
 void KonqMainWindow::slotSetStatusBarText( const TQString & )
 {
    // Reimplemented to disable KParts::MainWindow default behaviour
-   // Does nothing here, see konq_frame.cc
+   // Does nothing here, see konq_frame.cpp
 }
 
 void KonqMainWindow::slotViewCompleted( KonqView * view )
@@ -2302,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();
@@ -2315,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();
@@ -2602,14 +2642,14 @@ void KonqMainWindow::slotFileNewAboutToShow()
 
 void KonqMainWindow::slotSplitViewHorizontal()
 {
-  KonqView * newView = m_pViewManager->splitView( Qt::Horizontal );
+  KonqView * newView = m_pViewManager->splitView( TQt::Horizontal );
   if (newView == 0L) return;
   newView->openURL( m_currentView->url(), m_currentView->locationBarURL() );
 }
 
 void KonqMainWindow::slotSplitViewVertical()
 {
-  KonqView * newView = m_pViewManager->splitView( Qt::Vertical );
+  KonqView * newView = m_pViewManager->splitView( TQt::Vertical );
   if (newView == 0L) return;
   newView->openURL( m_currentView->url(), m_currentView->locationBarURL() );
 }
@@ -2674,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()
@@ -2818,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()
@@ -2856,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()
@@ -2905,7 +2945,7 @@ void KonqMainWindow::slotActivatePrevTab()
 
 void KonqMainWindow::slotActivateTab()
 {
-  m_pViewManager->activateTab( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 );
+  m_pViewManager->activateTab( TQString( sender()->name() ).right( 2 ).toInt() -1 );
 }
 
 void KonqMainWindow::slotDumpDebugInfo()
@@ -3088,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 = Qt::LeftButton;
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) );
+    m_goState = TQt::LeftButton;
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) );
 }
 
 void KonqMainWindow::slotUpDelayed()
@@ -3111,7 +3151,7 @@ void KonqMainWindow::slotUpDelayed()
     const TQString& url = m_currentView->upURL().url();
     if(m_goState & TQt::ControlButton)
 	openFilteredURL(url, req );
-    else if(m_goState & Qt::MidButton)
+    else if(m_goState & TQt::MidButton)
     {
         if(KonqSettings::mmbOpensTab())
 	    openFilteredURL( url, req);
@@ -3120,7 +3160,7 @@ void KonqMainWindow::slotUpDelayed()
     }
     else
 	openFilteredURL( url, false );
-    m_goState = Qt::LeftButton;
+    m_goState = TQt::LeftButton;
 }
 
 void KonqMainWindow::slotUpActivated( int id )
@@ -3141,7 +3181,7 @@ void KonqMainWindow::slotGoMenuAboutToShow()
 
 void KonqMainWindow::slotGoHistoryActivated( int steps )
 {
-    slotGoHistoryActivated( steps, Qt::LeftButton );
+    slotGoHistoryActivated( steps, TQt::LeftButton );
 }
 
 void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state )
@@ -3152,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()));
   }
 }
 
@@ -3172,7 +3212,7 @@ void KonqMainWindow::slotGoHistoryDelayed()
       if (newView && inFront)
 	  m_pViewManager->showTab( newView );
   }
-  else if(m_goState & Qt::MidButton)
+  else if(m_goState & TQt::MidButton)
   {
       if(mmbOpensTab)
       {
@@ -3190,7 +3230,7 @@ void KonqMainWindow::slotGoHistoryDelayed()
   }
 
   m_goBuffer = 0;
-  m_goState = Qt::LeftButton;
+  m_goState = TQt::LeftButton;
 }
 
 
@@ -3244,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() );
@@ -3256,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);
 
@@ -3275,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() ) );
   }
 }
 
@@ -3422,11 +3462,11 @@ void KonqMainWindow::slotClearComboHistory()
 bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
 {
   if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) &&
-       m_combo && TQT_BASE_OBJECT(m_combo->lineEdit()) == TQT_BASE_OBJECT(obj) )
+       m_combo && m_combo->lineEdit() == obj )
   {
     //kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl;
 
-    TQFocusEvent * focusEv = TQT_TQFOCUSEVENT(ev);
+    TQFocusEvent * focusEv = static_cast<TQFocusEvent*>(ev);
     if (focusEv->reason() == TQFocusEvent::Popup)
     {
       return KParts::MainWindow::eventFilter( obj, ev );
@@ -3464,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);
@@ -3505,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 )
       {
@@ -3553,8 +3593,8 @@ void KonqMainWindow::slotClipboardDataChanged()
 
 void KonqMainWindow::slotCheckComboSelection()
 {
-  //kdDebug(1202) << "m_combo->lineEdit()->hasMarkedText() : " << hasSelection << endl;
   bool hasSelection = m_combo->lineEdit()->hasSelectedText();
+  //kdDebug(1202) << "m_combo->lineEdit()->hasSelectedText() : " << hasSelection << endl;
   m_paCopy->setEnabled( hasSelection );
   m_paCut->setEnabled( hasSelection );
 }
@@ -3565,7 +3605,7 @@ void KonqMainWindow::slotClearLocationBar( TDEAction::ActivationReason, TQt::But
   slotStop();
   m_combo->clearTemporary();
   focusLocationBar();
-  if ( state & Qt::MidButton )
+  if ( state & TQt::MidButton )
       m_combo->setURL( TQApplication::clipboard()->text( TQClipboard::Selection ) );
 }
 
@@ -3775,77 +3815,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" );
+  (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 (kapp->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" <<
@@ -3860,41 +3900,41 @@ void KonqMainWindow::initActions()
 
 
   if (!kapp->authorizeControlModules(configModules()).isEmpty())
-     KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure()), actionCollection() );
+     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"), 0 , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left");
-  m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), 0 , 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 );
@@ -3903,19 +3943,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" );
@@ -3925,24 +3965,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" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" );
+  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,
@@ -3956,8 +3996,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." ) );
 
@@ -3973,21 +4013,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" ), 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." ) );
 
@@ -4080,13 +4120,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() ) );
   }
 }
 
@@ -4103,7 +4143,7 @@ void KonqMainWindow::slotOpenBookmarkURL( const TQString & url, TQt::ButtonState
 
     if( state & TQt::ControlButton ) // Ctrl Left/MMB
 	openFilteredURL( url, req);
-    else if( state & Qt::MidButton )
+    else if( state & TQt::MidButton )
     {
         if(KonqSettings::mmbOpensTab())
 	    openFilteredURL( url, req);
@@ -4305,7 +4345,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() )
@@ -4620,7 +4660,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
 {
   KonqView * m_oldView = m_currentView;
 
-  KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( TQT_TQOBJECT_CONST(sender())->parent() ) );
+  KonqView * currentView = childView( static_cast<KParts::ReadOnlyPart *>( sender()->parent() ) );
 
   //kdDebug() << "KonqMainWindow::slotPopupMenu m_oldView=" << m_oldView << " new currentView=" << currentView << " passive:" << currentView->isPassiveMode() << endl;
 
@@ -4661,7 +4701,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 );
 
@@ -4734,10 +4774,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
@@ -4748,12 +4788,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;
@@ -4789,24 +4829,29 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
 
   connectActionCollection( pPopupMenu->actionCollection() );
 
-  pPopupMenu->factory()->addClient( konqyMenuClient );
+  if (pPopupMenu->hasGroup("tabhandling"))
+  {
+    // "tabhandling" group in inserted in the popup menu if no encrypted media devices are part of "_items"
+    // see libkonq/konq_popupmenu.cpp KonqPopupMenu::setup() method
+    pPopupMenu->factory()->addClient( konqyMenuClient );
+  }
 
   if ( client )
     pPopupMenu->factory()->addClient( client );
 
-  KParts::BrowserExtension *be = ::tqqt_cast<KParts::BrowserExtension *>(sender());
+  KParts::BrowserExtension *be = ::tqt_cast<KParts::BrowserExtension *>(sender());
 
   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;
@@ -4823,13 +4868,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;
@@ -4860,7 +4905,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
         }
         // Special case: RMB + renaming in sidebar; setFocus would abort editing.
         TQWidget* fw = focusWidget();
-        if ( !fw || !::tqqt_cast<TQLineEdit*>( fw ) )
+        if ( !fw || !::tqt_cast<TQLineEdit*>( fw ) )
             m_oldView->part()->widget()->setFocus();
     }
   }
@@ -4881,13 +4926,13 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items )
 
 void KonqMainWindow::slotOpenEmbedded()
 {
-  TQCString name = TQT_TQOBJECT_CONST(sender())->name();
+  TQCString name = sender()->name();
 
   m_popupService = m_popupEmbeddingServices[ name.toInt() ]->desktopEntryName();
 
   m_popupEmbeddingServices.clear();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenEmbeddedDoIt() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotOpenEmbeddedDoIt() ) );
 }
 
 void KonqMainWindow::slotOpenEmbeddedDoIt()
@@ -5000,8 +5045,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 );
   }
@@ -5054,7 +5099,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
@@ -5087,14 +5132,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() );
@@ -5141,15 +5186,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 );
 
@@ -5233,7 +5278,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;
 
@@ -5473,18 +5518,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() ) );
 }
 
 //
@@ -5767,7 +5812,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
@@ -5788,7 +5833,7 @@ void KonqMainWindow::resetWindow()
     static Atom atom = XInternAtom( tqt_xdisplay(), "_TDE_NET_WM_USER_CREATION_TIME", False );
     XChangeProperty( tqt_xdisplay(), winId(), atom, XA_CARDINAL, 32,
 		     PropModeReplace, (unsigned char *) &x_time, 1);
-    SET_QT_X_USER_TIME(CurrentTime); // won't have _NET_WM_USER_TIME set
+    set_tqt_x_user_time(CurrentTime); // won't have _NET_WM_USER_TIME set
 #if !KDE_IS_VERSION( 3, 2, 90 ) // _KDE_NET_USER_TIME is obsolete
     static Atom atom2 = XInternAtom( tqt_xdisplay(), "_KDE_NET_USER_TIME", False );
     timeval tv;
@@ -5972,5 +6017,3 @@ void KonqMainWindow::restoreWindowSize()
 
 #include "konq_mainwindow.moc"
 #include "konq_mainwindow_p.moc"
-/* vim: et sw=4 ts=4
- */
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index 3e9c71ac5..281407cf8 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset:2 -*-
+/*
    This file is part of the KDE project
    Copyright (C) 1998, 1999 Simon Hausmann <hausmann@kde.org>
    Copyright (C) 2000-2004 David Faure <faure@kde.org>
@@ -87,7 +87,7 @@ class KonqExtendedBookmarkOwner;
 
 class KonqMainWindow : public KParts::MainWindow, public KonqFrameContainerBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int viewCount READ viewCount )
   TQ_PROPERTY( int activeViewsCount READ activeViewsCount )
   TQ_PROPERTY( int linkableViewsCount READ linkableViewsCount )
diff --git a/konqueror/konq_mainwindow_p.h b/konqueror/konq_mainwindow_p.h
index d463ec193..10b6c68c1 100644
--- a/konqueror/konq_mainwindow_p.h
+++ b/konqueror/konq_mainwindow_p.h
@@ -23,7 +23,7 @@
 
 class KonqExtendedBookmarkOwner : public KExtendedBookmarkOwner
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqExtendedBookmarkOwner(KonqMainWindow *);
   // for KBookmarkOwner
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cpp
index b2f0ad47f..1fbea747e 100644
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cpp
@@ -225,8 +225,8 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text
   , m_mw(mw)
 {
   setBackgroundMode( TQt::PaletteButton );
-  setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
-                 Qt::AlignVCenter | TQt::ShowPrefix );
+  setAlignment( (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
+                 TQt::AlignVCenter | TQt::ShowPrefix );
   setAcceptDrops(true);
   adjustSize();
   validDrag = false;
@@ -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_misc.h b/konqueror/konq_misc.h
index ada1712c5..27fe0caa4 100644
--- a/konqueror/konq_misc.h
+++ b/konqueror/konq_misc.h
@@ -21,7 +21,7 @@
 #define _konq_misc_h
 
 // This file can hold every global class for konqueror that used to pollute
-// konq_main.cc
+// konq_main.cpp
 
 #include <krun.h>
 #include <tdeparts/browserextension.h>
@@ -111,7 +111,7 @@ public:
 
 class KonqDraggableLabel : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqDraggableLabel( KonqMainWindow * mw, const TQString & text );
 
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cpp
index f7241713b..6819990a9 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cpp
@@ -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 );
diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h
index e0f98a589..cb6db7fcc 100644
--- a/konqueror/konq_profiledlg.h
+++ b/konqueror/konq_profiledlg.h
@@ -46,7 +46,7 @@ public:
 
 class KonqProfileDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqProfileDlg( KonqViewManager *manager, const TQString &preselectProfile, TQWidget *parent = 0L );
   ~KonqProfileDlg();
diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cpp
index 8c2a91329..01cff73c6 100644
--- a/konqueror/konq_run.cc
+++ b/konqueror/konq_run.cpp
@@ -148,10 +148,10 @@ void KonqRun::init()
     KParts::BrowserRun::init();
     // Maybe init went to the "let's try stat'ing" part. Then connect to info messages.
     // (in case it goes to scanFile, this will be done below)
-    TDEIO::StatJob *job = tqt_dynamic_cast<TDEIO::StatJob*>( m_job );
+    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& ) ) );
     }
 }
 
@@ -160,13 +160,13 @@ void KonqRun::scanFile()
     KParts::BrowserRun::scanFile();
     // could be a static cast as of now, but who would notify when
     // BrowserRun changes
-    TDEIO::TransferJob *job = tqt_dynamic_cast<TDEIO::TransferJob*>( m_job );
+    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_run.h b/konqueror/konq_run.h
index a5539b993..d5876eed2 100644
--- a/konqueror/konq_run.h
+++ b/konqueror/konq_run.h
@@ -30,7 +30,7 @@ class KonqView;
 
 class KonqRun : public KParts::BrowserRun
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a KonqRun instance, associated to the main view and an
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cpp
index 868b8edc9..0506648ff 100644
--- a/konqueror/konq_tabs.cc
+++ 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());
 }
@@ -339,7 +339,7 @@ void KonqFrameTabs::removeChildFrame( KonqFrameBase * frame )
 void KonqFrameTabs::slotCurrentChanged( TQWidget* newPage )
 {
   setTabColor( newPage, TDEGlobalSettings::textColor() );
-  KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>(newPage);
+  KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>(newPage);
 
   if (currentFrame && !m_pViewManager->isLoadingProfile()) {
     m_pActiveChild = currentFrame;
@@ -367,7 +367,7 @@ void KonqFrameTabs::slotMovedTab( int from, int to )
   m_pChildFrameList->remove( fromFrame );
   m_pChildFrameList->insert( to, fromFrame );
 
-  KonqFrameBase* currentFrame = tqt_dynamic_cast<KonqFrameBase*>( currentPage() );
+  KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>( currentPage() );
   if ( currentFrame && !m_pViewManager->isLoadingProfile() ) {
     m_pActiveChild = currentFrame;
     currentFrame->activateChild();
@@ -451,11 +451,11 @@ void KonqFrameTabs::slotContextMenu( TQWidget *w, const TQPoint &p )
   m_pPopupMenu->setItemEnabled( OTHERTABS_ID, tabCount>1 );
   m_pSubPopupMenuTab->setItemEnabled( m_closeOtherTabsId, true );
 
-  // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a
+  // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a
   // class hierarchy and it could crash one day, but I haven't checked
   // setWorkingTab so I don't know if it can handle nulls.
 
-  m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+  m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
   m_pPopupMenu->exec( p );
 }
 
@@ -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,15 +488,15 @@ 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() );
 }
 
 void KonqFrameTabs::slotCloseRequest( TQWidget *w )
 {
   if ( m_pChildFrameList->count() > 1 ) {
-    // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
-    m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+    // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
+    m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
     emit ( removeTabPopup() );
   }
 }
@@ -523,8 +523,8 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
 {
   if ( m_MouseMiddleClickClosesTab ) {
     if ( m_pChildFrameList->count() > 1 ) {
-      // Yes, I know this is an unchecked tqt_dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
-      m_pViewManager->mainWindow()->setWorkingTab( tqt_dynamic_cast<KonqFrameBase*>(w) );
+      // Yes, I know this is an unchecked dynamic_cast - I'm casting sideways in a class hierarchy and it could crash one day, but I haven't checked setWorkingTab so I don't know if it can handle nulls.
+      m_pViewManager->mainWindow()->setWorkingTab( dynamic_cast<KonqFrameBase*>(w) );
       emit ( removeTabPopup() );
     }
   }
@@ -532,7 +532,7 @@ void KonqFrameTabs::slotMouseMiddleClick( TQWidget *w )
   TQApplication::clipboard()->setSelectionMode( TQClipboard::Selection );
   KURL filteredURL ( KonqMisc::konqFilteredURL( this, TQApplication::clipboard()->text() ) );
   if ( !filteredURL.isEmpty() ) {
-    KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w);
+    KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
     if (frame) {
       m_pViewManager->mainWindow()->openURL( frame->activeChildView(), filteredURL );
     }
@@ -562,7 +562,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e )
 {
   KURL::List lstDragURLs;
   bool ok = KURLDrag::decode( e, lstDragURLs );
-  KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>(w);
+  KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>(w);
   if ( ok && lstDragURLs.first().isValid() && frame ) {
     KURL lstDragURL = lstDragURLs.first();
     if ( lstDragURL != frame->activeChildView()->url() )
@@ -572,7 +572,7 @@ void KonqFrameTabs::slotReceivedDropEvent( TQWidget *w, TQDropEvent *e )
 
 void KonqFrameTabs::slotInitiateDrag( TQWidget *w )
 {
-  KonqFrameBase* frame = tqt_dynamic_cast<KonqFrameBase*>( w );
+  KonqFrameBase* frame = dynamic_cast<KonqFrameBase*>( w );
   if (frame) {
     KURL::List lst;
     lst.append( frame->activeChildView()->url() );
diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h
index f21bf82a9..bfc15dbb0 100644
--- a/konqueror/konq_tabs.h
+++ b/konqueror/konq_tabs.h
@@ -43,7 +43,7 @@ class TDEAction;
 
 class KonqFrameTabs : public KTabWidget, public KonqFrameContainerBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class KonqFrame; //for emitting ctrlTabPressed() only, aleXXX
 
 public:
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cpp
index ecbac60ca..0f809ccd1 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cpp
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset: 2 -*-
+/*
    This file is part of the KDE project
    Copyright (C) 1998-2005 David Faure <faure@kde.org>
 
@@ -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_OBJECT_NAME_STRING) )
+  if (m_bBackRightClick && 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 & ) ) );
   }
 }
 
@@ -1097,7 +1097,7 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value )
     return false;
   TQUObject o[ 2 ];
 
-  static_TQUType_bool.set( o + 1, value );
+  static_QUType_bool.set( o + 1, value );
 
   obj->tqt_invoke( id, o );
   return true;
@@ -1114,7 +1114,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value
     return false;
   TQUObject o[ 2 ];
 
-  static_TQUType_TQString.set( o + 1, value );
+  static_QUType_TQString.set( o + 1, value );
 
   obj->tqt_invoke( id, o );
   return true;
@@ -1131,7 +1131,7 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value
     return false;
   TQUObject o[ 2 ];
 
-  static_TQUType_ptr.set( o + 1, &value );
+  static_QUType_ptr.set( o + 1, &value );
 
   obj->tqt_invoke( id, o );
   return true;
@@ -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,7 +1220,7 @@ void KonqView::reparseConfiguration()
     bool b = KonqSettings::backRightClick();
     if ( m_bBackRightClick != b )
     {
-        if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) )
+        if (m_bBackRightClick && m_pPart->widget()->inherits("TQScrollView") )
         {
             (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
         }
@@ -1256,7 +1256,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
     if ( !m_pPart )
         return false;
 //  kdDebug() << "--" << obj->className() << "--" << e->type() << "--"  << endl;
-    if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) )
+    if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() )
     {
         TQDragEnterEvent *ev = static_cast<TQDragEnterEvent *>( e );
 
@@ -1265,19 +1265,19 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
             KURL::List lstDragURLs;
             bool ok = KURLDrag::decode( ev, lstDragURLs );
 
-            TQObjectList *children = m_pPart->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
+            TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" );
 
             if ( ok &&
                  !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;
         }
     }
-    else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) )
+    else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() )
     {
         TQDropEvent *ev = static_cast<TQDropEvent *>( e );
 
@@ -1293,7 +1293,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
     {
         if ( e->type() == TQEvent::ContextMenu )
         {
-            TQContextMenuEvent *ev = TQT_TQCONTEXTMENUEVENT( e );
+            TQContextMenuEvent *ev = static_cast<TQContextMenuEvent*>( e );
             if ( ev->reason() == TQContextMenuEvent::Mouse )
             {
                 return true;
@@ -1301,16 +1301,16 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
         }
         else if ( e->type() == TQEvent::MouseButtonPress )
         {
-            TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-            if ( ev->button() == Qt::RightButton )
+            TQMouseEvent *ev = static_cast<TQMouseEvent*>( e );
+            if ( ev->button() == TQt::RightButton )
             {
                 return true;
             }
         }
         else if ( e->type() == TQEvent::MouseButtonRelease )
         {
-            TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-            if ( ev->button() == Qt::RightButton )
+            TQMouseEvent *ev = static_cast<TQMouseEvent*>( e );
+            if ( ev->button() == TQt::RightButton )
             {
                 emit backRightClick();
                 return true;
@@ -1318,8 +1318,8 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
         }
         else if ( e->type() == TQEvent::MouseMove )
         {
-            TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-            if ( ev->state() == Qt::RightButton )
+            TQMouseEvent *ev = static_cast<TQMouseEvent*>( e );
+            if ( ev->state() == TQt::RightButton )
             {
                 obj->removeEventFilter( this );
                 TQMouseEvent me( TQEvent::MouseButtonPress, ev->pos(), 2, 2 );
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 55f0f1069..2de9fa2c6 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -1,4 +1,4 @@
-/* -*- c-basic-offset: 2 -*-
+/*
  *  This file is part of the KDE project
  *  Copyright (C) 1998-2005 David Faure <faure@kde.org>
  *
@@ -64,7 +64,7 @@ struct HistoryEntry
  */
 class KonqView : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cpp
index ad075a976..c7ead1d0b 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cpp
@@ -1,4 +1,3 @@
-// -*- mode: c++; c-basic-offset: 2 -*-
 /*  This file is part of the KDE project
     Copyright (C) 1999 Simon Hausmann <hausmann@kde.org>
 
@@ -56,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 )
@@ -91,7 +90,7 @@ KonqViewManager::~KonqViewManager()
   clear();
 }
 
-KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
+KonqView* KonqViewManager::splitView ( TQt::Orientation orientation,
                                        const TQString &serviceType,
                                        const TQString &serviceName,
                                        bool newOneFirst, bool forceAutoEmbed )
@@ -140,7 +139,7 @@ KonqView* KonqViewManager::splitView ( Qt::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 ) {
@@ -201,7 +200,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
   return newView;
 }
 
-KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
+KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation,
                                         const TQString &serviceType,
                                         const TQString &serviceName,
                                         bool newOneFirst )
@@ -232,7 +231,7 @@ KonqView* KonqViewManager::splitWindow( Qt::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 );
 
@@ -287,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 );
@@ -409,7 +408,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
 
   KonqFrameBase* currentFrame;
   if ( tab == 0L )
-    currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+    currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
   else
     currentFrame = tab;
 
@@ -450,7 +449,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
   else
   tabContainer->setCurrentPage( tabContainer->count() - 1 );
 
-  KonqFrameBase* duplicatedFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+  KonqFrameBase* duplicatedFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
   if (duplicatedFrame)
     duplicatedFrame->copyHistory( currentFrame );
 
@@ -479,7 +478,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
 
   KonqFrameBase* currentFrame;
   if ( tab == 0L )
-    currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+    currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
   else
     currentFrame = tab;
 
@@ -507,7 +506,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
   if( newDocContainer && newDocContainer->frameType() == "Tabs")
   {
     KonqFrameTabs *kft = static_cast<KonqFrameTabs *>(newDocContainer);
-    KonqFrameBase *newFrame = tqt_dynamic_cast<KonqFrameBase*>(kft->currentPage());
+    KonqFrameBase *newFrame = dynamic_cast<KonqFrameBase*>(kft->currentPage());
     if(newFrame)
       newFrame->copyHistory( currentFrame );
   }
@@ -552,7 +551,7 @@ void KonqViewManager::removeTab( KonqFrameBase* tab )
   if ( tab != 0L ) {
     currentFrame = tab;
   } else {
-    currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+    currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
     if (!currentFrame) {
       return;
     }
@@ -621,7 +620,7 @@ void KonqViewManager::removeOtherTabs( KonqFrameBase* tab )
   KonqFrameBase *currentFrame;
 
   if ( tab == 0L )
-    currentFrame = tqt_dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
+    currentFrame = dynamic_cast<KonqFrameBase*>(tabContainer->currentPage());
   else
     currentFrame = tab;
 
@@ -883,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;
@@ -1039,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 );
 
@@ -1064,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;
@@ -1575,14 +1574,14 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
     //load container config
     TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) );
     //kdDebug(1202) << "Orientation: " << ostr << endl;
-    Qt::Orientation o;
+    TQt::Orientation o;
     if( ostr == "Vertical" )
-      o = Qt::Vertical;
+      o = TQt::Vertical;
     else if( ostr == "Horizontal" )
-      o = Qt::Horizontal;
+      o = TQt::Horizontal;
     else {
         kdWarning() << "Profile Loading Error: No orientation specified in " << name << endl;
-      o = Qt::Horizontal;
+      o = TQt::Horizontal;
     }
 
     TQValueList<int> sizes =
@@ -1600,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
@@ -1629,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;
@@ -1642,7 +1641,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
         loadItem( cfg, newContainer, *it, defaultURL, openURL );
         TQWidget* currentPage = newContainer->currentPage();
         if (currentPage != 0L) {
-          KonqView* activeChildView = tqt_dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView();
+          KonqView* activeChildView = dynamic_cast<KonqFrameBase*>(currentPage)->activeChildView();
           if (activeChildView != 0L) {
             activeChildView->setCaption( activeChildView->caption() );
             activeChildView->setTabIcon( activeChildView->url() );
@@ -1650,7 +1649,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
         }
     }
 
-    newContainer->setActiveChild( tqt_dynamic_cast<KonqFrameBase*>(newContainer->page(index)) );
+    newContainer->setActiveChild( dynamic_cast<KonqFrameBase*>(newContainer->page(index)) );
     newContainer->setCurrentPage( index );
 
     newContainer->show();
@@ -1667,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();
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index 25e55c5cf..829decc86 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -51,7 +51,7 @@ namespace KParts
 
 class KonqViewManager : public KParts::PartManager
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqViewManager( KonqMainWindow *mainWindow );
   ~KonqViewManager();
@@ -68,7 +68,7 @@ public:
    *
    * @param newOneFirst if true, move the new view as the first one (left or top)
    */
-  KonqView* splitView( Qt::Orientation orientation,
+  KonqView* splitView( TQt::Orientation orientation,
                        const TQString & serviceType = TQString::null,
                        const TQString & serviceName = TQString::null,
                        bool newOneFirst = false, bool forceAutoEmbed = false );
@@ -80,7 +80,7 @@ public:
    *
    * @param newOneFirst if true, move the new view as the first one (left or top)
    */
-  KonqView* splitWindow( Qt::Orientation orientation,
+  KonqView* splitWindow( TQt::Orientation orientation,
                          const TQString & serviceType = TQString::null,
                          const TQString & serviceName = TQString::null,
                          bool newOneFirst = false);
diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg
index ec4728e03..041fe4a46 100644
--- a/konqueror/konqueror.kcfg
+++ b/konqueror/konqueror.kcfg
@@ -45,6 +45,12 @@
       <whatsthis>Checking this option will allow files to be renamed by clicking directly on the icon name.</whatsthis>
       <!-- checked -->
     </entry>
+    <entry key="DoubleClickMoveToParent" type="Bool">
+      <default>true</default>
+      <label>Double click on empty area to move to parent folder</label>
+      <whatsthis>When this option is enabled, double clicking an empty area will navigate to the parent folder.</whatsthis>
+      <!-- checked -->
+    </entry>
     <entry key="ShowDeleteCommand" type="Bool">
       <default>true</default> 
       <label>Show 'Delete' menu entries which bypass the trashcan</label>
@@ -158,14 +164,14 @@
       <whatsthis></whatsthis>
       <!-- checked -->
     </entry>
-<!-- konq_settings.cc --> 
+<!-- konq_settings.cpp --> 
     <entry key="WordWrapText" type="Bool"> <!--LIBKONQ-->
       <default>true</default> 
       <label></label>
       <whatsthis></whatsthis>
       <!-- no writeEntry -->
     </entry>
-<!-- konq_tabs.cc --> 
+<!-- konq_tabs.cpp --> 
     <entry key="MouseMiddleClickClosesTab" type="Bool">
       <default>false</default> 
       <label></label>
@@ -282,7 +288,7 @@
       <whatsthis></whatsthis>
       <!-- checked -->
     </entry>
-<!-- konq_view.cc -->
+<!-- konq_view.cpp -->
     <entry key="EnableFavicon" type="Bool">
       <default>true</default> 
       <label></label>
@@ -502,7 +508,7 @@ PATH_JAVA
   </group>
    
   <group name="ModeToolBarServices" >
-<!-- konq_mainwindow.cc -->
+<!-- konq_mainwindow.cpp -->
     <entry key="konq_iconview" type="String">
       <label></label>
       <whatsthis></whatsthis>
@@ -526,7 +532,7 @@ PATH_JAVA
   </group>
   
   <group name="Notification Messages" >
-<!-- advancedTabDialog.cpp konq_mainwindow.cc -->
+<!-- advancedTabDialog.cpp konq_mainwindow.cpp -->
     <entry key="MultipleTabConfirm" type="Bool">
       <default>false</default> 
       <label></label>
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index 49d206664..94322e267 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
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.h b/konqueror/kttsplugin/tdehtmlkttsd.h
index f9e606c16..4c8815fbd 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.h
+++ b/konqueror/kttsplugin/tdehtmlkttsd.h
@@ -27,7 +27,7 @@ class TDEInstance;
  */
 class TDEHTMLPluginKTTSD : public KParts::Plugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/konqueror/listview/CMakeLists.txt b/konqueror/listview/CMakeLists.txt
index dd60407da..01fc5f0ec 100644
--- a/konqueror/listview/CMakeLists.txt
+++ b/konqueror/listview/CMakeLists.txt
@@ -45,10 +45,10 @@ install( FILES konq_listview.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 set( target konq_listview )
 
 set( ${target}_SRCS
-  konq_listview.cc konq_listviewwidget.cc konq_listviewitems.cc
-  konq_treeviewwidget.cc konq_treeviewitem.cc konq_textviewwidget.cc
-  konq_textviewitem.cc konq_infolistviewwidget.cc
-  konq_infolistviewitem.cc konq_listviewsettings.kcfgc
+  konq_listview.cpp konq_listviewwidget.cpp konq_listviewitems.cpp
+  konq_treeviewwidget.cpp konq_treeviewitem.cpp konq_textviewwidget.cpp
+  konq_textviewitem.cpp konq_infolistviewwidget.cpp
+  konq_infolistviewitem.cpp konq_listviewsettings.kcfgc
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/konqueror/listview/Makefile.am b/konqueror/listview/Makefile.am
index 91dd33a10..c190de7df 100644
--- a/konqueror/listview/Makefile.am
+++ b/konqueror/listview/Makefile.am
@@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = konq_listview.la
 
 METASOURCES = AUTO
 
-konq_listview_la_SOURCES = konq_listview.cc \
-                          konq_listviewwidget.cc konq_listviewitems.cc \
-                          konq_treeviewwidget.cc konq_treeviewitem.cc \
-                          konq_textviewwidget.cc konq_textviewitem.cc \
-                          konq_infolistviewwidget.cc konq_infolistviewitem.cc \
+konq_listview_la_SOURCES = konq_listview.cpp \
+                          konq_listviewwidget.cpp konq_listviewitems.cpp \
+                          konq_treeviewwidget.cpp konq_treeviewitem.cpp \
+                          konq_textviewwidget.cpp konq_textviewitem.cpp \
+                          konq_infolistviewwidget.cpp konq_infolistviewitem.cpp \
                           konq_listviewsettings.kcfgc 
                              
 konq_listview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
diff --git a/konqueror/listview/konq_detailedlistview.rc b/konqueror/listview/konq_detailedlistview.rc
index 593e7f027..06c9bc318 100644
--- a/konqueror/listview/konq_detailedlistview.rc
+++ b/konqueror/listview/konq_detailedlistview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KonqDetailedListView" version="11">
+<kpartgui name="KonqDetailedListView" version="13">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
    <Menu name="selection"><text>Selection</text>
@@ -24,8 +24,17 @@
   </Menu>
   <Separator/>
   <Action name="show_dot"/>
-  <Action name="sort_caseinsensitive"/>
-  <!--<Action name="sort_directoriesfirst" /> TODO -->
+  <Menu name="sort"><text>&amp;Sort</text>
+    <Action name="order_unicode_based"/>
+    <Action name="order_unicode_based_case_insensitive"/>
+    <Action name="order_locale_based"/>
+    <Separator/>
+    <Action name="group_directories_first"/>
+    <Action name="group_hidden_first"/>
+    <Separator/>
+    <Action name="alternate_sort_order"/>
+    <Action name="reverse_sort_order"/>
+  </Menu>
   <Menu name="listview_show"><text>Show Details</text>
    <TearOffHandle />
    <Action name="show_size"/>
diff --git a/konqueror/listview/konq_infolistview.rc b/konqueror/listview/konq_infolistview.rc
index 280b2d0ce..60f511b1f 100644
--- a/konqueror/listview/konq_infolistview.rc
+++ b/konqueror/listview/konq_infolistview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KonqInfoListView" version="12">
+<kpartgui name="KonqInfoListView" version="14">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
    <Menu name="selection"><text>Selection</text>
@@ -24,8 +24,17 @@
   </Menu>
   <Separator/>
   <Action name="show_dot"/>
-  <Action name="sort_caseinsensitive"/>
-  <!--<Action name="sort_directoriesfirst" /> TODO -->
+  <Menu name="sort"><text>&amp;Sort</text>
+    <Action name="order_unicode_based"/>
+    <Action name="order_unicode_based_case_insensitive"/>
+    <Action name="order_locale_based"/>
+    <Separator/>
+    <Action name="group_directories_first"/>
+    <Action name="group_hidden_first"/>
+    <Separator/>
+    <Action name="alternate_sort_order"/>
+    <Action name="reverse_sort_order"/>
+  </Menu>
   <Action name="view_as"/>
   <Separator/>
   <Action name="bgsettings"/>
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cpp
index 18efb3f8f..f945333b8 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cpp
@@ -218,7 +218,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup &
     cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
 
     TDEListView *lv = static_cast< TDEListView* >( listView() );
-    const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap());
+    const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
     if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
     {
         int newWidth = width( lv->fontMetrics(), lv, _column );
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cpp
index e835f1cb3..8ec62c79a 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ 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_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h
index 258a20090..07cede196 100644
--- a/konqueror/listview/konq_infolistviewwidget.h
+++ b/konqueror/listview/konq_infolistviewwidget.h
@@ -35,7 +35,7 @@ class TDESelectAction;
 class KonqInfoListViewWidget : public KonqBaseListViewWidget
 {
 //   friend class KonqTextViewItem;
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget );
       ~KonqInfoListViewWidget();
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cpp
index 67da49c6d..6a0d58973 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cpp
@@ -48,6 +48,8 @@
 #include <unistd.h>
 #include <kinstance.h>
 
+#include <konq_sort_constants.h>
+
 KonqListViewFactory::KonqListViewFactory()
 {
   s_instance = 0;
@@ -268,6 +270,8 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char
    m_mimeTypeResolver = new KMimeTypeResolver<KonqBaseListViewItem,KonqListView>(this);
 
    setXMLFile( xmlFile );
+   m_sortColumnIndexPrimary   = 0;
+   m_sortColumnIndexAlternate = 1;
 
    setupActions();
 
@@ -285,21 +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, TQ_SIGNAL( selectionChanged() ),
+            m_extension, TQ_SLOT( updateActions() ) );
+   connect( m_pListView, TQ_SIGNAL( selectionChanged() ),
+            this, TQ_SLOT( slotSelectionChanged() ) );
 
-   connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
-            m_extension, TQT_SLOT( updateActions() ) );
-   connect( m_pListView, TQT_SIGNAL( selectionChanged() ),
-            this, TQT_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() );
 }
@@ -538,6 +541,9 @@ void KonqListView::slotColumnToggled()
 
    // Update column sizes
    slotHeaderSizeChanged();
+
+   // Columns may have been rearranged, so do this to be safe:
+   resetSortConfig();
 }
 
 void KonqListView::slotHeaderClicked(int sec)
@@ -560,21 +566,230 @@ void KonqListView::slotHeaderClicked(int sec)
       m_pListView->setAscending(TRUE);
    }
    else
+   {
       m_pListView->setAscending(!m_pListView->ascending());
+   }
 
+   checkSortConfig() ;
    KonqListViewSettings config( m_pListView->url().protocol() );
    config.readConfig();
+
+   if (sec == m_sortColumnIndexPrimary) {
+      kdDebug(1202)<<"Changing sort order on primary sort column"<<endl;
+      m_sortColumnOrderPrimary = m_pListView->ascending();
+      config.setPrimarySortOrder(m_pListView->ascending());
+   }
+   else if (sec == m_sortColumnIndexAlternate) {
+      kdDebug(1202)<<"Changing sort order on alternate sort column"<<endl;
+      m_sortColumnOrderAlternate  = m_pListView->ascending();
+      config.setAlternateSortOrder(m_pListView->ascending());
+   }
+   else if ( toggleColumnAlternate ) {
+      kdDebug(1202)<<"Setting new alternate sort column"<<endl;
+      m_sortColumnNameAlternate   = nameOfSortColumn;
+      m_sortColumnIndexAlternate  = sec;
+      m_sortColumnOrderAlternate  = true;
+      config.setAlternateSortCol(nameOfSortColumn);
+      config.setAlternateSortIndex(sec);
+      config.setAlternateSortOrder(true);
+      toggleColumnAlternate = false;
+   }
+   else {
+      kdDebug(1202)<<"Setting new primary sort column"<<endl;
+      m_sortColumnNamePrimary   = nameOfSortColumn;
+      m_sortColumnIndexPrimary  = sec;
+      m_sortColumnOrderPrimary  = true;
+      config.setPrimarySortCol(nameOfSortColumn);
+      config.setPrimarySortIndex(sec);
+      config.setPrimarySortOrder(true);
+      toggleColumnAlternate = true;
+   }
+
    config.setSortBy( nameOfSortColumn );
    config.setSortOrder( m_pListView->ascending() );
    config.writeConfig();
 }
 
+void KonqListView::resetSortConfig()
+{
+   int defaultVisibleColumn;
+   int columnNumber;
+
+   defaultVisibleColumn = 0; // First visible column from left
+   columnNumber = -1;
+   for (uint i = 0; i < m_pListView->NumberOfAtoms; i++) {
+      if (m_pListView->confColumns[i].displayInColumn == defaultVisibleColumn) {
+        columnNumber = i;
+      }
+   }
+   if (columnNumber == -1) {
+      // This should not happen!
+      kdDebug() << "We did not find columnNumber" <<endl;
+      m_sortColumnIndexPrimary = 0;
+      m_sortColumnNamePrimary  = "FileName";
+   }
+   else {
+      m_sortColumnIndexPrimary = defaultVisibleColumn;
+      m_sortColumnNamePrimary = m_pListView->confColumns[columnNumber].desktopFileName;
+   }
+
+   defaultVisibleColumn = 1 ;  // Second visible column from left
+   columnNumber = -1;
+   for (uint i = 0; i < m_pListView->NumberOfAtoms; i++) {
+      if (m_pListView->confColumns[i].displayInColumn == defaultVisibleColumn) {
+        columnNumber = i;
+      }
+   }
+   if (columnNumber == -1) {
+      // This should not happen!
+      kdDebug() << "We did not find columnNumber" <<endl;
+      m_sortColumnIndexAlternate = 0;
+      m_sortColumnNameAlternate  = "FileName";
+   }
+   else {
+      m_sortColumnIndexAlternate = defaultVisibleColumn;
+      m_sortColumnNameAlternate=m_pListView->confColumns[columnNumber].desktopFileName;
+   }
+
+   m_sortColumnOrderPrimary = true ;
+   m_sortColumnOrderAlternate = true ;
+
+   kdDebug(1202) << "Initialized m_sortColumnIndexPrimary to " <<m_sortColumnIndexPrimary <<endl;
+   kdDebug(1202) << "Initialized m_sortColumnNamePrimary to " <<m_sortColumnNamePrimary <<endl;
+   kdDebug(1202) << "Initialized m_sortColumnIndexAlternate to " <<m_sortColumnIndexAlternate <<endl;
+   kdDebug(1202) << "Initialized m_sortColumnNameAlternate to " <<m_sortColumnNameAlternate <<endl;
+
+   KonqListViewSettings config( m_pListView->url().protocol() );
+   config.setPrimarySortCol(m_sortColumnNamePrimary);
+   config.setPrimarySortIndex(m_sortColumnIndexPrimary);
+   config.setPrimarySortOrder(m_sortColumnOrderPrimary);
+   config.setAlternateSortCol(m_sortColumnNameAlternate);
+   config.setAlternateSortIndex(m_sortColumnIndexAlternate);
+   config.setAlternateSortOrder(m_sortColumnOrderAlternate);
+   config.writeConfig() ;
+}
+
+void KonqListView::checkSortConfig()
+{
+   KonqListViewSettings config( m_pListView->url().protocol() );
+   config.readConfig();
+
+   m_sortColumnIndexPrimary   = config.primarySortIndex();
+   m_sortColumnNamePrimary    = config.primarySortCol();
+   m_sortColumnOrderPrimary   = config.primarySortOrder();
+
+   m_sortColumnIndexAlternate = config.alternateSortIndex();
+   m_sortColumnNameAlternate  = config.alternateSortCol();
+   m_sortColumnOrderAlternate = config.alternateSortOrder();
+
+   if (m_sortColumnIndexPrimary >= 0 && m_sortColumnIndexAlternate >= 0)
+     return ;
+
+   resetSortConfig();
+}
+
+#define LV_SORT_CHANGE_COLUMN 1
+#define LV_SORT_CHANGE_ORDER  2
+
+void KonqListView::sortListView(uint which)
+{
+   TQString sortColumnNameCurrent = m_pListView->sortedByColumn;
+   if (sortColumnNameCurrent == "" ) {
+     sortColumnNameCurrent = "FileName" ;
+     m_pListView->sortedByColumn = sortColumnNameCurrent ;
+   }
+   TQString sortColumnNameNext;
+   int      sortColumnIndex;
+   bool     sortOrder;
+
+   checkSortConfig() ;
+   KonqListViewSettings config( m_pListView->url().protocol() );
+   config.readConfig();
+
+   switch (which)
+   {
+      case LV_SORT_CHANGE_COLUMN:
+         if (m_sortColumnNamePrimary == sortColumnNameCurrent)
+         {
+            sortColumnNameNext = m_sortColumnNameAlternate;
+            sortColumnIndex = m_sortColumnIndexAlternate;
+            sortOrder = m_sortColumnOrderAlternate;
+            kdDebug(1202) << "Changing sort column to alternate"<<endl ;
+         }
+         else
+         {
+            sortColumnNameNext = m_sortColumnNamePrimary;
+            sortColumnIndex = m_sortColumnIndexPrimary;
+            sortOrder = m_sortColumnOrderPrimary;
+            kdDebug(1202) << "Changing sort column to primary"<<endl ;
+         }
+         m_pListView->setSorting( sortColumnIndex, sortOrder );
+         m_pListView->sortedByColumn = sortColumnNameNext;
+         config.setSortBy( sortColumnNameNext );
+         break;
+
+     case LV_SORT_CHANGE_ORDER:
+        sortOrder = !m_pListView->ascending();
+
+        if ( m_sortColumnNamePrimary == sortColumnNameCurrent )
+        {
+           sortColumnIndex = m_sortColumnIndexPrimary;
+           m_sortColumnOrderPrimary = sortOrder;
+           config.setPrimarySortOrder( sortOrder );
+           kdDebug(1202) << "Changing sort order of primary"<<endl ;
+        }
+        else
+        {
+           sortColumnIndex = m_sortColumnIndexAlternate;
+           m_sortColumnOrderAlternate = sortOrder ;
+           config.setAlternateSortOrder( sortOrder ) ;
+           kdDebug(1202) << "Changing sort order of alternate"<<endl ;
+        }
+        m_pListView->setAscending(sortOrder) ;
+        config.setSortOrder(sortOrder);
+        m_pListView->setSorting( sortColumnIndex, sortOrder );
+        break;
+
+     default:
+        // Do nothing in case of invalid call
+        return;
+   }
+
+   m_pListView->sort();
+
+   config.writeConfig();
+}
+
+void KonqListView::slotSortAlternate()
+{
+   KonqListView::sortListView(LV_SORT_CHANGE_COLUMN);
+}
+
+void KonqListView::slotSortReverse()
+{
+   KonqListView::sortListView(LV_SORT_CHANGE_ORDER);
+}
+
+void KonqListView::slotToggleDisplayDirectoriesFirst()
+{
+   m_pProps->setDirsFirst( m_paDisplayDirectoriesFirst->isChecked() );
+   m_pListView->updateListContents();
+   m_pListView->sort();
+}
+
+void KonqListView::slotToggleDisplayHiddenFirst()
+{
+   m_pProps->setHiddenFirst( m_paDisplayHiddenFirst->isChecked() );
+   m_pListView->updateListContents();
+   m_pListView->sort();
+}
+
 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()
@@ -609,6 +824,9 @@ void KonqListView::slotSaveAfterHeaderDrag()
 
    // Update column sizes
    slotHeaderSizeChanged();
+
+   // Columns were rearranged, so do this to be safe:
+   resetSortConfig();
 }
 
 void KonqListView::slotSaveColumnWidths()
@@ -645,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();
@@ -667,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.
@@ -711,9 +929,53 @@ 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,
+    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,
+    TQ_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order");
+  m_paSortReverse->setToolTip( i18n( "Reverse sort order of current sort column" ) );
+
+  /*
+     Build View->Sort submenu interface to properties
+     SortOrder, SortDirsFirst & SortHiddenFirst
+  */
+  TextSortOrder initialOrder = m_pProps->getSortOrder();
+
+  m_paOrderUnicodeUnmodified = new TDEToggleAction( i18n( "&Unicode based" ), ALT+Key_1, this,
+    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,
+    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,
+    TQ_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" );
+  m_paOrderLocale->setToolTip( i18n( "Locale based order, usually \"friendly\"" ) );
+  m_paOrderLocale->setChecked(initialOrder == LOCALE_UNMODIFIED);
+
+  // Convert above 3 checkbox menu items into single 3-way radio button menu item
+  m_paOrderUnicodeUnmodified->setExclusiveGroup( "sortOrder" );
+  m_paOrderUnicodeCaseInsensitive->setExclusiveGroup( "sortOrder" );
+  m_paOrderLocale->setExclusiveGroup( "sortOrder" );
+
+  m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), CTRL+SHIFT+Key_F, this,
+    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,
+    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());
 
   newIconSize( TDEIcon::SizeSmall /* default size */ );
 }
@@ -726,6 +988,32 @@ void KonqListView::slotSelectionChanged()
 //  m_paInvertSelection->setEnabled( itemSelected );
 }
 
-#include "konq_listview.moc"
+void KonqListView::slotOrderUnicodeUnmodified()
+{
+  TextSortOrder sortOrder = UNICODE_UNMODIFIED ;
+  kdDebug(1202) << "Setting name order = " << sortOrder << endl;
+  m_pProps->setSortOrder( sortOrder );
+  m_pListView->m_sortOrder = sortOrder;
+  m_pListView->sort();
+}
+
+void KonqListView::slotOrderUnicodeCaseInsensitive()
+{
+  TextSortOrder sortOrder = UNICODE_CASEINSENSITIVE;
+  kdDebug(1202) << "Setting name order = " << sortOrder << endl;
+  m_pProps->setSortOrder( sortOrder );
+  m_pListView->m_sortOrder = sortOrder;
+  m_pListView->sort();
+}
 
+void KonqListView::slotOrderLocale()
+{
+  TextSortOrder sortOrder = LOCALE_UNMODIFIED;
+  kdDebug(1202) << "Setting name order = " << sortOrder << endl;
+  m_pProps->setSortOrder( sortOrder );
+  m_pListView->m_sortOrder = sortOrder;
+  m_pListView->sort();
+}
+
+#include "konq_listview.moc"
 
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h
index 4c3719bd0..bcd2ec0a1 100644
--- a/konqueror/listview/konq_listview.h
+++ b/konqueror/listview/konq_listview.h
@@ -63,8 +63,10 @@ class KonqListView : public KonqDirPart
 {
   friend class KonqBaseListViewWidget;
   friend class ListViewBrowserExtension;
-  Q_OBJECT
+
+  TQ_OBJECT
   TQ_PROPERTY( bool supportsUndo READ supportsUndo )
+
 public:
   KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode );
   virtual ~KonqListView();
@@ -128,6 +130,15 @@ protected slots:
   void slotSaveColumnWidths();  // delayed
   void slotHeaderClicked(int sec);
 
+  void slotOrderUnicodeUnmodified();
+  void slotOrderUnicodeCaseInsensitive();
+  void slotOrderLocale();
+  void slotToggleDisplayDirectoriesFirst();
+  void slotToggleDisplayHiddenFirst();
+
+  void slotSortAlternate();
+  void slotSortReverse();
+
   // This comes from KonqDirPart, it's for the "Find" feature
   virtual void slotStarted() { m_pListView->slotStarted(); }
   virtual void slotCanceled() { m_pListView->slotCanceled(); }
@@ -148,12 +159,27 @@ private:
   KMimeTypeResolver<KonqBaseListViewItem,KonqListView> *m_mimeTypeResolver;
   TQTimer *m_headerTimer;
 
+  bool     toggleColumnAlternate = true;
+  TQString m_sortColumnNamePrimary;
+  int      m_sortColumnIndexPrimary;
+  int      m_sortColumnOrderPrimary;
+  TQString m_sortColumnNameAlternate;
+  int      m_sortColumnIndexAlternate;
+  int      m_sortColumnOrderAlternate;
+
+  void resetSortConfig();
+  void checkSortConfig();
+  void sortListView(uint which);
+
   TDEAction *m_paSelect;
   TDEAction *m_paUnselect;
   TDEAction *m_paSelectAll;
   TDEAction *m_paUnselectAll;
   TDEAction *m_paInvertSelection;
 
+  TDEAction *m_paSortAlternate;
+  TDEAction *m_paSortReverse;
+
   // These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts
   // can be set from the 'Configure Shortcuts..." dialog.
   // The real actions are performed in the TDEListViewLineEdit::keyPressEvent() in tdeui
@@ -174,11 +200,18 @@ private:
   TDEToggleAction *m_paShowGroup;
   TDEToggleAction *m_paShowPermissions;
   TDEToggleAction *m_paShowURL;
+
+  TDEToggleAction *m_paOrderUnicodeUnmodified;
+  TDEToggleAction *m_paOrderUnicodeCaseInsensitive;
+  TDEToggleAction *m_paOrderLocale;
+
+  TDEToggleAction *m_paDisplayDirectoriesFirst;
+  TDEToggleAction *m_paDisplayHiddenFirst;
 };
 
 class ListViewBrowserExtension : public KonqDirPartBrowserExtension
 {
-   Q_OBJECT
+   TQ_OBJECT
    friend class KonqListView;
    friend class KonqBaseListViewWidget;
    public:
diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg
index bce9798a6..5c31c5cea 100644
--- a/konqueror/listview/konq_listview.kcfg
+++ b/konqueror/listview/konq_listview.kcfg
@@ -7,7 +7,6 @@
   <kcfgfile name="konquerorrc">
     <parameter name="Protocol" />
   </kcfgfile>
-
   <group name="ListView_$(Protocol)">
     <entry key="SortBy" type="String">
       <default>FileName</default> 
@@ -19,6 +18,36 @@
       <label>Sort Order</label>
       <whatsthis></whatsthis>
     </entry>
+    <entry key="PrimarySortCol" type="String">
+      <default>TBD</default>
+      <label>Primary sort column name</label>
+      <whatsthis></whatsthis>
+    </entry>
+    <entry key="PrimarySortIndex" type="Int">
+      <default>-1</default>
+      <label>Primary sort column offset</label>
+      <whatsthis></whatsthis>
+    </entry>
+    <entry key="PrimarySortOrder" type="Bool">
+      <default>true</default>
+      <label>Primary sort column sorting order</label>
+      <whatsthis></whatsthis>
+    </entry>
+    <entry key="AlternateSortCol" type="String">
+      <default>TBD</default>
+      <label>Alternate sort column name</label>
+      <whatsthis></whatsthis>
+    </entry>
+    <entry key="AlternateSortIndex" type="Int">
+      <default>-1</default>
+      <label>Alternate sort column offset</label>
+      <whatsthis></whatsthis>
+    </entry>
+    <entry key="AlternateSortOrder" type="Bool">
+      <default>true</default>
+      <label>Alternate sort column sorting order</label>
+      <whatsthis></whatsthis>
+    </entry>
     <entry key="FileNameColumnWidth" type="Int">
       <default code="true">25 * TDEApplication::kApplication()->fontMetrics().width( "m" )</default>
       <label>Width of the FileName Column</label>
@@ -33,5 +62,4 @@
       <whatsthis></whatsthis>
     </entry>
   </group>
-
 </kcfg>
\ No newline at end of file
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cpp
index 45ff99c1c..3910095f9 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cpp
@@ -19,6 +19,7 @@
 
 #include "konq_listview.h"
 #include <konq_settings.h>
+#include "konq_string_compare.h"
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <assert.h>
@@ -84,10 +85,18 @@ void KonqListViewItem::updateContents()
    // Set the text of each column
    setText( 0, m_fileitem->text() );
 
-   // The order is: .dir (0), dir (1), .file (2), file (3)
-   sortChar = S_ISDIR( m_fileitem->mode() ) ? 1 : 3;
-   if ( m_fileitem->text()[0] == '.' )
-       --sortChar;
+   bool m_groupDirectoriesFirst = m_pListViewWidget->props()->isDirsFirst();
+   bool m_groupHiddenFirst      = m_pListViewWidget->props()->isHiddenFirst();
+
+   // The default TDE order is: .dir (0), dir (1), .file (2), file (3)
+
+   if ( m_groupDirectoriesFirst )
+     sortChar = S_ISDIR( m_fileitem->mode() ) ? 1 : 3;
+   else
+     sortChar = 3;
+
+   if ( m_groupHiddenFirst && m_fileitem->text()[0] == '.' )
+      --sortChar;
 
    //now we have the first column, so let's do the rest
 
@@ -152,7 +161,7 @@ void KonqListViewItem::updateContents()
              const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra );
              if ( tmpColumn->type == TQVariant::DateTime )
              {
-                 TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr, Qt::ISODate ));
+                 TQDateTime dt = TQDateTime::fromString( entryStr, TQt::ISODate );
                  setText(tmpColumn->displayInColumn,
                          TDEGlobal::locale()->formatDateTime(dt));
              }
@@ -283,9 +292,9 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
             {
                 if ( cInfo->type & TQVariant::DateTime ) {
                     const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra );
-                    TQDateTime dt1 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr1, Qt::ISODate ));
+                    TQDateTime dt1 = TQDateTime::fromString( entryStr1, TQt::ISODate );
                     const TQString entryStr2 = retrieveExtraEntry( k->m_fileitem, numExtra );
-                    TQDateTime dt2 = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( entryStr2, Qt::ISODate ));
+                    TQDateTime dt2 = TQDateTime::fromString( entryStr2, TQt::ISODate );
                     return ( dt1 > dt2 ) ? 1 : ( dt1 < dt2 ) ? -1 : 0;
                 }
             }
@@ -295,11 +304,10 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
          break;
       }
    }
-   if ( m_pListViewWidget->caseInsensitiveSort() )
-       return text( col ).lower().localeAwareCompare( k->text( col ).lower() );
-   else {
-       return m_pListViewWidget->m_pSettings->caseSensitiveCompare( text( col ), k->text( col ) );
-   }
+
+   /* If we reach here, we are comparing text columns (e.g file name). */
+
+   return stringCompare( m_pListViewWidget->m_sortOrder, text( col ), k->text( col ) );
 }
 
 void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
@@ -314,7 +322,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
     cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() );
 
     TDEListView *lv = static_cast< TDEListView* >( listView() );
-    const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap());
+    const TQPixmap *pm = lv->viewport()->paletteBackgroundPixmap();
     if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() )
     {
         int newWidth = width( lv->fontMetrics(), lv, _column );
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cpp
index 4c1198325..a41cf6367 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cpp
@@ -100,6 +100,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
    ,m_bAscending(true)
    ,m_itemFound(false)
    ,m_restored(false)
+   ,m_sortOrder(0)
    ,m_filenameColumn(0)
    ,m_itemToGoTo("")
    ,m_backgroundTimer(0)
@@ -120,61 +121,61 @@ 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( TQ_WheelFocus );
-   setFocusPolicy( TQ_WheelFocus );
+   viewport()->setFocusPolicy( TQWidget::WheelFocus );
+   setFocusPolicy( TQWidget::WheelFocus );
    setAcceptDrops( true );
 
    //looks better with the statusbar
@@ -236,9 +237,9 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
          lstColumns << column;
       const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting
       TQVariant::Type t = TQVariant::Invalid;
-      if ( type.lower() == TQString(TQSTRING_OBJECT_NAME_STRING).lower() )
+      if ( type.lower() == TQString("TQString").lower() )
           t = TQVariant::String;
-      else if ( type.lower() == TQString(TQDATETIME_OBJECT_NAME_STRING).lower() )
+      else if ( type.lower() == TQString("TQDateTime").lower() )
           t = TQVariant::DateTime;
       else
           kdWarning() << "Unsupported ExtraType '" << type << "'" << endl;
@@ -425,13 +426,13 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) {
 		TDEListView::contentsMousePressEvent( e );
 	}
 	else {
-		if ( e->button() == Qt::LeftButton ) {
+		if ( e->button() == TQt::LeftButton ) {
 			m_rubber = new TQRect( e->x(), e->y(), 0, 0 );
 			clearSelection();
 			emit selectionChanged();
 			m_fileTip->setItem( 0 );
 		}
-		if ( e->button() != Qt::RightButton ) {
+		if ( e->button() != TQt::RightButton ) {
 			TQListView::contentsMousePressEvent( e );
 		}
 	}
@@ -452,7 +453,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) {
 	}
 
 	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;
@@ -524,28 +525,37 @@ void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e )
 
 void KonqBaseListViewWidget::contentsMouseDoubleClickEvent(TQMouseEvent *e)
 {
-	if (m_rubber) {
-		TQRect r(m_rubber->normalize());
-		delete m_rubber;
-		m_rubber = NULL;
-		repaintContents(r, false);
-	}
-		
-	TQPoint vp = contentsToViewport(e->pos());
-	KonqBaseListViewItem* item = isExecuteArea(vp) ?
-		static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL;
+  if (m_rubber)
+  {
+    TQRect r(m_rubber->normalize());
+    delete m_rubber;
+    m_rubber = NULL;
+    repaintContents(r, false);
+  }
+
+  TQPoint vp = contentsToViewport(e->pos());
+  KonqBaseListViewItem* item = isExecuteArea(vp) ?
+    static_cast<KonqBaseListViewItem*>(itemAt(vp)) : NULL;
 
-	if (item)	{
+  if (item)
+  {
     TDEListView::contentsMouseDoubleClickEvent(e);
-	}
-	else {
+  }
+  else if (m_pSettings->doubleClickMoveToParent())
+  {
     KParts::URLArgs args;
     args.trustedSource = true;
-    KURL upURL = m_dirLister->url().upURL();
-    if (!upURL.isEmpty()) {  
-	    m_pBrowserView->extension()->openURLRequest(upURL, args);
-	  }
-	}
+    KURL baseURL(m_dirLister->url().internalReferenceURL());
+    if (baseURL.isEmpty())
+    {
+      baseURL = m_dirLister->url();
+    }
+    KURL upURL = baseURL.upURL();
+    if (!upURL.isEmpty())
+    {
+      m_pBrowserView->extension()->openURLRequest(upURL, args);
+    }
+  }
 }
 
 void KonqBaseListViewWidget::leaveEvent( TQEvent *e )
@@ -575,7 +585,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
 
    TQPoint pt( m_rubber->x(), m_rubber->y() );
    pt = contentsToViewport( pt );
-   style().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
+   style().drawPrimitive( TQStyle::PE_RubberBand, p,
                           TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
                           colorGroup(), TQStyle::Style_Default, colorGroup().base() );
 }
@@ -752,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;
@@ -962,7 +972,7 @@ void KonqBaseListViewWidget::slotSelectionChanged()
 void KonqBaseListViewWidget::slotMouseButtonClicked2( int _button,
       TQListViewItem *_item, const TQPoint& pos, int )
 {
-   if ( _button == Qt::MidButton )
+   if ( _button == TQt::MidButton )
    {
       if ( _item && isExecuteArea( viewport()->mapFromGlobal(pos) ) )
          m_pBrowserView->mmbClicked( static_cast<KonqBaseListViewItem *>(_item)->item() );
@@ -1206,11 +1216,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url )
    {
       m_pBrowserView->newIconSize( m_pBrowserView->m_pProps->iconSize() );
       m_pBrowserView->m_paShowDot->setChecked( m_pBrowserView->m_pProps->isShowingDotFiles() );
-      if ( m_pBrowserView->m_paCaseInsensitive->isChecked() != m_pBrowserView->m_pProps->isCaseInsensitiveSort() ) {
-          m_pBrowserView->m_paCaseInsensitive->setChecked( m_pBrowserView->m_pProps->isCaseInsensitiveSort() );
-          // This is in case openURL returned all items synchronously.
-          sort();
-      }
+      m_sortOrder = m_pBrowserView->m_pProps->getSortOrder();
 
       // It has to be "viewport()" - this is what KonqDirPart's slots act upon,
       // and otherwise we get a color/pixmap in the square between the scrollbars.
@@ -1484,7 +1490,7 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in
 
 void KonqBaseListViewWidget::paintEmptyArea( TQPainter *p, const TQRect &r )
 {
-   const TQPixmap *pm = TQT_TQPIXMAP_CONST(viewport()->paletteBackgroundPixmap());
+   const TQPixmap *pm = viewport()->paletteBackgroundPixmap();
 
    if (!pm || pm->isNull())
       p->fillRect(r, viewport()->backgroundColor());
@@ -1557,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();
@@ -1566,11 +1572,6 @@ void KonqBaseListViewWidget::slotUpdateBackground()
    }
 }
 
-bool KonqBaseListViewWidget::caseInsensitiveSort() const
-{
-    return m_pBrowserView->m_pProps->isCaseInsensitiveSort();
-}
-
 // based on isExecuteArea from tdelistview.cpp
 int KonqBaseListViewWidget::executeArea( TQListViewItem *_item )
 {
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 613f012b3..ebae4c389 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -79,7 +79,7 @@ class KonqBaseListViewWidget : public TDEListView
    friend class KonqListView;
    friend class ListViewBrowserExtension;
 
-   Q_OBJECT
+   TQ_OBJECT
    
 public:
    KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget );
@@ -137,7 +137,6 @@ public:
 
    void setAscending( bool b ) { m_bAscending = b; }
    bool ascending() const { return m_bAscending; }
-   bool caseInsensitiveSort() const;
 
    virtual void paintEmptyArea( TQPainter *p, const TQRect &r );
 
@@ -260,6 +259,8 @@ protected:
    bool m_itemFound:1;
    bool m_restored:1;
 
+   TextSortOrder m_sortOrder;
+
    int m_filenameColumn;
    int m_filenameColumnWidth;
 
diff --git a/konqueror/listview/konq_textview.rc b/konqueror/listview/konq_textview.rc
index 612deb5cb..e29a0293b 100644
--- a/konqueror/listview/konq_textview.rc
+++ b/konqueror/listview/konq_textview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KonqTextView" version="5">
+<kpartgui name="KonqTextView" version="7">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
     <Menu name="selection"><text>Selection</text>
@@ -13,7 +13,17 @@
 </Menu>
  <Menu name="view"><text>&amp;View</text>
   <Action name="show_dot" />
-  <Action name="sort_caseinsensitive"/>
+  <Menu name="sort"><text>&amp;Sort</text>
+    <Action name="order_unicode_based"/>
+    <Action name="order_unicode_based_case_insensitive"/>
+    <Action name="order_locale_based"/>
+    <Separator/>
+    <Action name="group_directories_first"/>
+    <Action name="group_hidden_first"/>
+    <Separator/>
+    <Action name="alternate_sort_order"/>
+    <Action name="reverse_sort_order"/>
+  </Menu>
   <Menu name="listview_show"><text>Show Details</text>
    <TearOffHandle />
    <Action name="show_size"/>
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cpp
index 1076e10af..625e10f79 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cpp
@@ -210,7 +210,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
    cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
    // Don't do that! Keep things readable whatever the selection background color is
 //   cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
-//   cg.setColor(TQColorGroup::Highlight, Qt::darkGray);
+//   cg.setColor(TQColorGroup::Highlight, TQt::darkGray);
 
    TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
 }
@@ -223,7 +223,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
    TQPixmap pix( _r.width(), _r.height() );
    bitBlt( &pix, 0, 0, _p->device(), _r.left(), _r.top(), _r.width(), _r.height() );
    TQImage im = pix.convertToImage();
-   im = KImageEffect::fade( im, 0.25, Qt::black );
+   im = KImageEffect::fade( im, 0.25, TQt::black );
    _p->drawImage( _r.topLeft(), im );
 }*/
 
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cpp
index ab227899a..d814d2fbc 100644
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cpp
@@ -43,17 +43,17 @@ KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWi
    setAllColumnsShowFocus(TRUE);
    setRootIsDecorated(false);
 
-   colors[KTVI_REGULAR]=Qt::black;
+   colors[KTVI_REGULAR]=TQt::black;
    colors[KTVI_EXEC]=TQColor(0,170,0);
-   colors[KTVI_REGULARLINK]=Qt::black;
-   colors[KTVI_DIR]=Qt::black;
-   colors[KTVI_DIRLINK]=Qt::black;
-   colors[KTVI_BADLINK]=Qt::red;
-   colors[KTVI_SOCKET]=Qt::magenta;
-   colors[KTVI_FIFO]=Qt::magenta;
-   colors[KTVI_UNKNOWN]=Qt::red;
-   colors[KTVI_CHARDEV]=Qt::blue;
-   colors[KTVI_BLOCKDEV]=Qt::blue;
+   colors[KTVI_REGULARLINK]=TQt::black;
+   colors[KTVI_DIR]=TQt::black;
+   colors[KTVI_DIRLINK]=TQt::black;
+   colors[KTVI_BADLINK]=TQt::red;
+   colors[KTVI_SOCKET]=TQt::magenta;
+   colors[KTVI_FIFO]=TQt::magenta;
+   colors[KTVI_UNKNOWN]=TQt::red;
+   colors[KTVI_CHARDEV]=TQt::blue;
+   colors[KTVI_BLOCKDEV]=TQt::blue;
 
    m_showIcons=FALSE;
 }
diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h
index 06a5cbbb5..d42014ba1 100644
--- a/konqueror/listview/konq_textviewwidget.h
+++ b/konqueror/listview/konq_textviewwidget.h
@@ -32,7 +32,7 @@ class KonqTextViewItem;
 class KonqTextViewWidget : public KonqBaseListViewWidget
 {
    friend class KonqTextViewItem;
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget );
       ~KonqTextViewWidget();
diff --git a/konqueror/listview/konq_treeview.rc b/konqueror/listview/konq_treeview.rc
index 7f8981779..9ef045785 100644
--- a/konqueror/listview/konq_treeview.rc
+++ b/konqueror/listview/konq_treeview.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="KonqTreeView" version="10">
+<kpartgui name="KonqTreeView" version="12">
 <MenuBar>
  <Menu name="edit"><text>&amp;Edit</text>
    <Menu name="selection"><text>Selection</text>
@@ -24,8 +24,17 @@
   </Menu>
   <Separator/>
   <Action name="show_dot"/>
-  <Action name="sort_caseinsensitive"/>
-  <!--<Action name="sort_directoriesfirst" /> TODO -->
+  <Menu name="sort"><text>&amp;Sort</text>
+    <Action name="order_unicode_based"/>
+    <Action name="order_unicode_based_case_insensitive"/>
+    <Action name="order_locale_based"/>
+    <Separator/>
+    <Action name="group_directories_first"/>
+    <Action name="group_hidden_first"/>
+    <Separator/>
+    <Action name="alternate_sort_order"/>
+    <Action name="reverse_sort_order"/>
+  </Menu>
   <Menu name="listview_show"><text>Show Details</text>
    <TearOffHandle />
    <Action name="show_size"/>
diff --git a/konqueror/listview/konq_treeviewitem.cc b/konqueror/listview/konq_treeviewitem.cpp
index 12953c401..12953c401 100644
--- a/konqueror/listview/konq_treeviewitem.cc
+++ b/konqueror/listview/konq_treeviewitem.cpp
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cpp
index 77adc4b61..02c297c88 100644
--- a/konqueror/listview/konq_treeviewwidget.cc
+++ 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/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 01b85ddf6..0f16240db 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -32,7 +32,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget
 {
    friend class KonqListViewDir;
 
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget );
    virtual ~KonqTreeViewWidget();
diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt
index 90e72194b..f5610a0ae 100644
--- a/konqueror/preloader/CMakeLists.txt
+++ b/konqueror/preloader/CMakeLists.txt
@@ -42,7 +42,7 @@ tde_create_translated_desktop(
 set( target kded_konqy_preloader )
 
 set( ${target}_SRCS
-  preloader.cc preloader.skel
+  preloader.cpp preloader.skel
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/konqueror/preloader/Makefile.am b/konqueror/preloader/Makefile.am
index ff2440b0d..9c446faa8 100644
--- a/konqueror/preloader/Makefile.am
+++ b/konqueror/preloader/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DTQT_NO_CAST_ASCII
 kde_module_LTLIBRARIES = kded_konqy_preloader.la
 
 INCLUDES= -I.. $(all_includes)
-kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel
+kded_konqy_preloader_la_SOURCES = preloader.cpp preloader.skel
 kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_TDESYCOCA) $(LIB_TDECORE)
 
diff --git a/konqueror/preloader/configure.in.in b/konqueror/preloader/configure.in.in
index 315b23c97..a581917cb 100644
--- a/konqueror/preloader/configure.in.in
+++ b/konqueror/preloader/configure.in.in
@@ -1,5 +1,5 @@
 dnl check whether mallinfo() is available and which fields to use to find out memory usage
-dnl it's used in konq_mainwindow.cc
+dnl it's used in konq_mainwindow.cpp
 dnl warning, ugly code ahead
 dnl some implementations have mallinfo() in stdlib.h, others in malloc.h
 dnl fields showing memory usage should be hblkhd, uordblks and usmblks,
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cpp
index 5d87a8b07..ecc6691da 100644
--- a/konqueror/preloader/preloader.cc
+++ 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( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )),
+        TQ_SLOT( appRemoved( const TQCString& )));
+    connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()),
+	TQ_SLOT( checkAlwaysPreloaded()));
     }
 
 KonqyPreloader::~KonqyPreloader()
diff --git a/konqueror/preloader/preloader.h b/konqueror/preloader/preloader.h
index c2767522b..220c0d15f 100644
--- a/konqueror/preloader/preloader.h
+++ b/konqueror/preloader/preloader.h
@@ -26,7 +26,7 @@
 class KonqyPreloader
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     public:
         KonqyPreloader( const TQCString& obj );
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 8889861b3..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 = tqt_dynamic_cast<KonqDirPart*>(parent);
+  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/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
index d5469cd47..b153c7990 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h
@@ -32,7 +32,7 @@ class KonqDirPart;
 
 class KRemoteEncodingPlugin: public KParts::Plugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KRemoteEncodingPlugin(TQObject * parent, const char *name,
 			const TQStringList &);
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/kshellcmddialog.h b/konqueror/shellcmdplugin/kshellcmddialog.h
index de6d57fee..814d61857 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.h
+++ b/konqueror/shellcmdplugin/kshellcmddialog.h
@@ -29,7 +29,7 @@ class KShellCommandExecutor;
 
 class KShellCommandDialog:public KDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KShellCommandDialog(const TQString& title, const TQString& command, TQWidget* parent=0, bool modal=false);
       virtual ~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/kshellcmdexecutor.h b/konqueror/shellcmdplugin/kshellcmdexecutor.h
index 616cdbc13..7e2e4b47d 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.h
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.h
@@ -28,7 +28,7 @@ class TQSocketNotifier;
 
 class KShellCommandExecutor:public TQTextView
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KShellCommandExecutor(const TQString& command, TQWidget* parent=0);
       virtual ~KShellCommandExecutor();
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index 99e04fce8..1b426da2a 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -34,12 +34,12 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
        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()
 {
-   KonqDirPart * part = tqt_dynamic_cast<KonqDirPart *>(parent());
+   KonqDirPart * part = dynamic_cast<KonqDirPart *>(parent());
    if ( !part )
    {
       KMessageBox::sorry(0L, "KShellCmdPlugin::slotExecuteShellCommand: Program error, please report a bug.");
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h
index 16874adc0..df11b7918 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.h
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.h
@@ -24,7 +24,7 @@
 
 class KShellCmdPlugin : public KParts::Plugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KShellCmdPlugin( TQObject* parent, const char* name, const TQStringList & );
     ~KShellCmdPlugin() {}
diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index bfff3c8e7..437c7bda9 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()
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index dfdd2e2e0..0e7fbdef5 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -36,7 +36,7 @@ class KonqSidebarFactory;
 
 class KonqSidebarBrowserExtension : public KParts::BrowserExtension
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 	public:
 	KonqSidebarBrowserExtension(KonqSidebar *part_,Sidebar_Widget *widget_,const char *name):
@@ -73,7 +73,7 @@ class KonqSidebarBrowserExtension : public KParts::BrowserExtension
  */
 class KonqSidebar : public KParts::ReadOnlyPart, public KonqSidebarIface
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -111,7 +111,7 @@ class TDEAboutData;
 
 class KonqSidebarFactory : public KParts::Factory
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     KonqSidebarFactory();
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index 7540ef398..367e7324d 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -32,7 +32,7 @@ class KonqSidebarPluginPrivate;
 
 class KDE_EXPORT KonqSidebarPlugin : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KonqSidebarPlugin(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent,TQString &desktopName_, const char* name=0);
 		~KonqSidebarPlugin();
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 8eefa7c34..5fd3f6d7e 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -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()
@@ -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*/) {
@@ -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()));
 }
 
 
@@ -508,7 +508,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				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;
 		}
@@ -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;
 		}
@@ -566,7 +566,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				ksc.sync();
 				
 				// Update the buttons with a TQTimer (why?)
-				TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+				TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -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
@@ -853,9 +853,9 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 {
 	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
-		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton)
+		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton)
 		{
-			KMultiTabBarTab *bt=tqt_dynamic_cast<KMultiTabBarTab*>(obj);
+			KMultiTabBarTab *bt=dynamic_cast<KMultiTabBarTab*>(obj);
 			if (bt)
 			{
 				kdDebug()<<"Request for popup"<<endl;
@@ -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),
@@ -902,7 +902,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 void Sidebar_Widget::mousePressEvent(TQMouseEvent *ev)
 {
 	if ( kapp->authorize( "action/konqsidebarmenu" ) ) {
-		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==Qt::RightButton) {
+		if (ev->type()==TQEvent::MouseButtonPress && ((TQMouseEvent *)ev)->button()==TQt::RightButton) {
 			m_menu->exec(TQCursor::pos());
 		}
 	}
@@ -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)
 			{
@@ -1144,7 +1144,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar
 
 void Sidebar_Widget::enableAction( const char * name, bool enabled )
 {
- 	if (TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo"))
+ 	if (sender()->parent()->isA("ButtonInfo"))
 	{
 		ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent());
 		if (btninfo)
@@ -1169,7 +1169,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled )
 
 bool  Sidebar_Widget::doEnableActions()
 {
- 	if (!(TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo")))
+ 	if (!(sender()->parent()->isA("ButtonInfo")))
 	{
 		kdDebug()<<"Couldn't set active module, aborting"<<endl;
 		return false;
@@ -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_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
-			const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
+	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
+		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_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
+	if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) {
+		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_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
-			this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
+	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
+		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_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) {
+	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 b45f79b7c..391db5101 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -38,7 +38,7 @@ class TQStringList;
 
 class ButtonInfo: public TQObject, public KonqSidebarIface
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ButtonInfo(const TQString& file_, class KonqSidebarIface *part, class KDockWidget *dock_,
 			const TQString &url_,const TQString &lib,
@@ -72,7 +72,7 @@ public:
 
 class addBackEnd: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	addBackEnd(TQWidget *parent,class TQPopupMenu *addmenu, bool universal,
                    const TQString &currentProfile, const char *name=0);
@@ -95,7 +95,7 @@ private:
 
 class KDE_EXPORT Sidebar_Widget: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	friend class ButtonInfo;
 public:
diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h
index c5abab26c..286415557 100644
--- a/konqueror/sidebar/test/konqsidebartest.h
+++ b/konqueror/sidebar/test/konqsidebartest.h
@@ -22,7 +22,7 @@
 
 class SidebarTest : public KonqSidebarPlugin
 	{
-		Q_OBJECT
+		TQ_OBJECT
 		public:
 		SidebarTest(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0):
                    KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name)
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 208fe2ee6..f1dd0b953 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()
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
index ba78a2b96..b39a48601 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h
@@ -34,7 +34,7 @@ class KLineEdit;
  */
 class KonqSidebarBookmarkModule : public TQObject, public KonqSidebarTreeModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqSidebarBookmarkModule( KonqSidebarTree * parentTree );
     virtual ~KonqSidebarBookmarkModule();
@@ -77,7 +77,7 @@ private:
 
 class BookmarkEditDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     BookmarkEditDialog( const TQString& title, const TQString& url,
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index b1b6d0563..e6e4a0af3 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -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;
     }
 }
@@ -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 & ) ) );
     }
 
 
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
index 89b5dcbaf..ccc607a79 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.h
@@ -33,7 +33,7 @@ class KonqPropsView;
 
 class KonqSidebarDirTreeModule : public TQObject, public KonqSidebarTreeModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqSidebarDirTreeModule( KonqSidebarTree * parentTree, bool );
     virtual ~KonqSidebarDirTreeModule();
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 44389702e..4825cfeda 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -132,18 +132,18 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
     TQDateTime current = TQDateTime::currentDateTime();
 
     if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
-	dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan ));
+	dt = current.addDays( - s_settings->m_valueYoungerThan );
     else
-	dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueYoungerThan * 60) ));
+	dt = current.addSecs( - (s_settings->m_valueYoungerThan * 60) );
 
     if ( m_entry->lastVisited > dt )
 	p->setFont( s_settings->m_fontYoungerThan );
 
     else {
 	if ( s_settings->m_metricOlderThan == KonqSidebarHistorySettings::DAYS )
-	    dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueOlderThan ));
+	    dt = current.addDays( - s_settings->m_valueOlderThan );
 	else
-	    dt = TQT_TQDATETIME_OBJECT(current.addSecs( - (s_settings->m_valueOlderThan * 60) ));
+	    dt = current.addSecs( - (s_settings->m_valueOlderThan * 60) );
 
 	if ( m_entry->lastVisited < dt )
 	    p->setFont( s_settings->m_fontOlderThan );
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 6f051a553..416054cf1 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 );
 
diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h
index 933097455..649f68150 100644
--- a/konqueror/sidebar/trees/history_module/history_module.h
+++ b/konqueror/sidebar/trees/history_module/history_module.h
@@ -38,7 +38,7 @@ class KonqSidebarTreeItem;
 
 class KonqSidebarHistoryModule : public TQObject, public KonqSidebarTreeModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum {
diff --git a/konqueror/sidebar/trees/history_module/history_settings.h b/konqueror/sidebar/trees/history_module/history_settings.h
index 7b7d75006..f4bdebe70 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.h
+++ b/konqueror/sidebar/trees/history_module/history_settings.h
@@ -28,7 +28,7 @@
 class KonqSidebarHistorySettings : public TQObject, public DCOPObject
 {
     K_DCOP
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum { MINUTES, DAYS };
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 70e42e113..188da9d93 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);
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h
index ac82cdd60..215b78027 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.h
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.h
@@ -29,7 +29,7 @@ class KonqSidebarHistoryDlg;
 
 class HistorySidebarConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   HistorySidebarConfig( TQWidget *parent=0, const char* name=0, const TQStringList &list=TQStringList() );
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 514c28095..6dee8c0dd 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -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/" ); */
@@ -483,7 +483,7 @@ void KonqSidebarTree::slotExecuted( TQListViewItem *item )
 void KonqSidebarTree::slotMouseButtonPressed( int _button, TQListViewItem* _item, const TQPoint&, int col )
 {
     KonqSidebarTreeItem * item = static_cast<KonqSidebarTreeItem*>( _item );
-    if (_button == Qt::RightButton)
+    if (_button == TQt::RightButton)
     {
         if ( item && col < 2)
         {
@@ -502,10 +502,10 @@ void KonqSidebarTree::slotSidebarMouseButtonClicked(int _button, TQListViewItem*
     if(_item && col < 2)
     {
         switch( _button ) {
-        case Qt::LeftButton:
+        case TQt::LeftButton:
             slotExecuted( item );
             break;
-        case Qt::MidButton:
+        case TQt::MidButton:
             item->middleButtonClicked();
             break;
         }
@@ -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;
         }
@@ -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;
@@ -1012,7 +1012,6 @@ void KonqSidebarTree::slotProperties()
     KPropertiesDialog *dlg = new KPropertiesDialog( url );
     dlg->setFileNameReadOnly(true);
     dlg->exec();
-    delete dlg;
 }
 
 void KonqSidebarTree::slotOpenNewWindow()
diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h
index 703a256c9..f76027481 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.h
+++ b/konqueror/sidebar/trees/konq_sidebartree.h
@@ -75,7 +75,7 @@ typedef enum {
  */
 class KonqSidebarTree : public TDEListView, public KDirNotify
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path );
     virtual ~KonqSidebarTree();
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 1903c2328..4bd91f9f3 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -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)));
 
         }
 
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index bdc58ad0c..25b616bd6 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -16,7 +16,7 @@ class TQVBox;
 
 class KonqSidebar_Tree: public KonqSidebarPlugin
         {
-                Q_OBJECT
+                TQ_OBJECT
                 public:
                 KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0);
                 ~KonqSidebar_Tree();
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 44a94f02c..feb1a6692 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -36,30 +36,30 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare
 	: 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;
 
@@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare
 	_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()));
 }
 
 
@@ -176,7 +176,7 @@ 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() ) );
 	}
 }
 
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 938677d8d..072c3d822 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -31,7 +31,7 @@
 // A wrapper for TDEHTMLPart to make it behave the way we want it to.
 class TDEHTMLSideBar : public TDEHTMLPart
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		TDEHTMLSideBar(bool universal) : TDEHTMLPart() {
 			setStatusMessagesEnabled(false);
@@ -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() {}
@@ -82,7 +82,7 @@ class TDEHTMLSideBar : public TDEHTMLPart
 		virtual void urlSelected( const TQString &url, int button,
 				int state, const TQString &_target,
 				KParts::URLArgs args = KParts::URLArgs()) {
-			if (button == Qt::LeftButton ){
+			if (button == TQt::LeftButton ){
 				if (_target.lower() == "_self") {
 					openURL(url);
 				} else if (_target.lower() == "_blank") {
@@ -92,7 +92,7 @@ class TDEHTMLSideBar : public TDEHTMLPart
 				}
 				return;
 			}
-			if (button == Qt::MidButton) {
+			if (button == TQt::MidButton) {
 				emit openURLNewWindow(completeURL(url).url(),
 						args);
 				return;
@@ -164,7 +164,7 @@ class TDEHTMLSideBar : public TDEHTMLPart
 
 class KonqSideBarWebModule : public KonqSidebarPlugin
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KonqSideBarWebModule(TDEInstance *instance, TQObject *parent,
 			       	TQWidget *widgetParent, TQString &desktopName,
diff --git a/konsole/README.konsole_kiosk b/konsole/README.konsole_kiosk
index f769d5baf..c2d6525e9 100644
--- a/konsole/README.konsole_kiosk
+++ b/konsole/README.konsole_kiosk
@@ -50,7 +50,7 @@ action/scrollbar
 action/keyboard
 
 
-So if you don't want the user to toggle his scrollbar settings, you would add:
+So if you don't want the user to toggle their scrollbar settings, you would add:
 
 [KDE Action Restrictions]
 action/scrollbar=false
diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp
index 2148ec03c..fbb152289 100644
--- a/konsole/konsole/TEPty.cpp
+++ b/konsole/konsole/TEPty.cpp
@@ -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 21ea3ff94..05a453f31 100644
--- a/konsole/konsole/TEPty.h
+++ b/konsole/konsole/TEPty.h
@@ -31,7 +31,7 @@
 
 class TEPty: public TDEProcess
 {
-Q_OBJECT
+TQ_OBJECT
 
   public:
 
diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp
index 9bd62ff4d..8f2473e31 100644
--- a/konsole/konsole/TEScreen.cpp
+++ b/konsole/konsole/TEScreen.cpp
@@ -81,7 +81,8 @@ TEScreen::TEScreen(int l, int c)
     ef_fg(cacol()), ef_bg(cacol()), ef_re(0),
     sa_cuX(0), sa_cuY(0),
     sa_cu_re(0), sa_cu_fg(cacol()), sa_cu_bg(cacol()),
-    lastPos(-1)
+    lastPos(-1),
+    lastDrawnChar(0)
 {
   /*
     this->lines   = lines;
@@ -175,7 +176,7 @@ void TEScreen::cursorLeft(int n)
 }
 
 /*!
-    Move the cursor left.
+    Move the cursor right.
 
     The cursor will not move beyond the rightmost column.
 */
@@ -188,6 +189,50 @@ void TEScreen::cursorRight(int n)
 }
 
 /*!
+    Move the cursor at most n lines next
+*/
+
+void TEScreen::cursorNextLine(int n)
+//=CNL
+{
+	if (n == 0)
+	{
+		n = 1; // Default
+	}
+	cuX = 0;
+	while (n > 0)
+	{
+		if (cuY < lines - 1)
+		{
+			cuY += 1;
+		}
+		n--;
+	}
+}
+
+/*!
+    Move the cursor at most n lines previous
+*/
+
+void TEScreen::cursorPrevLine(int n)
+//=CPL
+{
+	if (n == 0)
+	{
+		n = 1; // Default
+	}
+	cuX = 0;
+	while (n > 0)
+	{
+		if (cuY  > 0)
+		{
+			cuY -= 1;
+		}
+		n--;
+	}
+}
+
+/*!
     Set top and bottom margin.
 */
 
@@ -300,6 +345,26 @@ void TEScreen::insertChars(int n)
   clearImage(loc(cuX,cuY),loc(q-1,cuY),' ');
 }
 
+void TEScreen::repeatChars(int n)
+{
+    if (n == 0)
+    {
+        n = 1; // Default
+    }
+
+    // From ECMA-48 version 5, section 8.3.103:
+    // "If the character preceding REP is a control function or part of a
+    // control function, the effect of REP is not defined by this Standard."
+    //
+    // So, a "normal" program should always use REP immediately after a visible
+    // character (those other than escape sequences). So, lastDrawnChar can be
+    // safely used.
+    for (int i = 0; i < n; i++)
+    {
+        ShowCharacter(lastDrawnChar);
+    }
+}
+
 /*! delete `n' lines starting from (including) the cursor position.
 
     The cursor is not moved by the operation.
@@ -762,6 +827,8 @@ void TEScreen::ShowCharacter(unsigned short c)
   
   lastPos = i;
 
+  lastDrawnChar = c;
+
   cuX += w--;
 
   while(w)
@@ -802,10 +869,22 @@ void TEScreen::scrollUp(int n)
 
 void TEScreen::scrollUp(int from, int n)
 {
-  if (n <= 0 || from + n > bmargin) return;
-  //FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds.
-  moveImage(loc(0,from),loc(0,from+n),loc(columns-1,bmargin));
-  clearImage(loc(0,bmargin-n+1),loc(columns-1,bmargin),' ');
+	if (n <= 0)
+	{
+		return;
+	}
+	if (from > bmargin)
+	{
+		return;
+	}
+	if ((from + n) > bmargin)
+	{
+		n = bmargin + 1 - from;
+	}
+
+	//FIXME: make sure `tmargin', `bmargin', `from', `n' is in bounds.
+	moveImage(loc(0, from), loc(0, from+n), loc(columns, bmargin));
+	clearImage(loc(0, bmargin-n+1), loc(columns-1, bmargin), ' ');
 }
 
 void TEScreen::scrollDown(int n)
@@ -1013,12 +1092,6 @@ void TEScreen::clearToBeginOfScreen()
 
 void TEScreen::clearEntireScreen()
 {
-  // Add entire screen to history
-  for (int i = 0; i < (lines-1); i++)
-  {
-    addHistLine(); scrollUp(0,1);
-  }
-
   clearImage(loc(0,0),loc(columns-1,lines-1),' ');
 }
 
diff --git a/konsole/konsole/TEScreen.h b/konsole/konsole/TEScreen.h
index 9797b53ab..a28aab949 100644
--- a/konsole/konsole/TEScreen.h
+++ b/konsole/konsole/TEScreen.h
@@ -52,14 +52,16 @@ public: // these are all `Screen' operations
     //
     // Cursor Movement
     //
-    void cursorUp    (int n);
-    void cursorDown  (int n);
-    void cursorLeft  (int n);
-    void cursorRight (int n);
-    void setCursorY  (int y);
-    void setCursorX  (int x);
-    void setCursorYX (int y, int x);
-    void setMargins  (int t, int b);
+    void cursorUp      (int n);
+    void cursorDown    (int n);
+    void cursorLeft    (int n);
+    void cursorRight   (int n);
+    void cursorNextLine(int n);
+    void cursorPrevLine(int n);
+    void setCursorY    (int y);
+    void setCursorX    (int x);
+    void setCursorYX   (int y, int x);
+    void setMargins    (int t, int b);
     //
     // Cursor Movement with Scrolling
     //
@@ -83,6 +85,7 @@ public: // these are all `Screen' operations
     void eraseChars  (int n);
     void deleteChars (int n);
     void insertChars (int n);
+    void repeatChars (int n);
     void deleteLines (int n);
     void insertLines (int n);
     //
@@ -271,6 +274,9 @@ private: // helper
     // last position where we added a character
     int lastPos;
 
+    // used in REP (repeating char)
+    unsigned short lastDrawnChar;
+
     // modes
 
     ScreenParm saveParm;
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 52cd1236b..33dcf7f79 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -308,6 +308,19 @@ void TEWidget::fontChange(const TQFont &)
   update();
 }
 
+void TEWidget::biggerFont(void) {
+    TQFont f = getVTFont();
+    f.setPointSize( f.pointSize() + 1 );
+    setVTFont( f );
+}
+
+void TEWidget::smallerFont(void) {
+    TQFont f = getVTFont();
+    if ( f.pointSize() < 6 ) return;      // A minimum size
+    f.setPointSize( f.pointSize() - 1 );
+    setVTFont( f );
+}
+
 void TEWidget::setVTFont(const TQFont& f)
 {
   TQFont font = f;
@@ -397,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( tqarrowCursor );
-  connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
+  scrollbar->setCursor( TQt::arrowCursor );
+  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
@@ -419,7 +432,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
   setAcceptDrops(true); // attempt
   dragInfo.state = diNone;
 
-  setFocusPolicy( TQ_WheelFocus );
+  setFocusPolicy( TQWidget::WheelFocus );
 
   // im
   setInputMethodEnabled(true);
@@ -594,7 +607,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y,
         }
     }
 
-    paint.drawText(x,y, w, font_h, Qt::AlignHCenter | TQt::DontClip, drawstr, -1);
+    paint.drawText(x,y, w, font_h, TQt::AlignHCenter | TQt::DontClip, drawstr, -1);
     x += w;
   }
 }
@@ -608,7 +621,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
                            TQString& str, const ca *attr, bool pm, bool clear)
 {
   int a = font_a + m_lineSpacing / 2;
-  TQColor fColor = printerFriendly ? Qt::black : attr->f.color(color_table);
+  TQColor fColor = printerFriendly ? TQt::black : attr->f.color(color_table);
   TQColor bColor = attr->b.color(color_table);
   TQString drawstr;
 
@@ -621,13 +634,9 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
     if (attr->isTransparent(color_table))
     {
       if (pm)
-        paint.setBackgroundMode( Qt::TransparentMode );
+        paint.setBackgroundMode( TQt::TransparentMode );
       if (clear || (blinking && (attr->r & RE_BLINK))) {
-#ifdef USE_QT4
-        paint.eraseRect(rect);
-#else // USE_QT4
         erase(rect);
-#endif // USE_QT4
       }
     }
     else
@@ -638,7 +647,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
         // draw background colors with 75% opacity
         if ( draw_translucent_background_colors && argb_visual && tqAlpha(blend_color) < 0xff )
         {
-          QRgb col = bColor.rgb();
+          TQRgb col = bColor.rgb();
 
           TQ_UINT8 salpha = 192;
           TQ_UINT8 dalpha = 255 - salpha;
@@ -667,7 +676,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
         tmpRect.setWidth( tmpRect.width() + font_w );
       }
 
-      paint.fillRect( tmpRect, Qt::darkCyan );  // currently use hard code color
+      paint.fillRect( tmpRect, TQt::darkCyan );  // currently use hard code color
     }
 
     if ( m_isIMSel && !tmpStr.isEmpty() ) { // imput method selection background color
@@ -682,13 +691,13 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
         tmpRect.setWidth( tmpRect.width() + font_w );
       }
 
-      paint.fillRect( tmpRect, Qt::darkGray );   // currently use hard code color
+      paint.fillRect( tmpRect, TQt::darkGray );   // currently use hard code color
     }
   }
 
   // Paint cursor
   if ((attr->r & RE_CURSOR) && !isPrinting) {
-    paint.setBackgroundMode( Qt::TransparentMode );
+    paint.setBackgroundMode( TQt::TransparentMode );
     int h = font_h - m_lineSpacing;
     TQRect r(rect.x(),rect.y()+m_lineSpacing/2,rect.width(),h);
     if (hasFocus())
@@ -731,7 +740,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
       int y = rect.y(); // top of rect
 
       if ( shadow ) {
-        paint.setPen( Qt::black );
+        paint.setPen( TQt::black );
         drawTextFixed(paint, x+1, y+1, str, attr);
         paint.setPen(fColor);
       }
@@ -744,7 +753,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
       int y = rect.y()+a; // baseline
 
       if ( shadow ) {
-        paint.setPen( Qt::black );
+        paint.setPen( TQt::black );
         paint.drawText(x+1,y+1, str, -1, bidiEnabled ? TQPainter::Auto : TQPainter::LTR );
         paint.setPen(fColor);
       }
@@ -762,7 +771,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
     {
       paint.setClipRect(rect);
       // On screen we use overstrike for bold
-      paint.setBackgroundMode( Qt::TransparentMode );
+      paint.setBackgroundMode( TQt::TransparentMode );
       int x = rect.x()+1;
       if(!fixed_font)
       {
@@ -968,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);
@@ -1007,7 +1016,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe )
   TQPainter paint;
   setUpdatesEnabled(false);
   paint.begin( this );
-  paint.setBackgroundMode( Qt::TransparentMode );
+  paint.setBackgroundMode( TQt::TransparentMode );
 
   // Note that the actual widget size can be slightly larger
   // that the image (the size is truncated towards the smaller
@@ -1084,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);
@@ -1245,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;
 }
 
@@ -1302,7 +1311,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
 {
 //printf("press [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
 
-  if ( possibleTripleClick && (ev->button()==Qt::LeftButton) ) {
+  if ( possibleTripleClick && (ev->button()==TQt::LeftButton) ) {
     mouseTripleClickEvent(ev);
     return;
   }
@@ -1315,7 +1324,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
   TQPoint pos = TQPoint((ev->x()-tLx-bX+(font_w/2))/font_w,(ev->y()-tLy-bY)/font_h);
 
 //printf("press top left [%d,%d] by=%d\n",tLx,tLy, bY);
-  if ( ev->button() == Qt::LeftButton)
+  if ( ev->button() == TQt::LeftButton)
   {
     line_selection_mode = false;
     word_selection_mode = false;
@@ -1352,14 +1361,14 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
       }
     }
   }
-  else if ( ev->button() == Qt::MidButton )
+  else if ( ev->button() == TQt::MidButton )
   {
     if ( mouse_marks || (!mouse_marks && (ev->state() & ShiftButton)) )
       emitSelection(true,ev->state() & ControlButton);
     else
       emit mouseSignal( 1, (ev->x()-tLx-bX)/font_w +1, (ev->y()-tLy-bY)/font_h +1 +scrollbar->value() -scrollbar->maxValue() );
   }
-  else if ( ev->button() == Qt::RightButton )
+  else if ( ev->button() == TQt::RightButton )
   {
     if (mouse_marks || (ev->state() & ShiftButton)) {
       configureRequestPoint = TQPoint( ev->x(), ev->y() );
@@ -1373,7 +1382,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev)
 void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
 {
   // for auto-hiding the cursor, we need mouseTracking
-  if (ev->state() == Qt::NoButton ) return;
+  if (ev->state() == TQt::NoButton ) return;
 
   if (dragInfo.state == diPending) {
     // we had a mouse down, but haven't confirmed a drag yet
@@ -1397,7 +1406,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev)
   if (actSel == 0) return;
 
  // don't extend selection while pasting
-  if (ev->state() & Qt::MidButton) return;
+  if (ev->state() & TQt::MidButton) return;
 
   extendSelection( ev->pos() );
 }
@@ -1591,7 +1600,7 @@ void TEWidget::extendSelection( TQPoint pos )
 void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
 {
 //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button());
-  if ( ev->button() == Qt::LeftButton)
+  if ( ev->button() == TQt::LeftButton)
   {
     emit isBusySelecting(false); // Ok.. we can breath again.
     if(dragInfo.state == diPending)
@@ -1621,8 +1630,8 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
     }
     dragInfo.state = diNone;
   }
-  if ( !mouse_marks && ((ev->button() == Qt::RightButton && !(ev->state() & ShiftButton))
-                        || ev->button() == Qt::MidButton) ) {
+  if ( !mouse_marks && ((ev->button() == TQt::RightButton && !(ev->state() & ShiftButton))
+                        || ev->button() == TQt::MidButton) ) {
     TQPoint tL  = contentsRect().topLeft();
     int    tLx = tL.x();
     int    tLy = tL.y();
@@ -1634,7 +1643,7 @@ void TEWidget::mouseReleaseEvent(TQMouseEvent* ev)
 
 void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev)
 {
-  if ( ev->button() != Qt::LeftButton) return;
+  if ( ev->button() != TQt::LeftButton) return;
 
   TQPoint tL  = contentsRect().topLeft();
   int    tLx = tL.x();
@@ -1687,14 +1696,25 @@ 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 )
 {
-  if (ev->orientation() != Qt::Vertical)
+  if (ev->orientation() != TQt::Vertical)
     return;
 
+  if (ev->state() & ControlButton) {
+      if (ev->delta() > 0) {
+          biggerFont();
+      }
+      else {
+          smallerFont();
+      }
+      ev->accept();
+      return;
+  }
+
   if ( mouse_marks )
   {
 		if (!screen || screen->hasScroll() || (scrollbar->maxValue() == 0 && screen_num == 0))
@@ -1810,7 +1830,7 @@ void TEWidget::setWordCharacters(TQString wc)
 void TEWidget::setMouseMarks(bool on)
 {
   mouse_marks = on;
-  setCursor( mouse_marks ? tqibeamCursor : tqarrowCursor );
+  setCursor( mouse_marks ? TQt::ibeamCursor : TQt::arrowCursor );
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1850,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()
@@ -1911,14 +1931,14 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
   if ( (e->type() == TQEvent::Accel ||
        e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this )
   {
-      TQT_TQKEYEVENT( e )->ignore();
+      static_cast<TQKeyEvent*>( e )->ignore();
       return false;
   }
-  if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(parent()) /* when standalone */ )
+  if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
       return false; // not us
   if ( e->type() == TQEvent::KeyPress )
   {
-    TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+    TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 
     actSel=0; // Key stroke implies a screen update, so TEWidget won't
               // know where the current selection is.
@@ -1936,13 +1956,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
   }
   if ( e->type() == TQEvent::KeyRelease )
   {
-    TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+    TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
     emit keyReleasedSignal(ke);
     return true;
   }
   if ( e->type() == TQEvent::FocusIn )
   {
-    TQFocusEvent *fe = TQT_TQFOCUSEVENT(e);
+    TQFocusEvent *fe = static_cast<TQFocusEvent*>(e);
     if (fe->gotFocus())
     {
       emit focusInSignal(fe);
@@ -1952,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 );
 }
@@ -2030,7 +2050,7 @@ bool TEWidget::event( TQEvent *e )
 {
   if ( e->type() == TQEvent::AccelOverride )
   {
-    TQKeyEvent *ke = TQT_TQKEYEVENT( e );
+    TQKeyEvent *ke = static_cast<TQKeyEvent*>( e );
     KKey key( ke );
     int keyCodeQt = key.keyCodeQt();
 
@@ -2104,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()));
   }
 }
 
@@ -2250,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/TEWidget.h b/konsole/konsole/TEWidget.h
index 967896082..047c04b4b 100644
--- a/konsole/konsole/TEWidget.h
+++ b/konsole/konsole/TEWidget.h
@@ -44,7 +44,7 @@ class TQTimer;
 class TEWidget : public TQFrame
 // a widget representing attributed text
 {
-   Q_OBJECT
+   TQ_OBJECT
    
 
   friend class Konsole;
@@ -53,7 +53,7 @@ public:
     TEWidget(TQWidget *parent=0, const char *name=0);
     virtual ~TEWidget();
 
-    void setBlendColor(const QRgb color) { blend_color = color; }
+    void setBlendColor(const TQRgb color) { blend_color = color; }
 
     void setDefaultBackColor(const TQColor& color);
     TQColor getDefaultBackColor();
@@ -126,6 +126,10 @@ public:
      */
     void setVTFont(const TQFont& font);
 
+    /** Changes font size by 1 point */
+    void biggerFont();
+    void smallerFont();
+
     void setMouseMarks(bool on);
     static void setAntialias( bool enable ) { s_antialias = enable; }
     static bool antialias()                 { return s_antialias;   }
@@ -335,7 +339,7 @@ private:
     bool m_isIMEdit;
     bool m_isIMSel;
 
-    QRgb blend_color;
+    TQRgb blend_color;
  
 private slots:
     void drop_menu_activated(int item);
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp
index e0efab745..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*)));
 }
 
 /*!
@@ -172,7 +172,7 @@ void TEmuVt102::reset()
 // Tokens ------------------------------------------------------------------ --
 
 /*
-   Since the tokens are the central notion if this section, we've put them
+   Since the tokens are the central notion in this section, we've put them
    in front. They provide the syntactical elements used to represent the
    terminals operations as byte sequences.
 
@@ -267,7 +267,7 @@ void TEmuVt102::initTokenizer()
   for(i =  0;                      i < 256; i++) tbl[ i]  = 0;
   for(i =  0;                      i <  32; i++) tbl[ i] |= CTL;
   for(i = 32;                      i < 256; i++) tbl[ i] |= CHR;
-  for(s = (UINT8*)"@ABCDGHILMPSTXZcdfry"; *s; s++) tbl[*s] |= CPN;
+  for(s = (UINT8*)"@ABCDEFGHILMPSTXZbcdfry"; *s; s++) tbl[*s] |= CPN;
 // resize = \e[8;<row>;<col>t
   for(s = (UINT8*)"t"; *s; s++) tbl[*s] |= CPS;
   for(s = (UINT8*)"0123456789"        ; *s; s++) tbl[*s] |= DIG;
@@ -621,6 +621,8 @@ switch( N )
     case TY_CSI_PN('B'      ) : scr->cursorDown           (p         ); break; //VT100
     case TY_CSI_PN('C'      ) : scr->cursorRight          (p         ); break; //VT100
     case TY_CSI_PN('D'      ) : scr->cursorLeft           (p         ); break; //VT100
+    case TY_CSI_PN('E'      ) : scr->cursorNextLine       (p         ); break; //VT100
+    case TY_CSI_PN('F'      ) : scr->cursorPrevLine       (p         ); break; //VT100
     case TY_CSI_PN('G'      ) : scr->setCursorX           (p         ); break; //LINUX
     case TY_CSI_PN('H'      ) : scr->setCursorYX          (p,       q); break; //VT100
     case TY_CSI_PN('I'      ) : scr->Tabulate             (p         ); break;
@@ -631,6 +633,7 @@ switch( N )
     case TY_CSI_PN('T'      ) : scr->scrollDown           (p         ); break;
     case TY_CSI_PN('X'      ) : scr->eraseChars           (p         ); break;
     case TY_CSI_PN('Z'      ) : scr->backTabulate         (p         ); break;
+    case TY_CSI_PN('b'      ) : scr->repeatChars          (p         ); break;
     case TY_CSI_PN('c'      ) :      reportTerminalType   (          ); break; //VT100
     case TY_CSI_PN('d'      ) : scr->setCursorY           (p         ); break; //LINUX
     case TY_CSI_PN('f'      ) : scr->setCursorYX          (p,       q); break; //VT100
@@ -964,17 +967,17 @@ void TEmuVt102::doKeyPress( TQKeyEvent* ev )
   {
     switch(ev->key())
     {
-    case Qt::Key_Down : gui->doScroll(+1); return;
-    case Qt::Key_Up : gui->doScroll(-1); return;
-    case Qt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return;
-    case Qt::Key_PageDown : gui->doScroll(gui->Lines()/2); return;
+    case TQt::Key_Down : gui->doScroll(+1); return;
+    case TQt::Key_Up : gui->doScroll(-1); return;
+    case TQt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return;
+    case TQt::Key_PageDown : gui->doScroll(gui->Lines()/2); return;
     }
   }
   
   // revert to non-history when typing
   if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty()
-    || ev->key()==Qt::Key_Down || ev->key()==Qt::Key_Up || ev->key()==Qt::Key_Left || ev->key()==Qt::Key_Right
-    || ev->key()==Qt::Key_PageUp || ev->key()==Qt::Key_PageDown))
+    || ev->key()==TQt::Key_Down || ev->key()==TQt::Key_Up || ev->key()==TQt::Key_Left || ev->key()==TQt::Key_Right
+    || ev->key()==TQt::Key_PageUp || ev->key()==TQt::Key_PageDown))
     scr->setHistCursor(scr->getHistLines());
 
   if (cmd==CMD_send)
@@ -1201,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
@@ -1216,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*)));
   }
 }
 
@@ -1228,7 +1231,7 @@ char TEmuVt102::getErase()
   int len;
   bool metaspecified;
   
-  if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len,
+  if (keytrans->findEntry(TQt::Key_Backspace, 0, &cmd, &txt, &len,
       &metaspecified) && (cmd==CMD_send) && (len == 1))
     return txt[0];
     
diff --git a/konsole/konsole/TEmuVt102.h b/konsole/konsole/TEmuVt102.h
index 8832a73d8..e77fa0ea9 100644
--- a/konsole/konsole/TEmuVt102.h
+++ b/konsole/konsole/TEmuVt102.h
@@ -52,7 +52,7 @@ struct CharCodes
 };
 
 class TEmuVt102 : public TEmulation
-{ Q_OBJECT
+{ TQ_OBJECT
 
 public:
 
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/TEmulation.h b/konsole/konsole/TEmulation.h
index 9ddc2a4c7..e6050a9da 100644
--- a/konsole/konsole/TEmulation.h
+++ b/konsole/konsole/TEmulation.h
@@ -31,8 +31,8 @@
 
 enum { NOTIFYNORMAL=0, NOTIFYBELL=1, NOTIFYACTIVITY=2, NOTIFYSILENCE=3 };
 
-class TEmulation : public QObject
-{ Q_OBJECT
+class TEmulation : public TQObject
+{ TQ_OBJECT
 
 public:
 
diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp
index 8b6da6d70..e4ededa51 100644
--- a/konsole/konsole/fontembedder.cpp
+++ b/konsole/konsole/fontembedder.cpp
@@ -115,5 +115,3 @@ int main(int argc, char **argv)
     cout<<"};\n";
     return 0;
 }
-
-//kate: indent-width 4; tab-width 4; space-indent on;
diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp
index 3712bb0da..7a2b3f566 100644
--- a/konsole/konsole/keytrans.cpp
+++ b/konsole/konsole/keytrans.cpp
@@ -363,11 +363,11 @@ void KeyTrans::readConfig()
       TQBuffer* newbuf;
       newbuf = new TQBuffer();
       newbuf->setBuffer(txt);
-      buf=TQT_TQIODEVICE(newbuf);
+      buf=newbuf;
    }
    else
    {
-      buf=TQT_TQIODEVICE(new TQFile(m_path));
+      buf=new TQFile(m_path);
    };
    KeytabReader ktr(m_path,*buf);
    ktr.parseTo(this);
@@ -519,143 +519,143 @@ void KeyTransSymbols::defModSyms()
 void KeyTransSymbols::defKeySyms()
 {
   // Grey keys
-  defKeySym("Escape",       Qt::Key_Escape      );
-  defKeySym("Tab",          Qt::Key_Tab         );
-  defKeySym("Backtab",      Qt::Key_Backtab     );
-  defKeySym("Backspace",    Qt::Key_Backspace   );
-  defKeySym("Return",       Qt::Key_Return      );
-  defKeySym("Enter",        Qt::Key_Enter       );
-  defKeySym("Insert",       Qt::Key_Insert      );
-  defKeySym("Delete",       Qt::Key_Delete      );
-  defKeySym("Pause",        Qt::Key_Pause       );
-  defKeySym("Print",        Qt::Key_Print       );
-  defKeySym("SysReq",       Qt::Key_SysReq      );
-  defKeySym("Home",         Qt::Key_Home        );
-  defKeySym("End",          Qt::Key_End         );
-  defKeySym("Left",         Qt::Key_Left        );
-  defKeySym("Up",           Qt::Key_Up          );
-  defKeySym("Right",        Qt::Key_Right       );
-  defKeySym("Down",         Qt::Key_Down        );
+  defKeySym("Escape",       TQt::Key_Escape      );
+  defKeySym("Tab",          TQt::Key_Tab         );
+  defKeySym("Backtab",      TQt::Key_Backtab     );
+  defKeySym("Backspace",    TQt::Key_Backspace   );
+  defKeySym("Return",       TQt::Key_Return      );
+  defKeySym("Enter",        TQt::Key_Enter       );
+  defKeySym("Insert",       TQt::Key_Insert      );
+  defKeySym("Delete",       TQt::Key_Delete      );
+  defKeySym("Pause",        TQt::Key_Pause       );
+  defKeySym("Print",        TQt::Key_Print       );
+  defKeySym("SysReq",       TQt::Key_SysReq      );
+  defKeySym("Home",         TQt::Key_Home        );
+  defKeySym("End",          TQt::Key_End         );
+  defKeySym("Left",         TQt::Key_Left        );
+  defKeySym("Up",           TQt::Key_Up          );
+  defKeySym("Right",        TQt::Key_Right       );
+  defKeySym("Down",         TQt::Key_Down        );
   defKeySym("Prior",        TQt::Key_Prior      );
   defKeySym("Next",         TQt::Key_Next       );
-  defKeySym("Shift",        Qt::Key_Shift       );
-  defKeySym("Control",      Qt::Key_Control     );
-  defKeySym("Meta",         Qt::Key_Meta        );
-  defKeySym("Alt",          Qt::Key_Alt         );
-  defKeySym("CapsLock",     Qt::Key_CapsLock    );
-  defKeySym("NumLock",      Qt::Key_NumLock     );
-  defKeySym("ScrollLock",   Qt::Key_ScrollLock  );
-  defKeySym("F1",           Qt::Key_F1          );
-  defKeySym("F2",           Qt::Key_F2          );
-  defKeySym("F3",           Qt::Key_F3          );
-  defKeySym("F4",           Qt::Key_F4          );
-  defKeySym("F5",           Qt::Key_F5          );
-  defKeySym("F6",           Qt::Key_F6          );
-  defKeySym("F7",           Qt::Key_F7          );
-  defKeySym("F8",           Qt::Key_F8          );
-  defKeySym("F9",           Qt::Key_F9          );
-  defKeySym("F10",          Qt::Key_F10         );
-  defKeySym("F11",          Qt::Key_F11         );
-  defKeySym("F12",          Qt::Key_F12         );
-  defKeySym("F13",          Qt::Key_F13         );
-  defKeySym("F14",          Qt::Key_F14         );
-  defKeySym("F15",          Qt::Key_F15         );
-  defKeySym("F16",          Qt::Key_F16         );
-  defKeySym("F17",          Qt::Key_F17         );
-  defKeySym("F18",          Qt::Key_F18         );
-  defKeySym("F19",          Qt::Key_F19         );
-  defKeySym("F20",          Qt::Key_F20         );
-  defKeySym("F21",          Qt::Key_F21         );
-  defKeySym("F22",          Qt::Key_F22         );
-  defKeySym("F23",          Qt::Key_F23         );
-  defKeySym("F24",          Qt::Key_F24         );
-  defKeySym("F25",          Qt::Key_F25         );
-  defKeySym("F26",          Qt::Key_F26         );
-  defKeySym("F27",          Qt::Key_F27         );
-  defKeySym("F28",          Qt::Key_F28         );
-  defKeySym("F29",          Qt::Key_F29         );
-  defKeySym("F30",          Qt::Key_F30         );
-  defKeySym("F31",          Qt::Key_F31         );
-  defKeySym("F32",          Qt::Key_F32         );
-  defKeySym("F33",          Qt::Key_F33         );
-  defKeySym("F34",          Qt::Key_F34         );
-  defKeySym("F35",          Qt::Key_F35         );
-  defKeySym("Super_L",      Qt::Key_Super_L     );
-  defKeySym("Super_R",      Qt::Key_Super_R     );
-  defKeySym("Menu",         Qt::Key_Menu        );
-  defKeySym("Hyper_L",      Qt::Key_Hyper_L     );
-  defKeySym("Hyper_R",      Qt::Key_Hyper_R     );
+  defKeySym("Shift",        TQt::Key_Shift       );
+  defKeySym("Control",      TQt::Key_Control     );
+  defKeySym("Meta",         TQt::Key_Meta        );
+  defKeySym("Alt",          TQt::Key_Alt         );
+  defKeySym("CapsLock",     TQt::Key_CapsLock    );
+  defKeySym("NumLock",      TQt::Key_NumLock     );
+  defKeySym("ScrollLock",   TQt::Key_ScrollLock  );
+  defKeySym("F1",           TQt::Key_F1          );
+  defKeySym("F2",           TQt::Key_F2          );
+  defKeySym("F3",           TQt::Key_F3          );
+  defKeySym("F4",           TQt::Key_F4          );
+  defKeySym("F5",           TQt::Key_F5          );
+  defKeySym("F6",           TQt::Key_F6          );
+  defKeySym("F7",           TQt::Key_F7          );
+  defKeySym("F8",           TQt::Key_F8          );
+  defKeySym("F9",           TQt::Key_F9          );
+  defKeySym("F10",          TQt::Key_F10         );
+  defKeySym("F11",          TQt::Key_F11         );
+  defKeySym("F12",          TQt::Key_F12         );
+  defKeySym("F13",          TQt::Key_F13         );
+  defKeySym("F14",          TQt::Key_F14         );
+  defKeySym("F15",          TQt::Key_F15         );
+  defKeySym("F16",          TQt::Key_F16         );
+  defKeySym("F17",          TQt::Key_F17         );
+  defKeySym("F18",          TQt::Key_F18         );
+  defKeySym("F19",          TQt::Key_F19         );
+  defKeySym("F20",          TQt::Key_F20         );
+  defKeySym("F21",          TQt::Key_F21         );
+  defKeySym("F22",          TQt::Key_F22         );
+  defKeySym("F23",          TQt::Key_F23         );
+  defKeySym("F24",          TQt::Key_F24         );
+  defKeySym("F25",          TQt::Key_F25         );
+  defKeySym("F26",          TQt::Key_F26         );
+  defKeySym("F27",          TQt::Key_F27         );
+  defKeySym("F28",          TQt::Key_F28         );
+  defKeySym("F29",          TQt::Key_F29         );
+  defKeySym("F30",          TQt::Key_F30         );
+  defKeySym("F31",          TQt::Key_F31         );
+  defKeySym("F32",          TQt::Key_F32         );
+  defKeySym("F33",          TQt::Key_F33         );
+  defKeySym("F34",          TQt::Key_F34         );
+  defKeySym("F35",          TQt::Key_F35         );
+  defKeySym("Super_L",      TQt::Key_Super_L     );
+  defKeySym("Super_R",      TQt::Key_Super_R     );
+  defKeySym("Menu",         TQt::Key_Menu        );
+  defKeySym("Hyper_L",      TQt::Key_Hyper_L     );
+  defKeySym("Hyper_R",      TQt::Key_Hyper_R     );
 
   // Regular keys
-  defKeySym("Space",        Qt::Key_Space       );
-  defKeySym("Exclam",       Qt::Key_Exclam      );
-  defKeySym("QuoteDbl",     Qt::Key_QuoteDbl    );
-  defKeySym("NumberSign",   Qt::Key_NumberSign  );
-  defKeySym("Dollar",       Qt::Key_Dollar      );
-  defKeySym("Percent",      Qt::Key_Percent     );
-  defKeySym("Ampersand",    Qt::Key_Ampersand   );
-  defKeySym("Apostrophe",   Qt::Key_Apostrophe  );
-  defKeySym("ParenLeft",    Qt::Key_ParenLeft   );
-  defKeySym("ParenRight",   Qt::Key_ParenRight  );
-  defKeySym("Asterisk",     Qt::Key_Asterisk    );
-  defKeySym("Plus",         Qt::Key_Plus        );
-  defKeySym("Comma",        Qt::Key_Comma       );
-  defKeySym("Minus",        Qt::Key_Minus       );
-  defKeySym("Period",       Qt::Key_Period      );
-  defKeySym("Slash",        Qt::Key_Slash       );
-  defKeySym("0",            Qt::Key_0           );
-  defKeySym("1",            Qt::Key_1           );
-  defKeySym("2",            Qt::Key_2           );
-  defKeySym("3",            Qt::Key_3           );
-  defKeySym("4",            Qt::Key_4           );
-  defKeySym("5",            Qt::Key_5           );
-  defKeySym("6",            Qt::Key_6           );
-  defKeySym("7",            Qt::Key_7           );
-  defKeySym("8",            Qt::Key_8           );
-  defKeySym("9",            Qt::Key_9           );
-  defKeySym("Colon",        Qt::Key_Colon       );
-  defKeySym("Semicolon",    Qt::Key_Semicolon   );
-  defKeySym("Less",         Qt::Key_Less        );
-  defKeySym("Equal",        Qt::Key_Equal       );
-  defKeySym("Greater",      Qt::Key_Greater     );
-  defKeySym("Question",     Qt::Key_Question    );
-  defKeySym("At",           Qt::Key_At          );
-  defKeySym("A",            Qt::Key_A           );
-  defKeySym("B",            Qt::Key_B           );
-  defKeySym("C",            Qt::Key_C           );
-  defKeySym("D",            Qt::Key_D           );
-  defKeySym("E",            Qt::Key_E           );
-  defKeySym("F",            Qt::Key_F           );
-  defKeySym("G",            Qt::Key_G           );
-  defKeySym("H",            Qt::Key_H           );
-  defKeySym("I",            Qt::Key_I           );
-  defKeySym("J",            Qt::Key_J           );
-  defKeySym("K",            Qt::Key_K           );
-  defKeySym("L",            Qt::Key_L           );
-  defKeySym("M",            Qt::Key_M           );
-  defKeySym("N",            Qt::Key_N           );
-  defKeySym("O",            Qt::Key_O           );
-  defKeySym("P",            Qt::Key_P           );
-  defKeySym("Q",            Qt::Key_Q           );
-  defKeySym("R",            Qt::Key_R           );
-  defKeySym("S",            Qt::Key_S           );
-  defKeySym("T",            Qt::Key_T           );
-  defKeySym("U",            Qt::Key_U           );
-  defKeySym("V",            Qt::Key_V           );
-  defKeySym("W",            Qt::Key_W           );
-  defKeySym("X",            Qt::Key_X           );
-  defKeySym("Y",            Qt::Key_Y           );
-  defKeySym("Z",            Qt::Key_Z           );
-  defKeySym("BracketLeft",  Qt::Key_BracketLeft );
-  defKeySym("Backslash",    Qt::Key_Backslash   );
-  defKeySym("BracketRight", Qt::Key_BracketRight);
-  defKeySym("AsciiCircum",  Qt::Key_AsciiCircum );
-  defKeySym("Underscore",   Qt::Key_Underscore  );
-  defKeySym("QuoteLeft",    Qt::Key_QuoteLeft   );
-  defKeySym("BraceLeft",    Qt::Key_BraceLeft   );
-  defKeySym("Bar",          Qt::Key_Bar         );
-  defKeySym("BraceRight",   Qt::Key_BraceRight  );
-  defKeySym("AsciiTilde",   Qt::Key_AsciiTilde  );
+  defKeySym("Space",        TQt::Key_Space       );
+  defKeySym("Exclam",       TQt::Key_Exclam      );
+  defKeySym("QuoteDbl",     TQt::Key_QuoteDbl    );
+  defKeySym("NumberSign",   TQt::Key_NumberSign  );
+  defKeySym("Dollar",       TQt::Key_Dollar      );
+  defKeySym("Percent",      TQt::Key_Percent     );
+  defKeySym("Ampersand",    TQt::Key_Ampersand   );
+  defKeySym("Apostrophe",   TQt::Key_Apostrophe  );
+  defKeySym("ParenLeft",    TQt::Key_ParenLeft   );
+  defKeySym("ParenRight",   TQt::Key_ParenRight  );
+  defKeySym("Asterisk",     TQt::Key_Asterisk    );
+  defKeySym("Plus",         TQt::Key_Plus        );
+  defKeySym("Comma",        TQt::Key_Comma       );
+  defKeySym("Minus",        TQt::Key_Minus       );
+  defKeySym("Period",       TQt::Key_Period      );
+  defKeySym("Slash",        TQt::Key_Slash       );
+  defKeySym("0",            TQt::Key_0           );
+  defKeySym("1",            TQt::Key_1           );
+  defKeySym("2",            TQt::Key_2           );
+  defKeySym("3",            TQt::Key_3           );
+  defKeySym("4",            TQt::Key_4           );
+  defKeySym("5",            TQt::Key_5           );
+  defKeySym("6",            TQt::Key_6           );
+  defKeySym("7",            TQt::Key_7           );
+  defKeySym("8",            TQt::Key_8           );
+  defKeySym("9",            TQt::Key_9           );
+  defKeySym("Colon",        TQt::Key_Colon       );
+  defKeySym("Semicolon",    TQt::Key_Semicolon   );
+  defKeySym("Less",         TQt::Key_Less        );
+  defKeySym("Equal",        TQt::Key_Equal       );
+  defKeySym("Greater",      TQt::Key_Greater     );
+  defKeySym("Question",     TQt::Key_Question    );
+  defKeySym("At",           TQt::Key_At          );
+  defKeySym("A",            TQt::Key_A           );
+  defKeySym("B",            TQt::Key_B           );
+  defKeySym("C",            TQt::Key_C           );
+  defKeySym("D",            TQt::Key_D           );
+  defKeySym("E",            TQt::Key_E           );
+  defKeySym("F",            TQt::Key_F           );
+  defKeySym("G",            TQt::Key_G           );
+  defKeySym("H",            TQt::Key_H           );
+  defKeySym("I",            TQt::Key_I           );
+  defKeySym("J",            TQt::Key_J           );
+  defKeySym("K",            TQt::Key_K           );
+  defKeySym("L",            TQt::Key_L           );
+  defKeySym("M",            TQt::Key_M           );
+  defKeySym("N",            TQt::Key_N           );
+  defKeySym("O",            TQt::Key_O           );
+  defKeySym("P",            TQt::Key_P           );
+  defKeySym("Q",            TQt::Key_Q           );
+  defKeySym("R",            TQt::Key_R           );
+  defKeySym("S",            TQt::Key_S           );
+  defKeySym("T",            TQt::Key_T           );
+  defKeySym("U",            TQt::Key_U           );
+  defKeySym("V",            TQt::Key_V           );
+  defKeySym("W",            TQt::Key_W           );
+  defKeySym("X",            TQt::Key_X           );
+  defKeySym("Y",            TQt::Key_Y           );
+  defKeySym("Z",            TQt::Key_Z           );
+  defKeySym("BracketLeft",  TQt::Key_BracketLeft );
+  defKeySym("Backslash",    TQt::Key_Backslash   );
+  defKeySym("BracketRight", TQt::Key_BracketRight);
+  defKeySym("AsciiCircum",  TQt::Key_AsciiCircum );
+  defKeySym("Underscore",   TQt::Key_Underscore  );
+  defKeySym("QuoteLeft",    TQt::Key_QuoteLeft   );
+  defKeySym("BraceLeft",    TQt::Key_BraceLeft   );
+  defKeySym("Bar",          TQt::Key_Bar         );
+  defKeySym("BraceRight",   TQt::Key_BraceRight  );
+  defKeySym("AsciiTilde",   TQt::Key_AsciiTilde  );
 }
 
 KeyTransSymbols::KeyTransSymbols()
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index 0101ecab3..dae5b834c 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -266,6 +266,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
 ,b_installBitmapFonts(false)
 ,b_framevis(true)
 ,b_metaAsAlt(false)
+,b_realTransparency(false)
 ,b_fullscreen(false)
 ,m_menuCreated(false)
 ,b_warnQuit(false)
@@ -289,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();
@@ -358,14 +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(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged()));
 
   kapp->dcopClient()->setDefaultObject( "konsole" );
-
-  // Signal that we want to be transparent to the desktop, not to windows behind us...
-  Atom kde_wm_transparent_to_desktop;
-  kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
-  XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
 }
 
 
@@ -480,29 +476,29 @@ 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,
    // not sure if this will be "fixed" in Qt, for now use this hack (malte)
    if(!(isRestored)) {
-     if (sender() && sender()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) &&
+     if (sender() && sender()->inherits("TQPopupMenu") &&
        static_cast<const TQPopupMenu *>(sender())->count() == 1)
        const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0);
        }
@@ -521,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 );
    }
 
@@ -575,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)
@@ -605,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);
@@ -629,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")
@@ -644,28 +640,28 @@ 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);
@@ -682,8 +678,8 @@ void Konsole::makeGUI()
       // 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)")
@@ -696,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();
@@ -712,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())
@@ -726,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);
@@ -748,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);
@@ -825,57 +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() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::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() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::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( 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
@@ -883,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);
     }
@@ -955,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()));
+    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);
 
@@ -980,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 );
 
   }
@@ -988,18 +985,18 @@ void Konsole::makeTabWidget()
 
 bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
 {
-  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_newSessionButton))
+  if (o == m_newSessionButton)
   {
     // Popup the menu when the left mousebutton is pressed and the mouse
     // is moved by a small distance.
     if (ev->type() == TQEvent::MouseButtonPress)
     {
-      TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+      TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
       m_newSessionButtonMousePressPos = mev->pos();
     }
     else if (ev->type() == TQEvent::MouseMove)
     {
-      TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+      TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
       if ((mev->pos() - m_newSessionButtonMousePressPos).manhattanLength()
             > TDEGlobalSettings::dndEventDelay())
       {
@@ -1009,7 +1006,7 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev )
     }
     else if (ev->type() == TQEvent::ContextMenu)
     {
-      TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+      TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
       slotTabbarContextMenu(mev->globalPos());
       return true;
     }
@@ -1022,7 +1019,7 @@ void Konsole::makeBasicGUI()
   if (kapp->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);
@@ -1065,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);
@@ -1092,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", Qt::SHIFT+Qt::Key_Insert, TQT_TQOBJECT(this),
-                                 TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste");
-  m_pasteSelection = new TDEAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::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..."), Qt::CTRL+Qt::SHIFT+Qt::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"))
     m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ),
-                                  Qt::CTRL+Qt::ALT+Qt::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", Qt::CTRL+Qt::SHIFT+Qt::ALT+Qt::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)
@@ -1172,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(Qt::CTRL+Qt::ALT+Qt::Key_N);
-  shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N));
-  new TDEAction(i18n("New Session"), shortcut, TQT_TQOBJECT(this), TQT_SLOT(newSession()), m_shortcuts, "new_session");
-  new TDEAction(i18n("Activate Menu"), Qt::CTRL+Qt::ALT+Qt::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");
+  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, 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() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::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() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::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() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left,
-              TQT_TQOBJECT(this), TQT_SLOT(prevSession()), m_shortcuts, "previous_session");
-  new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right,
-              TQT_TQOBJECT(this), TQT_SLOT(nextSession()), m_shortcuts, "next_session");
+  new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left,
+              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,
+              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"), Qt::CTRL+Qt::ALT+Qt::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) ) {
@@ -1220,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)));
 }
 
 /**
@@ -1383,10 +1380,16 @@ void Konsole::slotTabRenameSession() {
 void Konsole::slotTabSelectColor()
 {
   TQColor color = tabwidget->tabColor( m_contextMenuSession->widget() );
-  int result = KColorDialog::getColor( color );
+  int result = KColorDialog::getColor( color, tabwidget->colorGroup().foreground() );
 
-  if ( result == KColorDialog::Accepted )
+  if ( result == KColorDialog::Accepted ) {
     tabwidget->setTabColor(m_contextMenuSession->widget(), color);
+  }
+}
+
+void Konsole::slotTabResetColor()
+{
+  tabwidget->resetTabColor(m_contextMenuSession->widget());
 }
 
 void Konsole::slotTabToggleMonitor()
@@ -1616,6 +1619,20 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
      s_word_seps= config->readEntry("wordseps",":@-./_~");
      b_framevis = config->readBoolEntry("has frame",true);
      b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false);
+     b_realTransparency = config->readBoolEntry("RealTransparency",false);
+
+     Atom kde_wm_transparent_to_desktop;
+     kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
+     if (b_realTransparency)
+     {
+       XDeleteProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop);
+     }
+     else
+     {
+       // Signal that we want to be transparent to the desktop, not to windows behind us...
+       XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
+     }
+
      TQPtrList<TEWidget> tes = activeTEs();
      for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
        _te->setWordCharacters(s_word_seps);
@@ -1642,10 +1659,6 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
      config->setGroup("UTMP");
      b_addToUtmp = config->readBoolEntry("AddToUtmp",true);
      config->setDesktopGroup();
-
-     // Do not set a default value; this allows the System-wide Scheme
-     // to set the tab text color.
-     m_tabColor = config->readColorEntry("TabColor");
    }
 
    if (!globalConfigOnly)
@@ -1720,7 +1733,7 @@ void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool glo
       // profile scrollbar entry differs from the konsolerc scrollbar entry.
       TQPtrList<TEWidget> tes = activeTEs();
       for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
-        if (_te->getScrollbarLocation() != n_scroll) 
+        if (_te->getScrollbarLocation() != n_scroll)
            _te->setScrollbarLocation(n_scroll);
       }
    }
@@ -1977,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();
 }
@@ -2015,8 +2028,6 @@ void Konsole::createSessionTab(TEWidget *widget, const TQIconSet &iconSet,
     tabwidget->insertTab(widget, iconSet, TQString::null, index);
     break;
   }
-  if ( m_tabColor.isValid() )
-    tabwidget->setTabColor(widget, m_tabColor);
 }
 
 TQIconSet Konsole::iconSetForSession(TESession *session) const
@@ -2131,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();
@@ -2287,7 +2298,7 @@ void Konsole::updateTitle(TESession* _se)
   TDERadioAction *ra = session2action.find(_se);
   if (ra && (ra->icon() != icon))
     ra->setIcon(icon);
-  if (m_tabViewMode == ShowIconOnly) 
+  if (m_tabViewMode == ShowIconOnly)
     tabwidget->changeTab( _se->widget(), TQString::null );
   else if (b_matchTabWinTitle)
     tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&"));
@@ -2369,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*)));
         }
       }
     }
@@ -2392,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*)));
         }
       }
     }
@@ -2492,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)
@@ -2525,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);
@@ -2581,7 +2592,7 @@ void Konsole::listSessions()
 
 void Konsole::switchToSession()
 {
-  activateSession( TQString( TQT_TQOBJECT_CONST(sender())->name() ).right( 2 ).toInt() -1 );
+  activateSession( TQString( sender()->name() ).right( 2 ).toInt() -1 );
 }
 
 void Konsole::activateSession(int position)
@@ -2654,8 +2665,8 @@ void Konsole::activateSession(TESession *s)
   pmPath = cs->imagePath();
   n_render = cs->alignment();
 
-// BR 106464 temporary fix... 
-//  only 2 sessions opened, 2nd session viewable, right-click on 1st tab and 
+// BR 106464 temporary fix...
+//  only 2 sessions opened, 2nd session viewable, right-click on 1st tab and
 //  select 'Detach', close original Konsole window... crash
 //  s is not set properly on original Konsole window
   TDERadioAction *ra = session2action.find(se);
@@ -2665,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();
@@ -2739,7 +2750,7 @@ void Konsole::setSessionEncoding( const TQString &encoding, TESession *session )
 
     while ( it != encodingNames.end() && !found_encoding )
     {
-      if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it), 
+      if ( TQString::compare( TDEGlobal::charsets()->encodingForName(*it),
                              t_encoding ) == 0 ) {
          found_encoding = true;
       }
@@ -2942,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);
   }
@@ -2962,40 +2973,40 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis
   s->setMonitorSilenceSeconds(monitorSilenceSeconds);
   s->enableFullScripting(b_fullScripting);
   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);
@@ -3138,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();
@@ -3211,16 +3222,16 @@ void Konsole::moveSessionLeft()
   ra->plug(m_view,(m_view->count()-sessions.count()+1)+position-1);
 
   TQColor oldcolor = tabwidget->tabColor(se->widget());
-  
+
   tabwidget->blockSignals(true);
   tabwidget->removePage(se->widget());
   tabwidget->blockSignals(false);
   TQString title = se->Title();
-  createSessionTab(se->widget(), iconSetForSession(se), 
+  createSessionTab(se->widget(), iconSetForSession(se),
                    title.replace('&', "&&"), position-1);
   tabwidget->showPage(se->widget());
   tabwidget->setTabColor(se->widget(),oldcolor);
-  
+
   if (!m_menuCreated)
     makeGUI();
   m_moveSessionLeft->setEnabled(position-1>0);
@@ -3244,16 +3255,16 @@ void Konsole::moveSessionRight()
   ra->plug(m_view,(m_view->count()-sessions.count()+1)+position+1);
 
   TQColor oldcolor = tabwidget->tabColor(se->widget());
-  
+
   tabwidget->blockSignals(true);
   tabwidget->removePage(se->widget());
   tabwidget->blockSignals(false);
   TQString title = se->Title();
-  createSessionTab(se->widget(), iconSetForSession(se), 
+  createSessionTab(se->widget(), iconSetForSession(se),
                    title.replace('&', "&&"), position+1);
   tabwidget->showPage(se->widget());
   tabwidget->setTabColor(se->widget(),oldcolor);
-  
+
   if (!m_menuCreated)
     makeGUI();
   m_moveSessionLeft->setEnabled(true);
@@ -3434,6 +3445,7 @@ void Konsole::addSessionCommand(const TQString &path)
   // try to locate the binary
   TQString exec= co->readPathEntry("Exec");
   exec.remove(TQRegExp("^(sudo )?su (- )?-c ?\'"));
+  exec.remove(TQRegExp("\'?$"));
 
   exec = KRun::binaryName(exec, false);
   exec = KShell::tildeExpand(exec);
@@ -3468,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 );
 
 }
@@ -3740,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,
@@ -3788,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)
@@ -3816,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());
@@ -3833,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);
@@ -3847,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);
 }
@@ -3922,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);
 
@@ -3933,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);
@@ -4027,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;
@@ -4047,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();
@@ -4062,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)
@@ -4333,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 );
   }
 }
@@ -4342,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 );
 
@@ -4376,20 +4388,13 @@ void Konsole::slotFontChanged()
 
 void Konsole::biggerFont(void) {
     if ( !se ) return;
-
-    TQFont f = te->getVTFont();
-    f.setPointSize( f.pointSize() + 1 );
-    te->setVTFont( f );
+    te->biggerFont();
     activateSession();
 }
 
 void Konsole::smallerFont(void) {
     if ( !se ) return;
-
-    TQFont f = te->getVTFont();
-    if ( f.pointSize() < 6 ) return;      // A minimum size
-    f.setPointSize( f.pointSize() - 1 );
-    te->setVTFont( f );
+    te->smallerFont();
     activateSession();
 }
 
@@ -4472,7 +4477,7 @@ void Konsole::setMenuAcceleratos()
     if (m_help)
       menubar->changeItem(m_help_id, m_help_string);
   }
-  else  
+  else
   {
     menubar->changeItem(m_session_id, TQString(m_session_string).replace(TQRegExp("&([^&])"), "\\1"));
     menubar->changeItem(m_edit_id, TQString(m_edit_string).replace(TQRegExp("&([^&])"), "\\1"));
@@ -4485,5 +4490,5 @@ void Konsole::setMenuAcceleratos()
       menubar->changeItem(m_help_id, TQString(m_help_string).replace(TQRegExp("&([^&])"), "\\1"));
   }
 }
-  
+
 #include "konsole.moc"
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index 30ca6e5a1..b5e1f926b 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -68,7 +68,7 @@ const char *konsole_shell(TQStrList &args);
 
 class Konsole : public TDEMainWindow, virtual public KonsoleIface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KonsoleSessionManaged;
 public:
@@ -245,6 +245,7 @@ private slots:
   void slotTabDetachSession();
   void slotTabRenameSession();
   void slotTabSelectColor();
+  void slotTabResetColor();
   void slotTabCloseSession();
   void slotTabToggleMonitor();
   void slotTabToggleMasterMode();
@@ -297,7 +298,7 @@ private:
   TQPtrDict<TDERadioAction> session2action;
   TQPtrList<TESession> sessions;
 
-  TQIntDict<KSimpleConfig> no2command;     //QT4 - convert to QList
+  TQIntDict<KSimpleConfig> no2command;
 
   KSimpleConfig* m_defaultSession;
   TQString m_defaultSessionFilename;
@@ -428,6 +429,7 @@ private:
 
   bool        b_framevis:1;
   bool        b_metaAsAlt:1;
+  bool        b_realTransparency:1;
   bool        b_fullscreen:1;
   bool        m_menuCreated:1;
   bool        b_warnQuit:1;
@@ -468,7 +470,7 @@ class TQSpinBox;
 
 class HistoryTypeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   HistoryTypeDialog(const HistoryType& histType,
                     unsigned int histSize,
@@ -492,7 +494,7 @@ protected:
 
 class SizeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   SizeDialog(unsigned int const columns,
              unsigned int const lines,
@@ -511,7 +513,7 @@ protected:
 
 class KonsoleFind : public KEdFind
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   KonsoleFind( TQWidget *parent = 0, const char *name=0, bool modal=true );
   bool reg_exp() const;
diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp
index 64fdfb700..b5879d45c 100644
--- a/konsole/konsole/konsole_part.cpp
+++ b/konsole/konsole/konsole_part.cpp
@@ -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;
@@ -343,7 +343,7 @@ 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 ----------------------------------------------------------------
@@ -353,7 +353,7 @@ void konsolePart::makeGUI()
 
      // 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);
@@ -392,7 +392,7 @@ void konsolePart::makeGUI()
      {
         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 );
      }
 
@@ -401,21 +401,21 @@ void konsolePart::makeGUI()
      {
         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);
@@ -705,19 +705,12 @@ void konsolePart::slotSelectFont() {
 
 void konsolePart::biggerFont(void) {
     if ( !se ) return;
-
-    TQFont f = te->getVTFont();
-    f.setPointSize( f.pointSize() + 1 );
-    te->setVTFont( f );
+    te->biggerFont();
 }
 
 void konsolePart::smallerFont(void) {
     if ( !se ) return;
-
-    TQFont f = te->getVTFont();
-    if ( f.pointSize() < 6 ) return;      // A minimum size
-    f.setPointSize( f.pointSize() - 1 );
-    te->setVTFont( f );
+    te->smallerFont();
 }
 
 void konsolePart::updateKeytabMenu()
@@ -803,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);
@@ -1018,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);
@@ -1128,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_part.h b/konsole/konsole/konsole_part.h
index 39b037b67..aeb3ddca0 100644
--- a/konsole/konsole/konsole_part.h
+++ b/konsole/konsole/konsole_part.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*-
+/*
     This file is part of the KDE system
     Copyright (C)  1999,2000 Boloni Laszlo <lboloni@cpe.ucf.edu>
 
@@ -47,7 +47,7 @@ namespace KParts { class GUIActivateEvent; }
 
 class konsoleFactory : public KParts::Factory
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     konsoleFactory();
     virtual ~konsoleFactory();
@@ -68,7 +68,7 @@ public:
 
 class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public ExtTerminalInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 	public:
     konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name,
                 const char *classname = 0, const TQString &title = TQString::null);
@@ -217,7 +217,7 @@ public:
 
 class HistoryTypeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   HistoryTypeDialog(const HistoryType& histType,
                     unsigned int histSize,
@@ -241,7 +241,7 @@ protected:
 
 class konsoleBrowserExtension : public KParts::BrowserExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 	friend class konsolePart;
  public:
     konsoleBrowserExtension(konsolePart *parent);
diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp
index 13af12ca5..16f8afb63 100644
--- a/konsole/konsole/konsolebookmarkhandler.cpp
+++ b/konsole/konsole/konsolebookmarkhandler.cpp
@@ -59,8 +59,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel
     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/konsolebookmarkhandler.h b/konsole/konsole/konsolebookmarkhandler.h
index 66680e095..0837a2b87 100644
--- a/konsole/konsole/konsolebookmarkhandler.h
+++ b/konsole/konsole/konsolebookmarkhandler.h
@@ -30,7 +30,7 @@ class KBookmarkManager;
 
 class KonsoleBookmarkHandler : public TQObject, public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleBookmarkHandler( Konsole *konsole, bool toplevel );
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp
index 0afe6a693..d199808df 100644
--- a/konsole/konsole/konsolebookmarkmenu.cpp
+++ b/konsole/konsole/konsolebookmarkmenu.cpp
@@ -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() );
@@ -149,7 +149,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
 void KonsoleBookmarkMenu::slotBookmarkSelected()
 {
     if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
-    m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
+    m_kOwner->openBookmarkURL( TQString::fromUtf8(sender()->name()), /* URL */
                                ( (TDEAction *)sender() )->text() /* Title */ );
 }
 
diff --git a/konsole/konsole/konsolebookmarkmenu.h b/konsole/konsole/konsolebookmarkmenu.h
index e1dfdacba..547802fe8 100644
--- a/konsole/konsole/konsolebookmarkmenu.h
+++ b/konsole/konsole/konsolebookmarkmenu.h
@@ -38,7 +38,7 @@ class KonsoleBookmarkMenu;
 
 class KonsoleBookmarkMenu : public KBookmarkMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonsoleBookmarkMenu( KBookmarkManager* mgr,
diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp
index 9eef57954..9e70e4c1a 100644
--- a/konsole/konsole/kwrited.cpp
+++ b/konsole/konsole/kwrited.cpp
@@ -72,15 +72,15 @@ KWrited::KWrited() : TQTextEdit()
   setMinimumWidth(pref_width);
   setMinimumHeight(pref_height);
   setReadOnly(true);
-  setFocusPolicy(TQ_NoFocus);
+  setFocusPolicy(TQWidget::NoFocus);
   setWordWrap(TQTextEdit::WidgetWidth);
   setTextFormat(TQt::PlainText);
 
   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 +116,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;
diff --git a/konsole/konsole/kwrited.h b/konsole/konsole/kwrited.h
index 7c051c51a..5021b04c3 100644
--- a/konsole/konsole/kwrited.h
+++ b/konsole/konsole/kwrited.h
@@ -29,7 +29,7 @@
 class KPty;
 
 class KWrited : public TQTextEdit
-{ Q_OBJECT
+{ TQ_OBJECT
 public:
   KWrited();
  ~KWrited();
@@ -44,7 +44,7 @@ private:
 
 class KWritedModule : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 public:
   KWritedModule( const TQCString& obj );
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 4039362e3..76db9e9cc 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -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
 
diff --git a/konsole/konsole/printsettings.h b/konsole/konsole/printsettings.h
index 1e5a0c23d..393d777d3 100644
--- a/konsole/konsole/printsettings.h
+++ b/konsole/konsole/printsettings.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class PrintSettings : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PrintSettings(TQWidget *parent = 0, const char *name = 0);
 	~PrintSettings();
diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h
index 618683c17..c32f26221 100644
--- a/konsole/konsole/schema.h
+++ b/konsole/konsole/schema.h
@@ -187,10 +187,6 @@ public:
 	uint count() const { return TQPtrList<ColorSchema>::count(); } ;
 	const ColorSchema *at(unsigned int i)
 		{ return TQPtrList<ColorSchema>::at(i); } ;
-#ifdef USE_QT4
-	const ColorSchema *at(unsigned int i)
-		{ return at(i); } ;
-#endif // USE_QT4
 
    void sort() {TQPtrList<ColorSchema>::sort();};
 
diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp
index dcfe9fee4..d613a23e4 100644
--- a/konsole/konsole/session.cpp
+++ b/konsole/konsole/session.cpp
@@ -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,7 +177,7 @@ 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;
   }
 
@@ -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;
   }
 }
@@ -639,23 +639,23 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T
   zmodemProc->start(KProcIO::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()));
-
-  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(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,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 03b5941dd..3b5f211fa 100644
--- a/konsole/konsole/session.h
+++ b/konsole/konsole/session.h
@@ -36,7 +36,7 @@ class TDEProcess;
 class ZModemDialog;
 
 class TESession : public TQObject, virtual public SessionIface
-{ Q_OBJECT
+{ TQ_OBJECT
 
 public:
 
@@ -208,7 +208,7 @@ private:
   bool           xon_xoff;
   bool           fullScripting;
 
-  QString	 stateIconName;
+  TQString	 stateIconName;
 
   TQString        pgm;
   TQStrList       args;
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/konsole/zmodem_dialog.h b/konsole/konsole/zmodem_dialog.h
index 5487fba50..93b50ee18 100644
--- a/konsole/konsole/zmodem_dialog.h
+++ b/konsole/konsole/zmodem_dialog.h
@@ -25,7 +25,7 @@ class TQTextEdit;
 
 class ZModemDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ZModemDialog(TQWidget *parent, bool modal, const TQString &caption);
   
diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab
index 75d6cfd79..4e23851bb 100644
--- a/konsole/other/README.KeyTab
+++ b/konsole/other/README.KeyTab
@@ -14,7 +14,7 @@ The syntax is that each entry has the form :
   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 
 Keynames are those defined in <qnamespace.h> with the
-"Qt::Key_" prefix removed.
+"TQt::Key_" prefix removed.
 
 Mode names are: 
 
diff --git a/konsole/other/linux.keytab b/konsole/other/linux.keytab
index d5149c3c8..aafbdd97f 100644
--- a/konsole/other/linux.keytab
+++ b/konsole/other/linux.keytab
@@ -15,7 +15,7 @@ keyboard "linux console"
 #   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 #
 # Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
 #
 # Mode names are : 
 #
diff --git a/konsole/other/solaris.keytab b/konsole/other/solaris.keytab
index cb0626be9..e671cb13b 100644
--- a/konsole/other/solaris.keytab
+++ b/konsole/other/solaris.keytab
@@ -13,7 +13,7 @@ keyboard "Solaris"
 #   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 #
 # Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
 #
 # Mode names are :
 #
diff --git a/konsole/other/vt100.keytab b/konsole/other/vt100.keytab
index dec49baac..fa57934bc 100644
--- a/konsole/other/vt100.keytab
+++ b/konsole/other/vt100.keytab
@@ -14,7 +14,7 @@ keyboard "vt100 (historical)"
 #   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 #
 # Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
 #
 # Mode names are : 
 #
diff --git a/konsole/other/vt420pc.keytab b/konsole/other/vt420pc.keytab
index d132797b1..376ce8d13 100644
--- a/konsole/other/vt420pc.keytab
+++ b/konsole/other/vt420pc.keytab
@@ -29,7 +29,7 @@ keyboard "VT420PC"
 #   "key" Keyname { ("+"|"-") Modename } ":" (String|Operation)
 #
 # Keynames are those defined in <qnamespace.h> with the
-# "Qt::Key_" removed. (We'd better insert the list here)
+# "TQt::Key_" removed. (We'd better insert the list here)
 #
 # Mode names are : 
 #
diff --git a/kpager/config.cpp b/kpager/config.cpp
index 0c022d4bb..29d0470a0 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);
 }
diff --git a/kpager/config.h b/kpager/config.h
index 2b8b095d3..e3e172808 100644
--- a/kpager/config.h
+++ b/kpager/config.h
@@ -30,7 +30,7 @@ class TQButtonGroup;
 
 class KPagerConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KPagerConfigDialog(TQWidget *parent);
diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp
index 74ead587f..c731f5353 100644
--- a/kpager/desktop.cpp
+++ b/kpager/desktop.cpp
@@ -78,7 +78,7 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev )
 {
     if ( !KPagerConfigDialog::m_windowDragging )
 	return;
-    if ( (ev->state() & Qt::LeftButton) == 0 )
+    if ( (ev->state() & TQt::LeftButton) == 0 )
 	return;
     TQPoint p( ev->pos() - pressPos );
     if ( p.manhattanLength() >= tqApp->startDragDistance() )
@@ -88,12 +88,12 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev )
 void Desktop::mousePressEvent( TQMouseEvent * ev)
 {
     bool showWindows= KPagerConfigDialog::m_showWindows;
-    if (ev->button()==Qt::LeftButton){
+    if (ev->button()==TQt::LeftButton){
 	pressPos = ev->pos();
     }
-    else if ((ev->button()==Qt::MidButton)&&(showWindows))
+    else if ((ev->button()==TQt::MidButton)&&(showWindows))
 	startDrag(ev->pos());
-    else if (ev->button()==Qt::RightButton) {
+    else if (ev->button()==TQt::RightButton) {
 	TQPoint pos;
 	KWin::WindowInfo *info = windowAtPosition(ev->pos(), &pos);
 	if ( info && showWindows )
@@ -107,7 +107,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev )
 {
 /** Note that mouseReleaseEvent is not called when releasing the mouse
  to drop a window in this desktop */
-  if (ev->button()==Qt::LeftButton)
+  if (ev->button()==TQt::LeftButton)
   {
     bool showWindows= KPagerConfigDialog::m_showWindows;
     TQPoint pos;
@@ -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));
@@ -426,7 +426,7 @@ void Desktop::paintEvent( TQPaintEvent * )
   p.begin(&pixmap);
 //  p.setFont(font());
 //  p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark));
-//  p.setPen(Qt::black);
+//  p.setPen(TQt::black);
 //  p.drawRect(rect());
 
   if (KPagerConfigDialog::m_showBackground )
@@ -447,7 +447,7 @@ void Desktop::paintEvent( TQPaintEvent * )
 
       p.drawPixmap(0,0,tmp);
     }
-     else pixmap.fill(Qt::gray);
+     else pixmap.fill(TQt::gray);
   }
   else
     p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid));
@@ -528,7 +528,7 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
 
   if ( m_transparentMode==AllWindows
       || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) )
-    brush.setStyle(Qt::Dense4Pattern);
+    brush.setStyle(TQt::Dense4Pattern);
 
   if ( isActive )
   {
diff --git a/kpager/desktop.h b/kpager/desktop.h
index cff05594a..1954c45fb 100644
--- a/kpager/desktop.h
+++ b/kpager/desktop.h
@@ -37,7 +37,7 @@ class TQPoint;
 
 class Desktop : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
   Desktop( int desk, TQString desktopName, TQWidget *parent=0,
diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp
index 4775576ee..68f73982a 100644
--- a/kpager/kpager.cpp
+++ b/kpager/kpager.cpp
@@ -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()
@@ -187,11 +187,11 @@ 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();
 
@@ -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(kapp, 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(kapp, 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 );
diff --git a/kpager/kpager.h b/kpager/kpager.h
index 4a3d2ef8f..7fdd7d573 100644
--- a/kpager/kpager.h
+++ b/kpager/kpager.h
@@ -36,7 +36,7 @@ class TQPopupMenu;
 
 class KPagerMainWindow : public TDEMainWindow, public virtual KPagerIface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KPagerMainWindow(TQWidget *parent=0, const char *name=0);
@@ -59,7 +59,7 @@ protected:
 
 class KPager : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KPagerMainWindow;
 
diff --git a/kpersonalizer/CMakeLists.txt b/kpersonalizer/CMakeLists.txt
index 19c3a6698..6fe020c82 100644
--- a/kpersonalizer/CMakeLists.txt
+++ b/kpersonalizer/CMakeLists.txt
@@ -40,6 +40,6 @@ tde_add_executable( kpersonalizer AUTOMOC
     kpersonalizer.cpp main.cpp kfindlanguage.cpp
     kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui
     tdestylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
-  LINK tdeio-shared
+  LINK tdeio-shared ${KSTAT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am
index fb13dc1b5..bffad2248 100644
--- a/kpersonalizer/Makefile.am
+++ b/kpersonalizer/Makefile.am
@@ -46,7 +46,7 @@ kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TD
 #rc_DATA = kpersonalizerui.rc
 
 messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/kpersonalizer.pot; \
 	fi
diff --git a/kpersonalizer/README b/kpersonalizer/README
index b93d9d15d..14cbb63ca 100644
--- a/kpersonalizer/README
+++ b/kpersonalizer/README
@@ -39,8 +39,8 @@ that don't require much background-knowledge and tries to guess a set
 of configuration-settings which fit the users needs best.
 
 Layout: KPersonalizer consists of a window which is not set fullscreen.
-This has the advantage that the user sees on the fly which settings he has
-changed and can step back as he sees that something doesn't fit.
+This has the advantage that the user sees on the fly which settings they
+have changed and can step back as they see that something doesn't fit.
 On the left of each dialog there is a decorative 170x430-pixel-bitmap which
 sort of describes the step in a graphical manner.
 
@@ -204,7 +204,7 @@ There is a preview for each theme.
 
 Step 5: Refinement
 ==============
-The user is told how he can start KPersonalizer again if the user changes his
+The user is told how they can start KPersonalizer again if they change their
 mind on a certain setting later and the advanced user may launch kcontrol to
 refine certain settings.
 
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index cec71bae8..0384ff2b8 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -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;
diff --git a/kpersonalizer/kcountrypage.h b/kpersonalizer/kcountrypage.h
index 758decbb3..083937fd6 100644
--- a/kpersonalizer/kcountrypage.h
+++ b/kpersonalizer/kcountrypage.h
@@ -29,7 +29,7 @@ class KFindLanguage;
   */
 
 class KCountryPage : public KCountryPageDlg  {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KCountryPage(TQWidget *parent=0, const char *name=0);
 	~KCountryPage();
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index fb0f446d7..9c1fb7765 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -689,7 +689,7 @@ void KEyeCandyPage::getUserDefaults(){
 	st_UserWallpaper.CommonDesktop = kdesktopconf->readBoolEntry("CommonDesktop", true);
 	kdesktopconf->setGroup("Desktop0"); // we only need to set one desktop
 	st_UserWallpaper.MultiWallpaperMode = kdesktopconf->readEntry("MultiWallpaperMode", "NoMulti");
-	st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "Scaled");
+	st_UserWallpaper.WallpaperMode = kdesktopconf->readEntry("WallpaperMode", "ScaledAndCrop");
 	st_UserWallpaper.Wallpaper = kdesktopconf->readPathEntry("Wallpaper", "NoWallpaper");
 	deskbgimage = kdesktopconf->readPathEntry("Wallpaper", DEFAULT_WALLPAPER);
 	// Wallpaper-User-Defaults (END)
diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h
index 63889a67c..0601a6736 100644
--- a/kpersonalizer/keyecandypage.h
+++ b/kpersonalizer/keyecandypage.h
@@ -29,7 +29,7 @@ class KSysInfo;
   */
 
 class KEyeCandyPage : public KEyeCandyPageDlg {
-	Q_OBJECT
+	TQ_OBJECT
 public: 
 	KEyeCandyPage(TQWidget *parent=0, const char *name=0);
 	~KEyeCandyPage();
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/kospage.h b/kpersonalizer/kospage.h
index 2797f4572..8d3d35142 100644
--- a/kpersonalizer/kospage.h
+++ b/kpersonalizer/kospage.h
@@ -26,7 +26,7 @@
   */
 
 class KOSPage : public KOSPageDlg  {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KOSPage(TQWidget *parent=0, const char *name=0);
 	~KOSPage();
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..cef8619ea 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -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/kpersonalizer.h b/kpersonalizer/kpersonalizer.h
index 78ff71ee4..76faaae0f 100644
--- a/kpersonalizer/kpersonalizer.h
+++ b/kpersonalizer/kpersonalizer.h
@@ -37,7 +37,7 @@ class KRefinePage;
 
 /** KPersonalizer is the base class of the project */
 class KPersonalizer : public KWizard {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/** construtor */
 	KPersonalizer(TQWidget* parent=0, const char *name=0);
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/krefinepage.h b/kpersonalizer/krefinepage.h
index 4065b5a28..e0442f88b 100644
--- a/kpersonalizer/krefinepage.h
+++ b/kpersonalizer/krefinepage.h
@@ -25,7 +25,7 @@
   */
 
 class KRefinePage : public KRefinePageDlg  {
-   Q_OBJECT
+   TQ_OBJECT
 public: 
 	KRefinePage(TQWidget *parent=0, const char *name=0);
 	~KRefinePage();
diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp
index 20a089b8f..551dad3f8 100644
--- a/kpersonalizer/ksysinfo.cpp
+++ b/kpersonalizer/ksysinfo.cpp
@@ -235,8 +235,36 @@ TQFont KSysInfo::getFixedWidthFont(){
 ///////////////////
 
 ///////////////////
-//#elif defined(__svr4__) && defined(sun)
+#elif defined(Q_OS_SOLARIS)
 ///////////////////
+#include <kstat.h>
+
+	void KSysInfo::initHWInfo() {
+		kstat_ctl_t	*kctl;
+		kstat_t		*ksp;
+		kstat_named_t	*kdata;
+
+		m_cpu_speed = 0;
+		/* cpu_info:0:cpu_info0:current_clock_Hz */
+
+		kctl = kstat_open();
+		if (kctl == NULL)
+			return;
+		if (kstat_chain_update(kctl) != 0)
+			goto out;
+		ksp = kstat_lookup(kctl, "cpu_info", 0, "cpu_info0");
+		if (ksp == NULL)
+			goto out;
+		if (kstat_read(kctl, ksp, NULL) == -1 )
+			goto out;
+
+		kdata = (kstat_named_t *)kstat_data_lookup(ksp,
+			"clock_Hz");
+		if (kdata != NULL)
+			m_cpu_speed = kdata->value.ui64;
+		out:
+		kstat_close(kctl);
+	}
 
 ///////////////////
 //#elif __svr4__
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 66388024f..b4c626221 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -41,14 +41,14 @@ void StylePreview::init()
 {
     // Ensure that the user can't toy with the child widgets.
     // Method borrowed from Qt's qtconfig.
-    TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
+    TQObjectList* l = queryList("TQWidget");
     TQObjectListIt it(*l);
     TQObject* obj;
     while ((obj = it.current()) != 0)
     {
         ++it;
         obj->installEventFilter(this);
-        ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
+        ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus);
     }
     delete l;
 }
@@ -73,5 +73,3 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
     }
     return FALSE;
 }
-
-// vim: set noet ts=4:
diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp
index 5c85f402c..2fd4a8419 100644
--- a/kpersonalizer/tdestylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -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.
diff --git a/kpersonalizer/tdestylepage.h b/kpersonalizer/tdestylepage.h
index 30b907094..af529d8f8 100644
--- a/kpersonalizer/tdestylepage.h
+++ b/kpersonalizer/tdestylepage.h
@@ -27,7 +27,7 @@
 class TQListViewItem;
 
 class TDEStylePage : public TDEStylePageDlg  {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDEStylePage(TQWidget *parent=0, const char *name=0);
diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp
index 9d1ef9e32..71c6588d9 100644
--- a/krootbacking/krootbacking.cpp
+++ b/krootbacking/krootbacking.cpp
@@ -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(kapp, 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,7 +193,7 @@ 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();
     if (!client->isAttached())
@@ -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 731e64362..a430d3c45 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;
@@ -42,7 +42,7 @@ class KRootBackingData;
  */
 class KRootBacking: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -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..f29666d02 100644
--- a/krootbacking/main.cpp
+++ b/krootbacking/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 
 	TQObject* mainWin = new KRootBacking();
 	TQTimer *timer = new TQTimer( mainWin );
-        TQObject::connect( timer, SIGNAL(timeout()), mainWin, SLOT(start()) );
+        TQObject::connect( timer, TQ_SIGNAL(timeout()), mainWin, TQ_SLOT(start()) );
         timer->start( 100, TRUE ); // 100ms single shot timer
 
 	app.exec();
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index 8578b01c1..aa6681f28 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -25,13 +25,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdmlib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${DBUS_TQT_INCLUDE_DIRS}
-  ${HAL_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
@@ -50,5 +47,5 @@ tde_add_tdeinit_executable( ksmserver AUTOMOC
     main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
     legacy.cpp startup.cpp shutdown.cpp client.cpp
     KSMServerInterface.skel server.skel timed.ui
-  LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
+  LINK dmctl-static tdeui-shared tdersync-shared ${TDEHW_LIBRARIES}
 )
diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am
index 8f1a236e4..2c2fa237d 100644
--- a/ksmserver/Makefile.am
+++ b/ksmserver/Makefile.am
@@ -17,7 +17,7 @@
 
 SUBDIRS = .
 
-INCLUDES= -I$(top_srcdir)/tdmlib $(all_includes) $(HAL_INCS) $(DBUS_INCS)
+INCLUDES= -I$(top_srcdir)/tdmlib $(all_includes)
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
@@ -31,7 +31,7 @@ ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \
 	KSMServerInterface.skel server.skel timed.ui
 
 ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
-ksmserver_la_LIBADD = ../tdmlib/libdmctl.la $(LIB_TDEUI) $(HAL_LIBS) $(DBUS_LIBS)
+ksmserver_la_LIBADD = ../tdmlib/libdmctl.la $(LIB_TDEUI)
 
 picsdir = $(kde_datadir)/ksmserver/pics
 pics_DATA = shutdownkonq.png
@@ -44,7 +44,7 @@ updatedir = $(kde_datadir)/tdeconf_update
 EXTRA_PROGRAMS = testsh
 testsh_SOURCES = test.cpp timed.ui
 testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS)
+testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
diff --git a/ksmserver/global.h b/ksmserver/global.h
index b76a8b363..326587ac6 100644
--- a/ksmserver/global.h
+++ b/ksmserver/global.h
@@ -10,8 +10,4 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #define KSMVendorString "KDE"
 #define KSMReleaseString "1.0"
 
-#ifdef USE_QT4
-#define NO_QT3_DBUS_SUPPORT
-#endif
-
 #endif
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index 80f4e0984..1fbba6c3b 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -151,7 +151,7 @@ void KSMServer::performLegacySessionSave()
             ev.xclient.message_type = wm_protocols;
             ev.xclient.format = 32;
             ev.xclient.data.l[0] = wm_save_yourself;
-            ev.xclient.data.l[1] = GET_QT_X_TIME();
+            ev.xclient.data.l[1] = get_tqt_x_time();
             XSelectInput(newdisplay, w, PropertyChangeMask|StructureNotifyMask);
             XSendEvent(newdisplay, w, False, 0, &ev);
         }
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 505865c54..be5ed0bcc 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -599,13 +599,13 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag
     clientInteracting = 0;
     xonCommand = config->readEntry( "xonCommand", "xon" );
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
     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,11 @@ 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( kapp, TQ_SIGNAL( shutDown() ), this, TQ_SLOT( cleanUp() ) );
 }
 
 KSMServer::~KSMServer()
@@ -723,7 +723,7 @@ void KSMServer::cleanUp()
         DM().shutdown( shutdownType, shutdownMode, bootOption );
     }
     else {
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
         TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
         if (rootDevice) {
             if (shutdownType == TDEApplication::ShutdownTypeHalt) {
@@ -742,7 +742,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;
 }
 
diff --git a/ksmserver/server.h b/ksmserver/server.h
index 7273f057e..fdf08cded 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -21,7 +21,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <tqtimer.h>
 #include <dcopobject.h>
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #endif
 
@@ -49,7 +49,7 @@ typedef TQMap<WId,SMData> WindowMap;
 
 class KSMServer : public TQObject, public KSMServerInterface
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 k_dcop:
     void notifySlot(TQString,TQString,TQString,TQString,TQString,int,int,int,int);
@@ -253,7 +253,7 @@ private:
 
     WindowMap legacyWindows;
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
     TDEHardwareDevices* hwDevices;
 #endif
     int initialClientCount;
diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp
index 8b14ceaf1..f62894d72 100644
--- a/ksmserver/shutdown.cpp
+++ b/ksmserver/shutdown.cpp
@@ -152,7 +152,7 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, bool &mayrb,
             mayrb = true;
         }
         else {
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
             TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
             if (rootDevice) {
                 if (rootDevice->canPowerOff()) {
@@ -241,7 +241,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm,
 			// 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 __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 		TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
 		if (rootDevice) {
 			switch (selection) {
@@ -272,8 +272,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 +289,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( Qt::black );
+            kapp->desktop()->setBackgroundColor( TQt::black );
         }
         state = Shutdown;
         wmPhase1WaitingCount = 0;
@@ -764,8 +764,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()) {
@@ -963,7 +963,7 @@ void KSMServer::killWM()
     }
     if( iswm ) {
         completeKillingWM();
-        TQTimer::singleShot( 5000, this, TQT_SLOT( timeoutWMQuit() ) );
+        TQTimer::singleShot( 5000, this, TQ_SLOT( timeoutWMQuit() ) );
     }
     else {
         killingCompleted();
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index dc1d4dfcb..64bf4a407 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -6,6 +6,10 @@ Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "shutdowndlg.h"
 
 #include <tqapplication.h>
@@ -33,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #endif
 #include <kdebug.h>
@@ -101,7 +105,7 @@ 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
@@ -239,7 +243,7 @@ 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
@@ -366,7 +370,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 				bitBlt( this, 0, start_y1, &img );
 			}
 
-			TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) );
+			TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) );
 		}
 	}
 	else {
@@ -482,7 +486,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() ) {
@@ -507,13 +511,13 @@ void KSMShutdownFeedback::slotPaintEffect()
 				KPixmap pixmap;
 				pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, m_currentY, width(), 10 ));
 				TQImage image = pixmap.convertToImage();
-				KImageEffect::blend( Qt::black, image, 0.4 );
+				KImageEffect::blend( TQt::black, image, 0.4 );
 				KImageEffect::toGray( image, true );
 				pixmap.convertFromImage( image );
 				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() ) );
 			}
 		}
 	}
@@ -525,7 +529,7 @@ void KSMShutdownFeedback::slotPaintEffect()
 KSMShutdownIPFeedback * KSMShutdownIPFeedback::s_pSelf = 0L;
 
 KSMShutdownIPFeedback::KSMShutdownIPFeedback()
-: TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_paintedFromSharedRootPixmap(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+: TQWidget( 0L, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_paintedFromSharedRootPixmap(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
 
 {
 	setShown(false);
@@ -535,7 +539,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
@@ -567,13 +571,13 @@ 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();
 	if (!client->isAttached()) {
@@ -628,7 +632,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 			m_sharedRootPixmap->start();
 		}
 
-		TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) );
+		TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
 		mPixmapTimeout++;
 		return;
 	}
@@ -643,13 +647,13 @@ void KSMShutdownIPFeedback::slotPaintEffect()
 	}
 	if ((pm.isNull()) || (pm.width() != kapp->desktop()->width()) || (pm.height() != kapp->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.fill(Qt::black);
+			pm.fill(TQt::black);
 			m_paintedFromSharedRootPixmap = false;
 		}
 	}
@@ -753,7 +757,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 	{
 		// first line of buttons
 		hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() );
-		hbuttonbox->setAlignment( Qt::AlignHCenter );
+		hbuttonbox->setAlignment( TQt::AlignHCenter );
 		// End session
 		FlatButton* btnLogout = new FlatButton( frame );
 		btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false );
@@ -762,7 +766,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
 	{
@@ -772,7 +776,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		hbox->addWidget( lfrm, AlignCenter );
 
 		buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() );
-		buttonlay->setAlignment( Qt::AlignHCenter );
+		buttonlay->setAlignment( TQt::AlignHCenter );
 
 		TQLabel* icon = new TQLabel( lfrm );
 		if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doNotUseKonqyPicture", false)) {
@@ -790,13 +794,9 @@ 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()));
 	}
 
-#ifdef COMPILE_HALBACKEND
-	m_halCtx = NULL;
-#endif
-
 	if ((maysd) || (mayrb)) {
 
 		// respect lock on resume & disable suspend/hibernate settings
@@ -811,70 +811,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		bool canHibernate = false;
 		bool canHybridSuspend = false;
 
-#if defined(COMPILE_HALBACKEND)
-		// Query HAL for suspend/resume support
-		m_halCtx = libhal_ctx_new();
-
-		DBusError error;
-		dbus_error_init(&error);
-		m_dbusConn = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
-		if (!m_dbusConn)
-		{
-			dbus_error_free(&error);
-			libhal_ctx_free(m_halCtx);
-			m_halCtx = NULL;
-		}
-		else
-		{
-			dbus_bus_register(m_dbusConn, &error);
-			if (dbus_error_is_set(&error))
-			{
-				dbus_error_free(&error);
-				libhal_ctx_free(m_halCtx);
-				m_dbusConn = NULL;
-				m_halCtx = NULL;
-			}
-			else
-			{
-				libhal_ctx_set_dbus_connection(m_halCtx, m_dbusConn);
-				if (!libhal_ctx_init(m_halCtx, &error))
-				{
-					if (dbus_error_is_set(&error))
-						dbus_error_free(&error);
-					libhal_ctx_free(m_halCtx);
-					m_dbusConn = NULL;
-					m_halCtx = NULL;
-				}
-			}
-		}
-
-		if (m_halCtx)
-		{
-			if (libhal_device_get_property_bool(m_halCtx,
-												"/org/freedesktop/Hal/devices/computer",
-												"power_management.can_suspend",
-												NULL))
-			{
-				canSuspend = true;
-			}
-
-			if (libhal_device_get_property_bool(m_halCtx,
-												"/org/freedesktop/Hal/devices/computer",
-												"power_management.can_hibernate",
-												NULL))
-			{
-				canHibernate = true;
-			}
-		
-			if (libhal_device_get_property_bool(m_halCtx,
-												"/org/freedesktop/Hal/devices/computer",
-												"power_management.can_suspend_hybrid",
-												NULL))
-			{
-				canHybridSuspend = true;
-			}
-		}
-#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
+#if defined(WITH_TDEHWLIB)
 		TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
 		if (rootDevice) {
 			canFreeze = rootDevice->canFreeze();
@@ -888,7 +825,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			canHibernate = false;
 			canHybridSuspend = false;
 		}
-#endif // COMPILE_HALBACKEND
+#endif
 
 		if(doUbuntuLogout) {
       // Ubuntu style logout window
@@ -904,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)
@@ -920,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)
@@ -935,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)
@@ -953,7 +890,7 @@ 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)
@@ -961,7 +898,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 
 			// bottom buttons
 			TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
-			hbuttonbox2->setAlignment( Qt::AlignHCenter );
+			hbuttonbox2->setAlignment( TQt::AlignHCenter );
 
 			if (mayrb) {
 				// Reboot
@@ -972,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();
 				}
@@ -999,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]
 			}
@@ -1013,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();
 				}
@@ -1021,12 +958,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 
 			// cancel buttonbox
 			TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
-			hbuttonbox3->setAlignment( Qt::AlignRight );
+			hbuttonbox3->setAlignment( TQt::AlignRight );
 
 			// 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
@@ -1038,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();
 				}
@@ -1051,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();
 				}
@@ -1077,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)) );
 				}
 			}
 
@@ -1089,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)
@@ -1101,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)
@@ -1112,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)
@@ -1126,7 +1063,7 @@ 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 );
@@ -1137,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 {
@@ -1146,13 +1083,13 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 		{
 			// cancel buttonbox
 			TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
-			hbuttonbox3->setAlignment( Qt::AlignRight );
+			hbuttonbox3->setAlignment( TQt::AlignRight );
 
 			// 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
 		{
@@ -1163,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()));
 		}
 	}
 }
@@ -1171,15 +1108,6 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 
 KSMShutdownDlg::~KSMShutdownDlg()
 {
-#ifdef COMPILE_HALBACKEND
-	if (m_halCtx)
-	{
-		DBusError error;
-		dbus_error_init(&error);
-		libhal_ctx_shutdown(m_halCtx, &error);
-		libhal_ctx_free(m_halCtx);
-	}
-#endif
 }
 
 
@@ -1216,46 +1144,13 @@ void KSMShutdownDlg::slotHalt()
 
 void KSMShutdownDlg::slotSuspend()
 {
-#ifndef COMPILE_HALBACKEND
 	*m_selection = SuspendType::Suspend;
-#else
-	if (m_dbusConn)
-	{
-		DBusMessage *msg = dbus_message_new_method_call(
-							  "org.freedesktop.Hal",
-							  "/org/freedesktop/Hal/devices/computer",
-							  "org.freedesktop.Hal.Device.SystemPowerManagement",
-							  "Suspend");
-
-		int wakeup=0;
-		dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID);
-
-		dbus_connection_send(m_dbusConn, msg, NULL);
-
-		dbus_message_unref(msg);
-	}
-#endif
 	reject(); // continue on resume
 }
 
 void KSMShutdownDlg::slotHibernate()
 {
-#ifndef COMPILE_HALBACKEND
 	*m_selection = SuspendType::Hibernate;
-#else
-	if (m_dbusConn)
-	{
-		DBusMessage *msg = dbus_message_new_method_call(
-							  "org.freedesktop.Hal",
-							  "/org/freedesktop/Hal/devices/computer",
-							  "org.freedesktop.Hal.Device.SystemPowerManagement",
-							  "Hibernate");
-
-		dbus_connection_send(m_dbusConn, msg, NULL);
-
-		dbus_message_unref(msg);
-	}
-#endif
 	reject(); // continue on resume
 }
 
@@ -1267,22 +1162,7 @@ void KSMShutdownDlg::slotFreeze()
 
 void KSMShutdownDlg::slotHybridSuspend()
 {
-#ifndef COMPILE_HALBACKEND
 	*m_selection = SuspendType::HybridSuspend;
-#else
-	if (m_dbusConn)
-	{
-		DBusMessage *msg = dbus_message_new_method_call(
-							  "org.freedesktop.Hal",
-							  "/org/freedesktop/Hal/devices/computer",
-							  "org.freedesktop.Hal.Device.SystemPowerManagement",
-							  "SuspendHybrid");
-
-		dbus_connection_send(m_dbusConn, msg, NULL);
-
-		dbus_message_unref(msg);
-	}
-#endif
 	reject(); // continue on resume
 }
 
@@ -1366,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();
@@ -1384,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)
@@ -1449,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);
 }
 
@@ -1556,7 +1436,7 @@ void FlatButton::init()
 	setUsesBigPixmap(true);
 	setAutoRaise(true);
 	setTextPosition( TQToolButton::Under );
-	setFocusPolicy(TQ_StrongFocus);
+	setFocusPolicy(TQWidget::StrongFocus);
  }
 
 
diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index 25ee60f77..7539fd75b 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -34,16 +34,6 @@ class TDEAction;
 
 #include <config.h>
 
-#ifdef COMPILE_HALBACKEND
-	#ifndef NO_QT3_DBUS_SUPPORT
-	/* We acknowledge the the dbus API is unstable */
-	#define DBUS_API_SUBJECT_TO_CHANGE
-	#include <dbus/connection.h>
-	#endif // NO_QT3_DBUS_SUPPORT
-
-	#include <hal/libhal.h>
-#endif // COMPILE_HALBACKEND
-
 namespace SuspendType {
 enum SuspendType {
 	NotSpecified = 0,
@@ -58,7 +48,7 @@ enum SuspendType {
 // The (singleton) widget that makes/fades the desktop gray.
 class KSMShutdownFeedback : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static void start() { s_pSelf = new KSMShutdownFeedback(); }
@@ -92,7 +82,7 @@ private:
 // The (singleton) widget that shows either pretty pictures or a black screen during logout
 class KSMShutdownIPFeedback : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static void start() { s_pSelf = new KSMShutdownIPFeedback(); }
@@ -135,7 +125,7 @@ private:
 // The confirmation dialog
 class KSMShutdownDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static bool confirmShutdown( bool maysd, bool mayrb, TDEApplication::ShutdownType& sdtype, TQString& bopt, int* selection=0 );
@@ -159,10 +149,6 @@ private:
 	TQString m_bootOption;
 	TQPopupMenu *targets;
 	TQStringList rebootOptions;
-#ifdef COMPILE_HALBACKEND
-	LibHalContext* m_halCtx;
-	DBusConnection *m_dbusConn;
-#endif
 	bool m_lockOnResume;
 	int* m_selection;
 };
@@ -170,7 +156,7 @@ private:
 // The shutdown-in-progress dialog
 class KSMShutdownIPDlg : public KSMModalDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static TQWidget* showShutdownIP();
@@ -196,7 +182,7 @@ private:
 
 class KSMDelayedPushButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -215,7 +201,7 @@ private:
 
 class KSMPushButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -235,7 +221,7 @@ private:
 
 class FlatButton : public TQToolButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
 
@@ -264,7 +250,7 @@ class TQLabel;
 
 class  KSMDelayedMessageBox : public TimedLogoutDlg
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype, const TQString &bootOption, int confirmDelay );
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index fb9e696ec..f3b0012ab 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -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" );
 }
 
@@ -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());
diff --git a/ksmserver/startupdlg.h b/ksmserver/startupdlg.h
index a18a121d6..bc9327a09 100644
--- a/ksmserver/startupdlg.h
+++ b/ksmserver/startupdlg.h
@@ -34,7 +34,7 @@ class TDEAction;
 // The startup-in-progress dialog
 class KSMStartupIPDlg : public KSMModalDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	static TQWidget* showStartupIP();
diff --git a/ksplashml/CMakeL10n.txt b/ksplashml/CMakeL10n.txt
index 98d1940a8..2e1ad51f1 100644
--- a/ksplashml/CMakeL10n.txt
+++ b/ksplashml/CMakeL10n.txt
@@ -12,3 +12,17 @@ tde_l10n_create_template(
     SOURCES *.desktop
     DESTINATION "${CMAKE_SOURCE_DIR}/translations"
 )
+
+file(
+  GLOB_RECURSE _themes
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/*Theme.rc
+)
+list( SORT _themes )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/ksplash-themes/"
+    SOURCES_DESKTOP ${_themes}
+    KEYWORDS Message1 Message2 Message3 Message4 Message5 Message6 Message7 Message8
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 7ee681907..c790000b0 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -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)
@@ -56,7 +56,7 @@ void ThemeListBox::dropEvent(TQDropEvent* event)
 
 void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p)
 {
-   if ((button & Qt::LeftButton) == 0) return;
+   if ((button & TQt::LeftButton) == 0) return;
    mOldPos = p;
    mDragFile = TQString::null;
    int cur = index(item);
@@ -66,7 +66,7 @@ void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const
 
 void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
 {
-   if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
+   if (((e->state() & TQt::LeftButton) != 0) && !mDragFile.isEmpty())
    {
       int delay = TDEGlobalSettings::dndEventDelay();
       TQPoint newPos = e->globalPos();
@@ -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 );
@@ -123,7 +123,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
   mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
   mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
   mPreview->setMinimumSize(TQSize(320,240));
-  mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+  mPreview->setAlignment(TQt::AlignHCenter|TQt::AlignVCenter);
   rightbox->addWidget(mPreview);
   rightbox->setStretchFactor( mPreview, 3 );
 
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h
index 7a46e368b..5ede31d1f 100644
--- a/ksplashml/kcmksplash/installer.h
+++ b/ksplashml/kcmksplash/installer.h
@@ -24,7 +24,7 @@ class ThemeListBox;
 
 class SplashInstaller : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   SplashInstaller(TQWidget *parent=0, const char *aName=0, bool aInit=FALSE);
   ~SplashInstaller();
@@ -62,7 +62,7 @@ private:
 
 class ThemeListBox: public TDEListBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeListBox(TQWidget *parent);
   TQMap<TQString, TQString> text2path;
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index f0b5d1f52..4a2f9cf5c 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -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/themes/CMakeL10n.txt b/ksplashml/pics/themes/CMakeL10n.txt
deleted file mode 100644
index be21a4224..000000000
--- a/ksplashml/pics/themes/CMakeL10n.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-##### create translation templates ##############
-
-file(
-  GLOB_RECURSE _themes
-  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/*Theme.rc
-)
-list( SORT _themes )
-
-tde_l10n_create_template(
-    CATALOG "desktop_files/ksplash-themes/"
-    SOURCES_DESKTOP ${_themes}
-    KEYWORDS Message1 Message2 Message3 Message4 Message5 Message6 Message7 Message8
-    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
-)
diff --git a/ksplashml/pics/themes/default/Theme.rc b/ksplashml/pics/themes/default/Theme.rc
index b218149ec..223565cae 100644
--- a/ksplashml/pics/themes/default/Theme.rc
+++ b/ksplashml/pics/themes/default/Theme.rc
@@ -2,7 +2,7 @@
 # Refresh KSplash/ML Theme
 #
 
-[KSplash Theme: Refresh]
+[KSplash Theme: Default]
 Name = Refresh TDE Splash Theme
 Description = Load Refresh TDE KSplash theme.
 Version = 1.0
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 0e1242120..1c311ed8b 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -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();
 
@@ -120,19 +120,19 @@ void ThemeDefault::_initUi()
   if (mActivePixmap->isNull())
   {
     mActivePixmap->resize(200,100);
-    mActivePixmap->fill(Qt::blue);
+    mActivePixmap->fill(TQt::blue);
   }
   if (mInactivePixmap->isNull())
   {
     mInactivePixmap->resize(200,100);
-    mInactivePixmap->fill(Qt::black);
+    mInactivePixmap->fill(TQt::black);
   }
 
   TQPixmap tlimage( _findPicture(TQString("splash_top.png")) );
   if (tlimage.isNull())
   {
     tlimage.resize(200,100);
-    tlimage.fill(Qt::blue);
+    tlimage.fill(TQt::blue);
   }
   TQLabel *top_label = new TQLabel( vbox );
   top_label->setPixmap( tlimage );
@@ -147,7 +147,7 @@ void ThemeDefault::_initUi()
   if (blimage.isNull())
   {
     blimage.resize(200,100);
-    blimage.fill(Qt::black);
+    blimage.fill(TQt::black);
   }
   TQLabel *bottom_label = new TQLabel( vbox );
   bottom_label->setPaletteBackgroundPixmap( blimage );
@@ -212,7 +212,7 @@ void ThemeDefault::_readSettings()
   cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
 
   mIconsFlashing = cfg->readBoolEntry( "Icons Flashing", true );
-  TQColor df(Qt::white);
+  TQColor df(TQt::white);
   mLabelForeground = cfg->readColorEntry( "Label Foreground", &df );
   TQValueList<int> io_list=cfg->readIntListEntry("Icon Offsets");
   if (io_list.size() == MAX_ICONS)
diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h
index 1f56d05b0..0e99d69f7 100644
--- a/ksplashml/themeengine/default/themelegacy.h
+++ b/ksplashml/themeengine/default/themelegacy.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 
 class DefaultConfig: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   DefaultConfig( TQWidget *, TDEConfig * );
   void save();
@@ -43,7 +43,7 @@ protected:
 class ObjKsTheme;
 class KDE_EXPORT ThemeDefault : public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeDefault( TQWidget *, const char *, const TQStringList& );
    virtual ~ThemeDefault();
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index 9de990099..609956592 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -118,7 +118,7 @@ bool ObjKsTheme::loadTDEConfig( TDEConfig *cfg, const TQString& activeTheme, boo
   m_icons.append( cfg->readEntry( "Icon1", "filetypes" ) );
   m_icons.append( cfg->readEntry( "Icon2", "application-x-executable" ) );
   m_icons.append( cfg->readEntry( "Icon3", "key_bindings" ) );
-  m_icons.append( cfg->readEntry( "Icon4", "window_list" ) );
+  m_icons.append( cfg->readEntry( "Icon4", "window_duplicate" ) );
   m_icons.append( cfg->readEntry( "Icon5", "desktop" ) );
   m_icons.append( cfg->readEntry( "Icon6", "style" ) );
   m_icons.append( cfg->readEntry( "Icon7", "preferences-system" ) );
diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h
index 8959c5537..f6884b46f 100644
--- a/ksplashml/themeengine/objkstheme.h
+++ b/ksplashml/themeengine/objkstheme.h
@@ -26,9 +26,9 @@ class TDEConfig;
  * of KSplash completely, and offers a friendlier way
  * of installing custom splash screens.
  */
-class KDE_EXPORT ObjKsTheme : public QObject
+class KDE_EXPORT ObjKsTheme : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   explicit ObjKsTheme( const TQString& );
   virtual ~ObjKsTheme();
diff --git a/ksplashml/themeengine/redmond/CMakeLists.txt b/ksplashml/themeengine/redmond/CMakeLists.txt
index 52bc35732..7284c40be 100644
--- a/ksplashml/themeengine/redmond/CMakeLists.txt
+++ b/ksplashml/themeengine/redmond/CMakeLists.txt
@@ -25,7 +25,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES Theme.rc DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Redmond )
+tde_create_translated_desktop(
+  SOURCE Theme.rc
+  DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Redmond
+  PO_DIR ksplash-themes
+)
+
 tde_create_translated_desktop(
   SOURCE ksplashredmond.desktop
   DESTINATION ${SERVICES_INSTALL_DIR}
diff --git a/ksplashml/themeengine/redmond/Theme.rc b/ksplashml/themeengine/redmond/Theme.rc
index 3c5b0687e..a87deedc5 100644
--- a/ksplashml/themeengine/redmond/Theme.rc
+++ b/ksplashml/themeengine/redmond/Theme.rc
@@ -1,2 +1,5 @@
 [KSplash Theme: Redmond]
+Name = Redmond Splash Screen
+Description = KSplash theme inspired by the Microsoft Windows startup screen.
+
 Engine=Redmond
diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp
index 29bfa4b66..5f759686c 100644
--- a/ksplashml/themeengine/redmond/previewredmond.cpp
+++ b/ksplashml/themeengine/redmond/previewredmond.cpp
@@ -33,10 +33,10 @@ PreviewRedmond::PreviewRedmond( TQWidget* parent )
     m_userFont (TQFont( "Arial", 16 )),
     m_statusFont (TQFont( "Arial", 12, TQFont::Bold )),
 
-    m_welcomeColor (Qt::white),
-    m_welcomeShadowColor (Qt::darkGray),
-    m_userColor (Qt::darkGray),
-    m_statusColor (Qt::white),
+    m_welcomeColor (TQt::white),
+    m_welcomeShadowColor (TQt::darkGray),
+    m_userColor (TQt::darkGray),
+    m_statusColor (TQt::white),
 
     m_icon (DesktopIcon("kmenu")),
 
@@ -71,7 +71,7 @@ void PreviewRedmond::_updateCache()
   TQPainter p;
   p.begin( &m_cache );
 
-  p.fillRect( rect(), Qt::gray );
+  p.fillRect( rect(), TQt::gray );
 
   m_welcomeFont.setItalic( true );
   p.setFont( m_welcomeFont );
diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h
index 5fc5558c2..fdaf6418e 100644
--- a/ksplashml/themeengine/redmond/previewredmond.h
+++ b/ksplashml/themeengine/redmond/previewredmond.h
@@ -27,7 +27,7 @@
  */
 class PreviewRedmond: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   PreviewRedmond( TQWidget* );
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index b0e81ba72..3792d6057 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -52,7 +52,7 @@ CfgRedmond::CfgRedmond( TQWidget *p, TDEConfig *c )
   TQFont defaultUsernameFont( "Arial", 16, TQFont::Bold );
   TQFont defaultActionFont( "Arial", 12, TQFont::Bold );
   TQColor defaultDarkColor( 3, 47, 156 );
-  TQColor defaultWhiteColor( Qt::white );
+  TQColor defaultWhiteColor( TQt::white );
 
   TQHBox *hbox = new TQHBox( vbox );
   hbox->setFrameStyle( TQFrame::WinPanel );
@@ -356,7 +356,7 @@ void ThemeRedmond::_readSettings()
   mActionFont        = cfg->readFontEntry( "Action Font", &defaultActionFont );
 
   TQColor defaultDarkColor( 3, 47, 156 );
-  TQColor defaultWhiteColor( Qt::white );
+  TQColor defaultWhiteColor( TQt::white );
 
   mWelcomeTextColor       = cfg->readColorEntry( "Welcome Text Color", &defaultWhiteColor );
   mWelcomeTextShadowColor = cfg->readColorEntry( "Welcome Shadow Color", &defaultDarkColor );
diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h
index d68e004da..1fbb7c57a 100644
--- a/ksplashml/themeengine/redmond/themeredmond.h
+++ b/ksplashml/themeengine/redmond/themeredmond.h
@@ -23,7 +23,7 @@ class TQCheckBox;
 
 class CfgRedmond: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   CfgRedmond( TQWidget *, TDEConfig * );
 
@@ -39,7 +39,7 @@ protected:
 class ObjKsTheme;
 class ThemeRedmond: public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeRedmond( TQWidget *, const char *, const TQStringList& );
 
diff --git a/ksplashml/themeengine/standard/CMakeLists.txt b/ksplashml/themeengine/standard/CMakeLists.txt
index 8aca3a57e..a2119c5e3 100644
--- a/ksplashml/themeengine/standard/CMakeLists.txt
+++ b/ksplashml/themeengine/standard/CMakeLists.txt
@@ -26,7 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES Theme.rc DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Standard )
+tde_create_translated_desktop(
+  SOURCE Theme.rc
+  DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Standard
+  PO_DIR ksplash-themes
+)
+
 tde_create_translated_desktop(
   SOURCE ksplashstandard.desktop
   DESTINATION ${SERVICES_INSTALL_DIR}
diff --git a/ksplashml/themeengine/standard/Theme.rc b/ksplashml/themeengine/standard/Theme.rc
index 2ae13af53..d4e4e5bd7 100644
--- a/ksplashml/themeengine/standard/Theme.rc
+++ b/ksplashml/themeengine/standard/Theme.rc
@@ -1,2 +1,5 @@
 [KSplash Theme: Standard]
+Name = Standard Splash Screen
+Description = Standard TDE KSplash theme.
+
 Engine=Standard
diff --git a/ksplashml/themeengine/standard/themestandard.h b/ksplashml/themeengine/standard/themestandard.h
index a1fb61ccf..3e9aabc63 100644
--- a/ksplashml/themeengine/standard/themestandard.h
+++ b/ksplashml/themeengine/standard/themestandard.h
@@ -42,7 +42,7 @@
  */
 class ThemeStandard: public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeStandard( TQWidget *, const char*, const TQStringList& );
   //inline const ThemeEngineConfig *config( TQWidget *p, TDEConfig *kc ) { return 0L; }
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 856547895..c6c16170c 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -70,7 +70,7 @@ WndIcon::WndIcon(
   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 );
   }
 }
diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h
index 5338835a4..62f7d16ab 100644
--- a/ksplashml/themeengine/standard/wndicon.h
+++ b/ksplashml/themeengine/standard/wndicon.h
@@ -28,7 +28,7 @@
 class WndIcon:
       public TQHBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   enum Position
diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h
index bc908779d..795181a09 100644
--- a/ksplashml/themeengine/standard/wndstatus.h
+++ b/ksplashml/themeengine/standard/wndstatus.h
@@ -27,7 +27,7 @@ class KProgress;
 class WndStatus:
       public TQHBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   WndStatus( TQPalette,
              int, // Xinerama screen
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index 9a7d3aba5..7458abefd 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -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 fa2f15a65..27ae5ec11 100644
--- a/ksplashml/themeengine/themeengine.h
+++ b/ksplashml/themeengine/themeengine.h
@@ -27,7 +27,7 @@ class TQMouseEvent;
  */
 class KDE_EXPORT ThemeEngineConfig: public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   ThemeEngineConfig( TQWidget *p, TDEConfig *c )
@@ -50,7 +50,7 @@ protected:
  */
 class KDE_EXPORT ThemeEngine: public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeEngine( TQWidget *parent, const char *name, const TQStringList &args );
   virtual ~ThemeEngine() = 0;
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 0a2eb6343..e0ba8fb9e 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -97,7 +97,7 @@ void ThemeUnified::_readSettings()
 
   cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
 
-  TQColor df(Qt::white);
+  TQColor df(TQt::white);
   mLabelForeground = cfg->readColorEntry( "Label Foreground", &df );
 }
 
diff --git a/ksplashml/themeengine/unified/themeunified.h b/ksplashml/themeengine/unified/themeunified.h
index cd6a1d1ca..e2930943c 100644
--- a/ksplashml/themeengine/unified/themeunified.h
+++ b/ksplashml/themeengine/unified/themeunified.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 
 class UnifiedConfig: public ThemeEngineConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   UnifiedConfig( TQWidget *, TDEConfig * );
   void save();
@@ -42,7 +42,7 @@ protected:
 class ObjKsTheme;
 class KDE_EXPORT ThemeUnified : public ThemeEngine
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   ThemeUnified( TQWidget *, const char *, const TQStringList& );
    virtual ~ThemeUnified();
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index c37c6e214..3c07e5191 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -58,23 +58,23 @@ KSplash::KSplash(const char *name)
   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() ) );
+    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,12 +155,12 @@ 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( kapp->dcopClient(), TQ_SIGNAL( attachFailed(const TQString&) ), kapp, TQ_SLOT( dcopFailure(const TQString&) ) );
 
   if ( kapp->dcopClient()->isAttached() )
     return;
@@ -174,7 +174,7 @@ void KSplash::initDcop()
   }
   else
   {
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()) );
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()) );
   }
 }
 
@@ -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,15 +307,12 @@ 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()
 {
   TQWidget::close();
-#ifdef USE_QT4
-  exit(0);
-#endif // USE_QT4
 }
 
 void KSplash::hide()
@@ -386,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;
@@ -427,9 +424,9 @@ TQPtrList<Action> KSplash::actionList()
 
 bool KSplash::eventFilter( TQObject *o, TQEvent *e )
 {
-  if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mThemeEngine) ) )
+  if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
   {
-    TQTimer::singleShot( 0, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(close()));
     return TRUE;
   }
   else
diff --git a/ksplashml/wndmain.h b/ksplashml/wndmain.h
index 563598c64..a5ad616b2 100644
--- a/ksplashml/wndmain.h
+++ b/ksplashml/wndmain.h
@@ -38,7 +38,7 @@ class TDEConfig;
 
 class KSplash: public TQWidget, virtual public KSplashIface
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -56,17 +56,7 @@ public:
   ASYNC startupComplete();
   ASYNC show();
   ASYNC hide();
-
-  // [FIXME] How can I more easily let Qt know about these slots?  moc-tqt perhaps?
-  // More importantly, how was this code even running under Qt3?
-  // Was it somehow running the TQWidget::close() slot instead of the KSplash::close() non-slot method?
-  // Either way it looks like accidental/undefined behaviour to me...
-#ifndef Q_MOC_RUN
   ASYNC close();
-#else // Q_MOC_RUN
-public slots:
-  void close();
-#endif // Q_MOC_RUN
 
 signals:
   void stepsChanged(int);
diff --git a/kstart/Makefile.am b/kstart/Makefile.am
index c182fb28c..9e261bae9 100644
--- a/kstart/Makefile.am
+++ b/kstart/Makefile.am
@@ -1,6 +1,6 @@
 ####### Fiddle here
 
-AM_CPPFLAGS = -DTQT_NO_CAST_ASCII -DTQT_NO_COMPAT
+AM_CPPFLAGS = -DTQT_NO_CAST_ASCII
 
 INCLUDES = $(all_includes)
 
diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp
index bcbc6d846..bcf915b07 100644
--- a/kstart/kstart.cpp
+++ b/kstart/kstart.cpp
@@ -55,7 +55,7 @@ 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 );
     }
@@ -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, kapp, TQ_SLOT( quit()));
 }
 
 void KStart::sendRule() {
diff --git a/kstart/kstart.h b/kstart/kstart.h
index c35d460d3..adfaf53c6 100644
--- a/kstart/kstart.h
+++ b/kstart/kstart.h
@@ -16,7 +16,7 @@
 class KWinModule;
 
 class KStart: public TQObject {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KStart();
diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt
index 504fbeb5b..a21e21c0c 100644
--- a/ksysguard/gui/CMakeLists.txt
+++ b/ksysguard/gui/CMakeLists.txt
@@ -51,7 +51,7 @@ tde_create_translated_desktop(
 ##### sysguard_panelapplet (module) #############
 
 tde_add_kpart( sysguard_panelapplet AUTOMOC
-  SOURCES KSysGuardApplet.cc KSGAppletSettings.cc
+  SOURCES KSysGuardApplet.cpp KSGAppletSettings.cpp
   LINK sensordisplays-static ksgrd-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
@@ -61,8 +61,8 @@ tde_add_kpart( sysguard_panelapplet AUTOMOC
 
 tde_add_executable( ksysguard AUTOMOC
   SOURCES
-    SensorBrowser.cc WorkSheet.cc WorkSheetSettings.cc
-    Workspace.cc ksysguard.cc ksysguard.skel
+    SensorBrowser.cpp WorkSheet.cpp WorkSheetSettings.cpp
+    Workspace.cpp ksysguard.cpp ksysguard.skel
   LINK sensordisplays-static ksgrd-shared tdednssd-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cpp
index 01b2e0b1a..01b2e0b1a 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cpp
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cpp
index ae31d4a60..d5ae18b46 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cpp
@@ -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 ) );
@@ -142,7 +142,7 @@ void KSysGuardApplet::applySettings()
   resizeDocks( mSettingsDlg->numDisplay() );
 
   for ( uint i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ i ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ i ])->setUpdateInterval( updateInterval() );
 
   save();
@@ -156,7 +156,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified )
 
 void KSysGuardApplet::layout()
 {
-  if ( orientation() == Qt::Horizontal ) {
+  if ( orientation() == TQt::Horizontal ) {
     int h = height();
     int w = (int) ( h * mSizeRatio + 0.5 );
     for ( uint i = 0; i < mDockCount; ++i )
@@ -173,7 +173,7 @@ void KSysGuardApplet::layout()
 
 int KSysGuardApplet::findDock( const TQPoint& point )
 {
-  if ( orientation() == Qt::Horizontal )
+  if ( orientation() == TQt::Horizontal )
     return ( point.x() / (int) ( height() * mSizeRatio + 0.5 ) );
   else
     return ( point.y() / (int) ( width() * mSizeRatio + 0.5 ) );
@@ -201,7 +201,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
       return;
 
     int dock = findDock( e->pos() );
-    if ( mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
+    if ( mDockList[ dock ]->isA( "TQFrame" ) ) {
       if ( sensorType == "integer" || sensorType == "float" ) {
         TDEPopupMenu popup;
         TQWidget *wdg = 0;
@@ -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();
         }
@@ -246,7 +246,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
       }
     }
 
-    if ( !mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ dock ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ dock ])->
                   addSensor( hostName, sensorName, sensorType, sensorDescr );
   }
@@ -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;
@@ -429,7 +429,7 @@ bool KSysGuardApplet::save()
   TQStringList hosts;
   uint i;
   for ( i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( !mDockList[ i ]->isA( "TQFrame" ) )
       ((KSGRD::SensorDisplay*)mDockList[ i ])->hosts( hosts );
 
   // save host information (name, shell, etc.)
@@ -449,7 +449,7 @@ bool KSysGuardApplet::save()
   }
 
   for ( i = 0; i < mDockCount; ++i )
-    if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
+    if ( !mDockList[ i ]->isA( "TQFrame" ) ) {
       TQDomElement element = doc.createElement( "display" );
       ws.appendChild( element );
       element.setAttribute( "dock", i );
diff --git a/ksysguard/gui/KSysGuardApplet.h b/ksysguard/gui/KSysGuardApplet.h
index 43027b05c..06ab1d5ec 100644
--- a/ksysguard/gui/KSysGuardApplet.h
+++ b/ksysguard/gui/KSysGuardApplet.h
@@ -40,7 +40,7 @@ class KSGAppletSettings;
 
 class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard
 {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
     KSysGuardApplet( const TQString& configFile, Type type = Normal,
diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am
index 3259e44f4..0ebad4f77 100644
--- a/ksysguard/gui/Makefile.am
+++ b/ksysguard/gui/Makefile.am
@@ -22,11 +22,11 @@ bin_PROGRAMS = ksysguard kpm
 
 # Which sources should be compiled for ksysguard.
 ksysguard_SOURCES = \
-	SensorBrowser.cc \
-	WorkSheet.cc \
-	WorkSheetSettings.cc \
-	Workspace.cc \
-	ksysguard.cc ksysguard.skel
+	SensorBrowser.cpp \
+	WorkSheet.cpp \
+	WorkSheetSettings.cpp \
+	Workspace.cpp \
+	ksysguard.cpp ksysguard.skel
 
 ksysguard_LDADD = \
 	ksgrd/libksgrd.la \
@@ -43,8 +43,8 @@ appdata_DATA = ProcessTable.sgrd SystemLoad.sgrd KSysGuardApplet.xml
 kde_module_LTLIBRARIES = sysguard_panelapplet.la
 
 sysguard_panelapplet_la_SOURCES = \
-	KSysGuardApplet.cc \
-	KSGAppletSettings.cc
+	KSysGuardApplet.cpp \
+	KSGAppletSettings.cpp
 
 sysguard_panelapplet_la_LIBADD = \
 	ksgrd/libksgrd.la \
@@ -60,4 +60,4 @@ METASOURCES = AUTO
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name "*.ui"` >> rc.cpp
 	extractattr --attr=display,title SystemLoad.sgrd KSysGuardApplet.xml >> rc.cpp
-	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.cc"` -o $(podir)/ksysguard.pot
+	$(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/ksysguard.pot
diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cpp
index 801091d98..575389bac 100644
--- a/ksysguard/gui/SensorBrowser.cc
+++ 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" ) );
@@ -240,7 +240,7 @@ void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e )
    * mouse tracking cannot be turned off. So we have to check each event
    * whether the LMB is really pressed. */
 
-  if ( !( e->state() & Qt::LeftButton ) )
+  if ( !( e->state() & TQt::LeftButton ) )
     return;
 
   TQListViewItem* item = itemAt( e->pos() );
diff --git a/ksysguard/gui/SensorBrowser.h b/ksysguard/gui/SensorBrowser.h
index aec4f343d..f2aa98302 100644
--- a/ksysguard/gui/SensorBrowser.h
+++ b/ksysguard/gui/SensorBrowser.h
@@ -45,7 +45,7 @@ class HostInfo;
  */
 class SensorBrowser : public TDEListView, public KSGRD::SensorClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, const char* name = 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
index 8d2b5e302..1a1608b6c 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
@@ -161,10 +161,10 @@ void BarGraph::paintEvent( TQPaintEvent* )
 
       if ( showLabels ) {
         p.drawText( b * barWidth + 3, h - ( 2 * fm.lineSpacing() ) - 2,
-                    barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter,
+                    barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter,
                     footers[ b ] );
         p.drawText( b * barWidth + 3, h - fm.lineSpacing() - 2,
-                    barWidth - 2 * 3, fm.lineSpacing(), Qt::AlignCenter,
+                    barWidth - 2 * 3, fm.lineSpacing(), TQt::AlignCenter,
                     TQString( "%1" ).arg( samples[ b ] ) );
       }
     }
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.h b/ksysguard/gui/SensorDisplayLib/BarGraph.h
index 1a1262594..2c5e7ffad 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.h
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.h
@@ -30,7 +30,7 @@
 
 class BarGraph : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class DancingBars;
 
diff --git a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
index 0fe416a0b..6fe370076 100644
--- a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
+++ b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
@@ -28,12 +28,12 @@ link_directories(
 
 tde_add_library( sensordisplays STATIC_PIC AUTOMOC
   SOURCES
-    SensorDisplay.cc BarGraph.cc DancingBars.cc DancingBarsSettings.cc
-    DummyDisplay.cc FancyPlotter.cc FancyPlotterSettings.cc
-    ListView.cc LogFile.cc MultiMeter.cc MultiMeterSettings.cc
-    ProcessController.cc ProcessList.cc ReniceDlg.cc
-    SensorLogger.cc SensorLoggerDlg.cc SensorLoggerSettings.cc
-    ListViewSettings.cc SignalPlotter.cc ListViewSettingsWidget.ui
+    SensorDisplay.cpp BarGraph.cpp DancingBars.cpp DancingBarsSettings.cpp
+    DummyDisplay.cpp FancyPlotter.cpp FancyPlotterSettings.cpp
+    ListView.cpp LogFile.cpp MultiMeter.cpp MultiMeterSettings.cpp
+    ProcessController.cpp ProcessList.cpp ReniceDlg.cpp
+    SensorLogger.cpp SensorLoggerDlg.cpp SensorLoggerSettings.cpp
+    ListViewSettings.cpp SignalPlotter.cpp ListViewSettingsWidget.ui
     LogFileSettings.ui MultiMeterSettingsWidget.ui SensorLoggerDlgWidget.ui
     SensorLoggerSettingsWidget.ui
   LINK ksgrd-shared tdeio-shared
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
index 5b09addc0..43fbe549f 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc
+++ 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/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h
index 3ccc03f86..4e917dabf 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.h
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h
@@ -38,7 +38,7 @@ class DancingBarsSettings;
 
 class DancingBars : public KSGRD::SensorDisplay
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DancingBars( TQWidget *parent = 0, const char *name = 0,
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
index ee03f9e94..b754791f8 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
@@ -47,7 +47,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   TQFrame *page = addPage( i18n( "Range" ) );
   TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
 
-  TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
+  TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page );
   TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 );
 
   mTitle = new KLineEdit( groupBox );
@@ -56,7 +56,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
 
   pageLayout->addWidget( groupBox, 0, 0 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Display Range" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 );
   boxLayout->setColStretch( 2, 1 );
 
@@ -84,7 +84,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   page = addPage( i18n( "Alarms" ) );
   pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Minimum Value" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
   boxLayout->setColStretch( 1, 1 );
 
@@ -102,7 +102,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
 
   pageLayout->addWidget( groupBox, 0, 0 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Alarm for Maximum Value" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
   boxLayout->setColStretch( 1, 1 );
 
@@ -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( mUseLowerLimit, TQ_SIGNAL( toggled( bool ) ),
+           mLowerLimit, TQ_SLOT( setEnabled( bool ) ) );
+  connect( mUseUpperLimit, TQ_SIGNAL( toggled( bool ) ),
+           mUpperLimit, TQ_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( 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/DancingBarsSettings.h b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
index aa9d580bd..08c02d293 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.h
@@ -38,7 +38,7 @@ class TQPushButton;
 
 class DancingBarsSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DancingBarsSettings( TQWidget* parent = 0, const char* name = 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
index 13696c502..a9b8d21c0 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
@@ -49,7 +49,7 @@ void DummyDisplay::resizeEvent( TQResizeEvent* )
 bool DummyDisplay::eventFilter( TQObject* object, TQEvent* event )
 {
   if ( event->type() == TQEvent::MouseButtonRelease &&
-       ( (TQMouseEvent*)event)->button() == Qt::LeftButton )
+       ( (TQMouseEvent*)event)->button() == TQt::LeftButton )
     setFocus();
 
 	return TQWidget::eventFilter( object, event );
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
index cd00a6fd6..b600205b3 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.h
@@ -28,7 +28,7 @@
 
 class DummyDisplay : public KSGRD::SensorDisplay
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DummyDisplay( TQWidget* parent = 0, const char* name = 0,
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
index 22894afea..eccf470c2 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
+++ 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/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
index 2f0e36c60..3ed63e3c2 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
@@ -48,7 +48,7 @@ class FPSensorProperties : public KSGRD::SensorProperties
 
 class FancyPlotter : public KSGRD::SensorDisplay
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     FancyPlotter( TQWidget* parent = 0, const char* name = 0,
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
index ef53bab75..7e7e15d7d 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
@@ -65,7 +65,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   pageLayout->addWidget( mTitle, 0, 1 );
   label->setBuddy( mTitle );
 
-  TQButtonGroup *buttonBox = new TQButtonGroup( 2, Qt::Vertical,
+  TQButtonGroup *buttonBox = new TQButtonGroup( 2, TQt::Vertical,
                                               i18n( "Graph Drawing Style" ), page );
 
   mUsePolygonStyle = new TQRadioButton( i18n( "Basic polygons" ), buttonBox );
@@ -78,7 +78,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   page = addPage( i18n( "Scales" ) );
   pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Vertical Scale" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
   boxLayout->setColStretch( 2, 1 );
 
@@ -108,7 +108,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
 
   pageLayout->addWidget( groupBox, 0, 0 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Horizontal Scale" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() );
   boxLayout->setRowStretch( 1, 1 );
 
@@ -126,7 +126,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   page = addPage( i18n( "Grid" ) );
   pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Lines" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -165,7 +165,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
 
   pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Text" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
@@ -190,7 +190,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
 
   pageLayout->addWidget( groupBox, 1, 0 );
 
-  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page );
+  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Colors" ), page );
   boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() );
 
   label = new TQLabel( i18n( "Vertical lines:" ), groupBox );
@@ -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 );
 }
@@ -531,7 +531,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const
     entry << it.current()->text( 2 );
     entry << it.current()->text( 3 );
     entry << it.current()->text( 4 );
-    QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
+    TQRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
     TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) );
     entry << ( color.name() );
 
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
index 010b4938b..d4e02a25d 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.h
@@ -38,7 +38,7 @@ class TQRadioButton;
 
 class FancyPlotterSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     FancyPlotterSettings( TQWidget* parent = 0, const char* name = 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cpp
index 5b748e9c0..828832668 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cc
+++ 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/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h
index 643df8747..d9bb1c828 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.h
+++ b/ksysguard/gui/SensorDisplayLib/ListView.h
@@ -37,7 +37,7 @@ class ListViewSettings;
 
 class PrivateListView : public TQListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
   enum ColumnType { Text, Int, Float, Time, DiskStat };
 
@@ -74,7 +74,7 @@ private:
 
 class ListView : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ListView(TQWidget* parent = 0, const char* name = 0,
 			const TQString& = TQString::null, int min = 0, int max = 0);
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cpp
index e8e8ca336..a3b1eb3ad 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cpp
@@ -71,7 +71,3 @@ void ListViewSettings::setGridColor( const TQColor &c )
 }
 
 #include "ListViewSettings.moc"
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
index 06a0b4002..0d2d007c9 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.h
@@ -30,7 +30,7 @@ class ListViewSettingsWidget;
 
 class ListViewSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -52,6 +52,3 @@ class ListViewSettings : public KDialogBase
 };
 
 #endif // LISTVIEWSETTINGS_H
-
-/* vim: et sw=2 ts=2
-*/
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
index a8b22569d..c92594fa6 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ 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->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, 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->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();
@@ -181,8 +181,8 @@ LogFile::restoreSettings(TQDomElement& element)
 	TQFont font;
 	TQColorGroup cgroup = monitor->colorGroup();
 
-	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
-	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
+	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green));
+	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black));
 	monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
 
 	addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "logfile" : element.attribute("sensorType")), element.attribute("title"));
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.h b/ksysguard/gui/SensorDisplayLib/LogFile.h
index 786cf7e60..1976fa717 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.h
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.h
@@ -37,7 +37,7 @@ class TQListBox;
 
 class LogFile : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	LogFile(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0);
 	~LogFile(void);
diff --git a/ksysguard/gui/SensorDisplayLib/Makefile.am b/ksysguard/gui/SensorDisplayLib/Makefile.am
index d3f82a3a7..8ebc4c5ee 100644
--- a/ksysguard/gui/SensorDisplayLib/Makefile.am
+++ b/ksysguard/gui/SensorDisplayLib/Makefile.am
@@ -9,25 +9,25 @@ libsensordisplays_la_LIBADD = ../ksgrd/libksgrd.la $(LIB_TDEIO)
 
 # Which sources should be compiled for the sensor display lib.
 libsensordisplays_la_SOURCES = \
-	SensorDisplay.cc \
-	BarGraph.cc \
-	DancingBars.cc \
-	DancingBarsSettings.cc \
-	DummyDisplay.cc \
-	FancyPlotter.cc \
-	FancyPlotterSettings.cc \
-	ListView.cc \
-	LogFile.cc \
-	MultiMeter.cc \
-	MultiMeterSettings.cc \
-	ProcessController.cc \
-	ProcessList.cc \
-	ReniceDlg.cc \
-	SensorLogger.cc \
-	SensorLoggerDlg.cc \
-	SensorLoggerSettings.cc \
-	ListViewSettings.cc \
-	SignalPlotter.cc \
+	SensorDisplay.cpp \
+	BarGraph.cpp \
+	DancingBars.cpp \
+	DancingBarsSettings.cpp \
+	DummyDisplay.cpp \
+	FancyPlotter.cpp \
+	FancyPlotterSettings.cpp \
+	ListView.cpp \
+	LogFile.cpp \
+	MultiMeter.cpp \
+	MultiMeterSettings.cpp \
+	ProcessController.cpp \
+	ProcessList.cpp \
+	ReniceDlg.cpp \
+	SensorLogger.cpp \
+	SensorLoggerDlg.cpp \
+	SensorLoggerSettings.cpp \
+	ListViewSettings.cpp \
+	SignalPlotter.cpp \
 	ListViewSettingsWidget.ui \
 	LogFileSettings.ui \
 	MultiMeterSettingsWidget.ui \
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
index 111c4787b..382b6cb13 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
+++ 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/MultiMeter.h b/ksysguard/gui/SensorDisplayLib/MultiMeter.h
index 49a97dbd7..9e0f8cdc5 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.h
@@ -33,7 +33,7 @@ class MultiMeterSettings;
 
 class MultiMeter : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	MultiMeter(TQWidget* parent = 0, const char* name = 0,
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cpp
index 903369889..63e8d1d3d 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cpp
@@ -121,7 +121,3 @@ void MultiMeterSettings::setMeterBackgroundColor( const TQColor &c )
 }
 
 #include "MultiMeterSettings.moc"
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
index e05946a08..65c633fc6 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.h
@@ -30,7 +30,7 @@ class MultiMeterSettingsWidget;
 
 class MultiMeterSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -62,7 +62,3 @@ class MultiMeterSettings : public KDialogBase
 };
 
 #endif // MULTIMETERSETTINGS_H
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
index 4558e2374..c6c16eff7 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
@@ -440,13 +440,14 @@
     </connection>
 </connections>
 <includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">knumvalidator.h</include>
-    <include location="local" impldecl="in implementation">MultiMeterSettingsWidget.ui.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>
@@ -469,7 +470,4 @@
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
 </UI>
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.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
index 91851d113..cb4579031 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ 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/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h
index 848d77294..e9c81e6c3 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h
@@ -51,7 +51,7 @@ extern TDEApplication* Kapp;
  */
 class ProcessController : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	ProcessController(TQWidget* parent = 0, const char* name = 0, const TQString &title = TQString::null, bool nf = false);
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
index 9293ef6a0..b7e8b0c72 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ 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 51ac510e2..ccabce745 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h
@@ -59,7 +59,7 @@ class TQPopupMenu;
  */
 class ProcessList : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 	// possible values for the filter mode
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cpp
index e71c6e0a0..e71c6e0a0 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
index a9d506eb7..6ef09c175 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
@@ -40,7 +40,7 @@ class KIntNumInput;
  */
 class ReniceDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	ReniceDlg(TQWidget* parent, const char* name, int currentPPrio, int pid);
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
index 4dfff7957..ac029e5e2 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
@@ -64,9 +64,9 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name,
   TQWhatsThis::add( this, "dummy" );
   
   if(!nf) {
-    mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame");
+    mFrame = new TQGroupBox( 2, TQt::Vertical, "", this, "displayFrame");
     mFrame->setFlat(true);
-    mFrame->setAlignment(Qt::AlignHCenter);
+    mFrame->setAlignment(TQt::AlignHCenter);
     mFrame->setInsideMargin(2);
 
     setTitle( title );
@@ -156,7 +156,7 @@ void SensorDisplay::resizeEvent( TQResizeEvent* )
 bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
 {
   if ( event->type() == TQEvent::MouseButtonPress &&
-     ( (TQMouseEvent*)event)->button() == Qt::RightButton ) {
+     ( (TQMouseEvent*)event)->button() == TQt::RightButton ) {
     TQPopupMenu pm;
     if ( mIsApplet ) {
       pm.insertItem( i18n( "Launch &System Guard"), 1 );
@@ -200,7 +200,7 @@ bool SensorDisplay::eventFilter( TQObject *object, TQEvent *event )
 
     return true;
   } else if ( event->type() == TQEvent::MouseButtonRelease &&
-            ( ( TQMouseEvent*)event)->button() == Qt::LeftButton ) {
+            ( ( TQMouseEvent*)event)->button() == TQt::LeftButton ) {
     setFocus();
   }
 
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
index c59f17468..27933dd6b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.h
@@ -50,7 +50,7 @@ class SensorProperties;
  */
 class SensorDisplay : public TQWidget, public SensorClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
index 88083fca1..63cee160b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
@@ -117,8 +117,8 @@ LogSensor::answerReceived(int id, const TQString& answer)
 				KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName));
 				timerOn();
 			}
-			TQDate date = TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().date());
-			TQTime time = TQT_TQTIME_OBJECT(TQDateTime::currentDateTime().time());
+			TQDate date = TQDateTime::currentDateTime().date();
+			TQTime time = TQDateTime::currentDateTime().time();
 
 			stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value);
 		}
@@ -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());
@@ -284,9 +284,9 @@ SensorLogger::restoreSettings(TQDomElement& element)
 {
 	TQColorGroup cgroup = monitor->colorGroup();
 
-	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
-	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
-	cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", Qt::red));
+	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", TQt::green));
+	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", TQt::black));
+	cgroup.setColor(TQColorGroup::Foreground, restoreColor(element, "alarmColor", TQt::red));
 	monitor->setPalette(TQPalette(cgroup, cgroup, cgroup));
 
 	logSensors.clear();
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
index 6630d57e1..354d9ed5b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
@@ -59,7 +59,7 @@ private:
 
 class LogSensor : public TQObject, public KSGRD::SensorClient
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	LogSensor(TQListView *parent);
 	~LogSensor(void);
@@ -141,7 +141,7 @@ private:
 
 class SensorLogger : public KSGRD::SensorDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SensorLogger(TQWidget *parent = 0, const char *name = 0, const TQString& title = 0);
 	~SensorLogger(void);
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cpp
index 422c6a835..64c76f5b8 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cpp
@@ -100,7 +100,3 @@ void SensorLoggerDlg::setUpperLimit( double limit )
 }
 
 #include "SensorLoggerDlg.moc"
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
index e5061c722..3a1d239ca 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.h
@@ -30,7 +30,7 @@ class SensorLoggerDlgWidget;
 
 class SensorLoggerDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -56,7 +56,3 @@ class SensorLoggerDlg : public KDialogBase
 };
 
 #endif // SENSORLOGGERDLG_H
-
-/* vim: et sw=2 ts=2
-*/
-
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/SensorDisplayLib/SensorLoggerSettings.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cpp
index e029d9149..c2206e092 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cpp
@@ -71,7 +71,3 @@ void SensorLoggerSettings::setAlarmColor( const TQColor &c )
 }
 
 #include "SensorLoggerSettings.moc"
-
-/* vim: et sw=2 ts=2
-*/
-
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
index e3f937166..38b19a8c4 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.h
@@ -30,7 +30,7 @@ class SensorLoggerSettingsWidget;
 
 class SensorLoggerSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -52,6 +52,3 @@ class SensorLoggerSettings : public KDialogBase
 };
 
 #endif // SENSORLOGGERSETTINGS_H
-
-/* vim: et sw=2 ts=2
-*/
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
index bcb0b821b..1568eab17 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
@@ -445,7 +445,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
     top = p.fontMetrics().height();
     h -= top;
     int h0 = top - 2; // h0 is our new top.  It's at least 5 pixels high
-    p.drawText(0, 0, x0, top - 2, Qt::AlignCenter, mTitle );
+    p.drawText(0, 0, x0, top - 2, TQt::AlignCenter, mTitle );
 
     p.drawLine( x0 - 1, 1, x0 - 1, h0 );
     p.drawLine( 0, top - 1, w - 2, top - 1 );
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
index cc632ac94..7f7bcdcb3 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.h
@@ -36,7 +36,7 @@ class TQColor;
 
 class SignalPlotter : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SignalPlotter( TQWidget *parent = 0, const char *name = 0 );
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cpp
index d465a998d..2b0bc76dd 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ 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/WorkSheet.h b/ksysguard/gui/WorkSheet.h
index 37bafbda3..e2293c243 100644
--- a/ksysguard/gui/WorkSheet.h
+++ b/ksysguard/gui/WorkSheet.h
@@ -44,7 +44,7 @@ class TQStringList;
  */
 class WorkSheet : public TQWidget, public KSGRD::SensorBoard
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     WorkSheet( TQWidget* parent, const char *name = 0 );
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cpp
index 703be57d5..e985cfafa 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cpp
@@ -45,24 +45,24 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
-  TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
+  TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, i18n( "Title" ), page );
   group->layout()->setMargin( marginHint() );
   group->layout()->setSpacing( spacingHint() );
 
   TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 );
-  groupLayout->setAlignment( Qt::AlignTop );
+  groupLayout->setAlignment( TQt::AlignTop );
 
   mSheetTitle = new KLineEdit( group );
   groupLayout->addWidget( mSheetTitle, 0, 0 );
 
   topLayout->addWidget( group );
 
-  group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page );
+  group = new TQGroupBox( 0, TQt::Vertical, i18n( "Properties" ), page );
   group->layout()->setMargin( marginHint() );
   group->layout()->setSpacing( spacingHint() );
 
   groupLayout = new TQGridLayout( group->layout(), 3, 2 );
-  groupLayout->setAlignment( Qt::AlignTop );
+  groupLayout->setAlignment( TQt::AlignTop );
 
   TQLabel *label = new TQLabel( i18n( "Rows:" ), group );
   groupLayout->addWidget( label, 0, 0 );
diff --git a/ksysguard/gui/WorkSheetSettings.h b/ksysguard/gui/WorkSheetSettings.h
index 5f7d8da0c..9c58502cf 100644
--- a/ksysguard/gui/WorkSheetSettings.h
+++ b/ksysguard/gui/WorkSheetSettings.h
@@ -31,7 +31,7 @@ class KIntNumInput;
 
 class WorkSheetSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     WorkSheetSettings( TQWidget* parent = 0, const char* name = 0 );
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cpp
index c5e622248..9aa511884 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cpp
@@ -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/Workspace.h b/ksysguard/gui/Workspace.h
index 40302ac4a..64a522a65 100644
--- a/ksysguard/gui/Workspace.h
+++ b/ksysguard/gui/Workspace.h
@@ -34,7 +34,7 @@ class WorkSheet;
 
 class Workspace : public TQTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     Workspace( TQWidget* parent, const char* name = 0 );
diff --git a/ksysguard/gui/ksgrd/CMakeLists.txt b/ksysguard/gui/ksgrd/CMakeLists.txt
index b1ec7c5f8..daf5a0e37 100644
--- a/ksysguard/gui/ksgrd/CMakeLists.txt
+++ b/ksysguard/gui/ksgrd/CMakeLists.txt
@@ -34,9 +34,9 @@ install( FILES
 
 tde_add_library( ksgrd SHARED AUTOMOC
   SOURCES
-    HostConnector.cc SensorAgent.cc SensorManager.cc
-    SensorShellAgent.cc SensorSocketAgent.cc StyleEngine.cc
-    StyleSettings.cc TimerSettings.cc
+    HostConnector.cpp SensorAgent.cpp SensorManager.cpp
+    SensorShellAgent.cpp SensorSocketAgent.cpp StyleEngine.cpp
+    StyleSettings.cpp TimerSettings.cpp
   VERSION 1.2.0
   LINK tdeui-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cpp
index b6e85b795..9ff979965 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cpp
@@ -57,11 +57,11 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
   mHostNameLabel->hide();
   layout->addWidget( mHostNameLabel, 0, 1 );
 
-  TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical,
+  TQButtonGroup *group = new TQButtonGroup( 0, TQt::Vertical,
                                           i18n( "Connection Type" ), page );
   TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4,
       spacingHint() );
-  groupLayout->setAlignment( Qt::AlignTop );
+  groupLayout->setAlignment( TQt::AlignTop );
 
   mUseSsh = new TQRadioButton( i18n( "ssh" ), group );
   mUseSsh->setEnabled( true );
@@ -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 );
 }
diff --git a/ksysguard/gui/ksgrd/HostConnector.h b/ksysguard/gui/ksgrd/HostConnector.h
index dbf654b7e..c4d873ffe 100644
--- a/ksysguard/gui/ksgrd/HostConnector.h
+++ b/ksysguard/gui/ksgrd/HostConnector.h
@@ -31,7 +31,7 @@ class TQSpinBox;
 
 class HostConnector : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     HostConnector( TQWidget *parent, const char *name = 0 );
diff --git a/ksysguard/gui/ksgrd/Makefile.am b/ksysguard/gui/ksgrd/Makefile.am
index 52f5bfd01..4eead4247 100644
--- a/ksysguard/gui/ksgrd/Makefile.am
+++ b/ksysguard/gui/ksgrd/Makefile.am
@@ -9,14 +9,14 @@ libksgrd_la_LIBADD = $(LIB_TDEUI)
 
 # Which sources should be compiled for ksysguard.
 libksgrd_la_SOURCES = \
-	HostConnector.cc \
-	SensorAgent.cc \
-	SensorManager.cc \
-	SensorShellAgent.cc \
-	SensorSocketAgent.cc \
-	StyleEngine.cc \
-	StyleSettings.cc \
-	TimerSettings.cc
+	HostConnector.cpp \
+	SensorAgent.cpp \
+	SensorManager.cpp \
+	SensorShellAgent.cpp \
+	SensorSocketAgent.cpp \
+	StyleEngine.cpp \
+	StyleSettings.cpp \
+	TimerSettings.cpp
 
 ksgrdincludedir = $(includedir)/ksgrd
 ksgrdinclude_HEADERS = \
diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cpp
index 7f9615985..7f9615985 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorAgent.cpp
diff --git a/ksysguard/gui/ksgrd/SensorAgent.h b/ksysguard/gui/ksgrd/SensorAgent.h
index 36c44095c..14b9bc014 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.h
+++ b/ksysguard/gui/ksgrd/SensorAgent.h
@@ -43,9 +43,9 @@ class SensorRequest;
   ksysguardd. The current implementation only allowes one pending
   requests. Incoming requests are queued in an input FIFO.
 */
-class KDE_EXPORT SensorAgent : public QObject
+class KDE_EXPORT SensorAgent : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SensorAgent( SensorManager *sm );
diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cpp
index 237e73b23..1412df7d7 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cc
+++ 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;
diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h
index 1e859c638..906358c0d 100644
--- a/ksysguard/gui/ksgrd/SensorManager.h
+++ b/ksysguard/gui/ksgrd/SensorManager.h
@@ -43,9 +43,9 @@ class SensorManagerIterator;
   connection yet or the hostname is empty, a dialog will be shown to
   enter the connections details.
  */
-class KDE_EXPORT SensorManager : public QObject
+class KDE_EXPORT SensorManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class SensorManagerIterator;
 
diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.cc b/ksysguard/gui/ksgrd/SensorShellAgent.cpp
index 7e137ad56..c398be32f 100644
--- a/ksysguard/gui/ksgrd/SensorShellAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorShellAgent.cpp
@@ -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/SensorShellAgent.h b/ksysguard/gui/ksgrd/SensorShellAgent.h
index 2befd346b..eaa932dfc 100644
--- a/ksysguard/gui/ksgrd/SensorShellAgent.h
+++ b/ksysguard/gui/ksgrd/SensorShellAgent.h
@@ -45,7 +45,7 @@ class SensorManager;
  */
 class SensorShellAgent : public SensorAgent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SensorShellAgent( SensorManager *sm );
diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cc b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
index 30c0cc7e9..ed52a5bd4 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.cc
+++ 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/SensorSocketAgent.h b/ksysguard/gui/ksgrd/SensorSocketAgent.h
index 7b9062f17..f937562ff 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.h
+++ b/ksysguard/gui/ksgrd/SensorSocketAgent.h
@@ -41,7 +41,7 @@ class SensorClient;
  */
 class SensorSocketAgent : public SensorAgent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     SensorSocketAgent( SensorManager *sm );
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cpp
index ce3e3bd6b..0e7330741 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cc
+++ 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 50ec06e0b..15a968eb6 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.h
+++ b/ksysguard/gui/ksgrd/StyleEngine.h
@@ -38,9 +38,9 @@ class StyleSettings;
 
 namespace KSGRD {
 
-class KDE_EXPORT StyleEngine : public QObject
+class KDE_EXPORT StyleEngine : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     StyleEngine();
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cpp
index b84d3e407..f70a387b4 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cc
+++ b/ksysguard/gui/ksgrd/StyleSettings.cpp
@@ -90,14 +90,14 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name )
 
   mEditColorButton = new TQPushButton( i18n( "Change Color..." ), page );
   mEditColorButton->setEnabled( false );
-  layout->addWidget( mEditColorButton, 0, 1, Qt::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() ) );
+  layout->addWidget( mEditColorButton, 0, 1, TQt::AlignTop );
+
+  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/StyleSettings.h b/ksysguard/gui/ksgrd/StyleSettings.h
index c3b3d362c..5868b9123 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.h
+++ b/ksysguard/gui/ksgrd/StyleSettings.h
@@ -35,7 +35,7 @@ class TQPushButton;
 
 class StyleSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     StyleSettings( TQWidget *parent = 0, const char *name = 0 );
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cpp
index 43e73ab90..4fa165f99 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cc
+++ 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 64c49959b..8a2ba9588 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.h
+++ b/ksysguard/gui/ksgrd/TimerSettings.h
@@ -32,7 +32,7 @@ class TQSpinBox;
 
 class KDE_EXPORT TimerSettings : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TimerSettings( TQWidget *parent, const char *name = 0 );
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cpp
index 937c5fdd1..65326d826 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cpp
@@ -76,23 +76,23 @@ TopLevel::TopLevel( const char *name )
   mTimerId = -1;
 
   mSplitter = new TQSplitter( this );
-  mSplitter->setOrientation( Qt::Horizontal );
+  mSplitter->setOrientation( TQt::Horizontal );
   mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
   setCentralWidget( mSplitter );
 
   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())
@@ -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()
@@ -319,8 +319,8 @@ void TopLevel::editToolbars()
 {
   saveMainWindowSettings( kapp->config() );
   KEditToolbar dlg( actionCollection() );
-  connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this,
-           TQT_SLOT( slotNewToolbarConfig() ) );
+  connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this,
+           TQ_SLOT( slotNewToolbarConfig() ) );
 
   dlg.exec();
 }
diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h
index df1c2e0c5..b1579bf65 100644
--- a/ksysguard/gui/ksysguard.h
+++ b/ksysguard/gui/ksysguard.h
@@ -43,7 +43,7 @@ class Workspace;
 
 class TopLevel : public TDEMainWindow, public KSGRD::SensorClient, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
diff --git a/ksysguard/ksysguardd/CMakeLists.txt b/ksysguard/ksysguardd/CMakeLists.txt
index f90bdadb0..16019bdc1 100644
--- a/ksysguard/ksysguardd/CMakeLists.txt
+++ b/ksysguard/ksysguardd/CMakeLists.txt
@@ -21,6 +21,8 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
   set( OS_SPECIFIC_DIR FreeBSD )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
   set( OS_SPECIFIC_DIR NetBSD )
+elseif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+  set( OS_SPECIFIC_DIR Solaris )
 else()
   tde_message_fatal( "Your operating system (${CMAKE_SYSTEM_NAME}) is not supported yet." )
 endif()
diff --git a/ksysguard/ksysguardd/FreeBSD/ProcessList.c b/ksysguard/ksysguardd/FreeBSD/ProcessList.c
index f8d2c3ba6..dbb330efb 100644
--- a/ksysguard/ksysguardd/FreeBSD/ProcessList.c
+++ b/ksysguard/ksysguardd/FreeBSD/ProcessList.c
@@ -98,18 +98,12 @@ typedef struct
 	 * The total amount of memory the process uses. This includes shared and
 	 * swapped memory.
 	 */
-	unsigned int vmSize;
+	size_t vmSize;
 
 	/*
 	 * The amount of physical memory the process currently uses.
 	 */
-	unsigned int vmRss;
-
-	/*
-	 * The amount of memory (shared/swapped/etc) the process shares with
-	 * other processes.
-	 */
-	unsigned int vmLib;
+	size_t vmRss;
 
 	/*
 	 * The number of 1/100 of a second the process has spend in user space.
@@ -264,20 +258,20 @@ updateProcess(int pid)
 #if __FreeBSD_version >= 500015
 		ps->userLoad = 100.0 * (double) p.ki_pctcpu / fscale;
 	ps->vmSize   = p.ki_size;
-	ps->vmRss    = p.ki_rssize * getpagesize();
+	ps->vmRss    = (size_t)(p.ki_rssize) * (size_t)(getpagesize());
 	strlcpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
 	strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
 #elif defined (__DragonFly__) && __DragonFly_version >= 190000
 		ps->userLoad = 100.0 * (double) p.kp_lwp.kl_pctcpu / fscale;
 	ps->vmSize   = p.kp_vm_map_size;
-	ps->vmRss    = p.kp_vm_rssize * getpagesize();
+	ps->vmRss    = (size_t)(p.kp_vm_rssize) * (size_t)(getpagesize());
 	strlcpy(ps->name,p.kp_comm ? p.kp_comm : "????", 
 		sizeof(ps->name));
 	strcpy(ps->status,(p.kp_stat>=1)&&(p.kp_stat<=5)? statuses[p.kp_stat-1]:"????");
 #else
 	ps->userLoad = 100.0 * (double) p.kp_proc.p_pctcpu / fscale;
 	ps->vmSize   = p.kp_eproc.e_vm.vm_map.size;
-	ps->vmRss    = p.kp_eproc.e_vm.vm_rssize * getpagesize();
+	ps->vmRss    = (size_t)(p.kp_eproc.e_vm.vm_rssize) * (size_t)(getpagesize());
 #if defined (__DragonFly__)
 	strlcpy(ps->name,p.kp_thread.td_comm ? p.kp_thread.td_comm : "????",
 		sizeof(ps->name));
@@ -417,7 +411,7 @@ printProcessList(const char* cmd)
 	ps = first_ctnr(ProcessList); /* skip 'kernel' entry */
 	for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
 	{
-		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n",
+		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu\t%s\t%s\n",
 			   ps->name, (long)ps->pid, (long)ps->ppid,
 			   (long)ps->uid, (long)ps->gid, ps->status,
 			   ps->userLoad, ps->sysLoad, ps->niceLevel,
diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c
index 2708664bd..8582aae56 100644
--- a/ksysguard/ksysguardd/Linux/ProcessList.c
+++ b/ksysguard/ksysguardd/Linux/ProcessList.c
@@ -84,10 +84,10 @@ typedef struct {
     The total amount of memory the process uses. This includes shared and
     swapped memory.
    */
-  unsigned int vmSize;
+  size_t vmSize;
 
 	/* The amount of physical memory the process currently uses. */
-  unsigned int vmRss;
+  size_t vmRss;
 
 	/**
     The number of 1/100 of a second the process has spend in user space.
@@ -215,7 +215,7 @@ static int updateProcess( int pid )
     return -1;
 
   if ( fscanf( fd, "%*d %*s %c %d %d %*d %d %*d %*u %*u %*u %*u %*u %d %d"
-                   "%*d %*d %*d %d %*u %*u %*d %u %u",
+                   "%*d %*d %*d %d %*u %*u %*d %zu %zu",
                    &status, (int*)&ps->ppid, (int*)&ps->gid, &ps->ttyNo,
                    &userTime, &sysTime, &ps->niceLevel, &ps->vmSize,
                    &ps->vmRss) != 9 ) {
@@ -419,7 +419,7 @@ void printProcessList( const char* cmd )
   (void)cmd;
 
   for ( ps = first_ctnr( ProcessList ); ps; ps = next_ctnr( ProcessList ) ) {
-    fprintf( CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d"
+    fprintf( CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu"
              "\t%s\t%s\n", ps->name, (long)ps->pid, (long)ps->ppid,
              (long)ps->uid, (long)ps->gid, ps->status, ps->userLoad,
              ps->sysLoad, ps->niceLevel, ps->vmSize / 1024, ps->vmRss / 1024,
diff --git a/ksysguard/ksysguardd/NetBSD/ProcessList.c b/ksysguard/ksysguardd/NetBSD/ProcessList.c
index 13c65053d..a23af4cf3 100644
--- a/ksysguard/ksysguardd/NetBSD/ProcessList.c
+++ b/ksysguard/ksysguardd/NetBSD/ProcessList.c
@@ -91,18 +91,12 @@ typedef struct
 	 * The total amount of memory the process uses. This includes shared and
 	 * swapped memory.
 	 */
-	unsigned int vmSize;
+	size_t vmSize;
 
 	/*
 	 * The amount of physical memory the process currently uses.
 	 */
-	unsigned int vmRss;
-
-	/*
-	 * The amount of memory (shared/swapped/etc) the process shares with
-	 * other processes.
-	 */
-	unsigned int vmLib;
+	size_t vmRss;
 
 	/*
 	 * The number of 1/100 of a second the process has spend in user space.
@@ -200,10 +194,10 @@ updateProcess(int pid, struct kinfo_proc2 *p)
 	ps->userName[sizeof(ps->userName)-1]='\0';
 
         ps->userLoad = 100.0 * ((double)(p->p_pctcpu) /FSCALE);
-	ps->vmSize   = (p->p_vm_tsize +
-			p->p_vm_dsize +
-			p->p_vm_ssize) * getpagesize();
-	ps->vmRss    = p->p_vm_rssize * getpagesize();
+	ps->vmSize   = ((size_t)(p->p_vm_tsize) +
+			(size_t)(p->p_vm_dsize) +
+			(size_t)(p->p_vm_ssize)) * (size_t)(getpagesize());
+	ps->vmRss    = (size_t)(p->p_vm_rssize) * (size_t)(getpagesize());
 	strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name));
 	strlcpy(ps->status,(p->p_stat<=7)? statuses[p->p_stat]:"????", sizeof(ps->status));
 
@@ -316,7 +310,7 @@ printProcessList(const char* cmd)
 	ps = first_ctnr(ProcessList); /* skip 'kernel' entry */
 	for (ps = next_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
 	{
-		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%d\t%d\t%d\t%d\t%s\t%s\n",
+		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%d\t%d\t%zu\t%zu\t%s\t%s\n",
 			   ps->name, (long)ps->pid, (long)ps->ppid,
 			   (long)ps->uid, (long)ps->gid, ps->status,
 			   ps->userLoad, ps->priority, ps->niceLevel,
diff --git a/ksysguard/ksysguardd/OpenBSD/ProcessList.c b/ksysguard/ksysguardd/OpenBSD/ProcessList.c
index ccdcc2313..f84ff0b2d 100644
--- a/ksysguard/ksysguardd/OpenBSD/ProcessList.c
+++ b/ksysguard/ksysguardd/OpenBSD/ProcessList.c
@@ -88,18 +88,12 @@ typedef struct
 	 * The total amount of memory the process uses. This includes shared and
 	 * swapped memory.
 	 */
-	unsigned int vmSize;
+	size_t vmSize;
 
 	/*
 	 * The amount of physical memory the process currently uses.
 	 */
-	unsigned int vmRss;
-
-	/*
-	 * The amount of memory (shared/swapped/etc) the process shares with
-	 * other processes.
-	 */
-	unsigned int vmLib;
+	size_t vmRss;
 
 	/*
 	 * The number of 1/100 of a second the process has spend in user space.
@@ -245,10 +239,10 @@ updateProcess(struct kinfo_proc *p)
 	ps->userName[sizeof(ps->userName)-1]='\0';
 
         ps->userLoad = p->p_pctcpu / 100;
-	ps->vmSize   = (p->p_vm_tsize +
-			p->p_vm_dsize +
-			p->p_vm_ssize) * getpagesize();
-	ps->vmRss    = p->p_vm_rssize * getpagesize();
+	ps->vmSize   = ((size_t)(p->p_vm_tsize) +
+			(size_t)(p->p_vm_dsize) +
+			(size_t)(p->p_vm_ssize)) * (size_t)(getpagesize());
+	ps->vmRss    = (size_t)(p->p_vm_rssize) * (size_t)(getpagesize());
 	strlcpy(ps->name,p->p_comm ? p->p_comm : "????", sizeof(ps->name));
 	strlcpy(ps->status,(p->p_stat>=1)&&(p->p_stat<=5)? statuses[p->p_stat-1]:"????", sizeof(ps->status));
 
@@ -362,7 +356,7 @@ printProcessList(const char* cmd)
 
 	for (ps = first_ctnr(ProcessList); ps; ps = next_ctnr(ProcessList))
 	{
-		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%d\t%d\t%s\t%s\n",
+		fprintf(CurrentClient, "%s\t%ld\t%ld\t%ld\t%ld\t%s\t%.2f\t%.2f\t%d\t%zu\t%zu\t%s\t%s\n",
 			   ps->name, (long)ps->pid, (long)ps->ppid,
 			   (long)ps->uid, (long)ps->gid, ps->status,
 			   ps->userLoad, ps->sysLoad, ps->niceLevel,
diff --git a/ksysguard/ksysguardd/Porting-HOWTO b/ksysguard/ksysguardd/Porting-HOWTO
index 4576783bc..f7096b03d 100644
--- a/ksysguard/ksysguardd/Porting-HOWTO
+++ b/ksysguard/ksysguardd/Porting-HOWTO
@@ -112,7 +112,7 @@ COMMAND\nksysguardd> ".
 ksysguardd does not handle native language support. In order to have a
 minimum installation (only a single file) on the monitored machine,
 all translation are handled by the front-end. Please see the files
-gui/ksgrd/SensorManger.cc and gui/SensorDisplayLib/ProcessTable.cc
+gui/ksgrd/SensorManger.cpp and gui/SensorDisplayLib/ProcessTable.cpp
 if you add new strings.
 
 /**
diff --git a/ksysguard/ksysguardd/Solaris/CMakeLists.txt b/ksysguard/ksysguardd/Solaris/CMakeLists.txt
new file mode 100644
index 000000000..aeeda9ac3
--- /dev/null
+++ b/ksysguard/ksysguardd/Solaris/CMakeLists.txt
@@ -0,0 +1,25 @@
+#################################################
+#
+#  (C) 2023 Denis Kozadaev
+#  denis (AT) tambov (DOT) ru
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/ksysguard/CContLib
+  ${CMAKE_SOURCE_DIR}/ksysguard/ksysguardd
+)
+
+
+##### ksysguardd (static) #######################
+
+tde_add_library( ksysguardd STATIC
+  SOURCES
+    Memory.c LoadAvg.c ProcessList.c NetDev.c
+)
diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
index fe66ad537..6130f2a83 100644
--- a/ksysguard/ksysguardd/modules.h
+++ b/ksysguard/ksysguardd/modules.h
@@ -68,7 +68,7 @@
 #include "netdev.h"
 #endif /* OSTYPE_NetBSD */
 
-#ifdef OSTYPE_Solaris
+#if defined(OSTYPE_Solaris) || defined(OSTYPE_SunOS)
 #include "LoadAvg.h"
 #include "Memory.h"
 #include "NetDev.h"
@@ -146,7 +146,7 @@ struct SensorModul SensorModulList[] = {
   { "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev, 0, NULLTIME },
 #endif /* OSTYPE_NetBSD */
 
-#ifdef OSTYPE_Solaris
+#if defined(OSTYPE_Solaris) || defined(OSTYPE_SunOS)
   { "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC, 0, NULLTIME },
   { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME },
   { "NetDev", initNetDev, exitNetDev, updateNetDev, NULLVVFUNC, 0, NULLTIME },
diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp
index 5f9264c8c..404e2a472 100644
--- a/ksystraycmd/ksystraycmd.cpp
+++ b/ksystraycmd/ksystraycmd.cpp
@@ -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();
@@ -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();
 }
@@ -292,7 +292,7 @@ void KSysTrayCmd::windowChanged( WId w )
 
 void KSysTrayCmd::mousePressEvent( TQMouseEvent *e )
 {
-  if ( e->button() == Qt::RightButton )
+  if ( e->button() == TQt::RightButton )
     execContextMenu( e->globalPos() );
   else if ( lazyStart && ( !hasRunningClient() ) )
   {
diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h
index abad3ec57..20ebd0b25 100644
--- a/ksystraycmd/ksystraycmd.h
+++ b/ksystraycmd/ksystraycmd.h
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
 #ifndef KSYSTRAYCMD_H
 #define KSYSTRAYCMD_H
 
@@ -16,7 +14,7 @@ class KWinModule;
  */
 class KSysTrayCmd : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KSysTrayCmd();
   ~KSysTrayCmd();
diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp
index 0240b3d1b..c4cfb2383 100644
--- a/ktip/ktipwindow.cpp
+++ b/ktip/ktipwindow.cpp
@@ -46,14 +46,14 @@ int main(int argc, char *argv[])
 
 	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/ktip/tips b/ktip/tips
index d9a06f914..292441f76 100644
--- a/ktip/tips
+++ b/ktip/tips
@@ -77,7 +77,7 @@ The window list, which is accessible via an icon on the panel, provides a
 quick overview of all windows on all virtual desktops. Alternatively,
 press Alt+F5 to display the window list.</p><br>
 <center>
-<img src="crystalsvg/48x48/apps/window_list.png">
+<img src="crystalsvg/48x48/actions/window_duplicate.png">
 </center>
 </html>
 </tip>
@@ -291,8 +291,8 @@ as many items of different types as you want, all at once.
 print subsystem "on the fly" (and you do not need to be root to do it.)
 </p>
 <p>Laptop users who frequently change to different environments may find
-<A HREF="ftp://truffula.com/pub/">RLPR</A> a useful complement to CUPS
-(or any other print subsystem they use as their preferred one).
+RLPR a useful complement to CUPS (or any other print subsystem they use
+as their preferred one).
 </p>
 <p align="right"><em>Contributed by Kurt Pfeifle</em></p>
 </html>
@@ -657,7 +657,7 @@ so on.)</p>
 <tip category="General">
 <html>
 <p>If you want to contribute your own "tip of the day", please send the tip to
-<a href="trinity-devel@lists.pearsoncomputing.net">trinity-devel@lists.pearsoncomputing.net</a>,
+<a href="devels@trinitydesktop.org">devels@trinitydesktop.org</a>,
 and we will consider the tip for the next release.</p>
 </html>
 </tip>
@@ -704,7 +704,7 @@ href="help:/konqueror/enhanced-browsing.html">the Konqueror Handbook</a>.</p>
 <tip category="Win2Unix">
 <html>
 <p>
-Each UNIX user has a so-called Home folder in which his or her
+Each UNIX user has a so-called Home folder in which their
 files as well as user-dependent configuration files are saved. If you
 work in a Konsole window, you can easily change to your home folder
 by entering the <b>cd</b> command without any parameters.
@@ -1006,6 +1006,8 @@ or in Konqueror file manager to change icon size.</li>
 
 <li>Shift+Mouse-Wheel for fast scrolling in all TDE applications.</li>
 
+<li>Mouse-Wheel on the speaker icon on the TDE system tray for quick adjustment of sound volume.</li>
+
 <li>Mouse-Wheel over the taskbar in Kicker to quickly alternate between
 different windows.</li>
 
@@ -1117,11 +1119,13 @@ Open the Control Center, select Peripherals->Keyboard and make your
 <p>Do you already know the <i>TDE IRC channel</i>?</p>
 
 <p>
-<b>network:</b> chat.freenode.net
+<b>network:</b> irc.libera.chat
 <br />
 <b>channel:</b> #trinity-desktop
 <p>
 
+<p>Important to note that we have moved from Freenode to Libera Chat as of <b>May 9th, 2021</b>, so be sure to update any outdated links.</p>
+
 <p>You can join if you have some questions or want to meet some other people from the TDE community.</p>
 
 <p>There is a small but friendly group of people always there. Sometimes you can also meet the developers there and give them your feedback or ask other users for help. It is also the place where you can ask about ways to start contributing to TDE.</p>
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..cb0d4b9db 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(
diff --git a/kxkb/eventsrc b/kxkb/eventsrc
new file mode 100644
index 000000000..ce25f3979
--- /dev/null
+++ b/kxkb/eventsrc
@@ -0,0 +1,8 @@
+[!Global!]
+IconName=kxkb
+Comment=TDE Keyboard Tool
+
+[LayoutChange]
+Name=Keyboard layout switch
+Comment=The keyboard layout was switched
+default_presentation=16
\ No newline at end of file
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 616167944..870ee7eb4 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -15,26 +15,18 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBfile.h>
+#include <X11/extensions/XKBrules.h>
 #include <X11/extensions/XKBgeom.h>
 #include <X11/extensions/XKM.h>
 
 #include "extension.h"
 
 
-TQMap<TQString, FILE*> XKBExtension::fileCache;	//TODO: move to class?
-
-
 static TQString getLayoutKey(const TQString& layout, const TQString& variant)
 {
 	return layout + "." + variant;
 }
 
-TQString XKBExtension::getPrecompiledLayoutFilename(const TQString& layoutKey)
-{
-	TQString compiledLayoutFileName = m_tempDir + layoutKey + ".xkm";
-	return compiledLayoutFileName;
-}
-
 XKBExtension::XKBExtension(Display *d)
 {
 	if ( d == NULL )
@@ -76,16 +68,11 @@ bool XKBExtension::init()
     // Do it, or face horrible memory corrupting bugs
     ::XkbInitAtoms(NULL);
 
-    return true;
-}
+    // watch group change events
+    XkbSelectEventDetails(m_dpy, XkbUseCoreKbd, XkbStateNotify,
+                          XkbAllStateComponentsMask, XkbGroupStateMask);
 
-void XKBExtension::reset()
-{
-	for(TQMap<TQString, FILE*>::ConstIterator it = fileCache.begin(); it != fileCache.end(); it++) {
-		fclose(*it);
-//		remove( TQFile::encodeName(getPrecompiledLayoutFileName(*it)) );
-	}
-	fileCache.clear();
+    return true;
 }
 
 XKBExtension::~XKBExtension()
@@ -94,106 +81,77 @@ XKBExtension::~XKBExtension()
 		deletePrecompiledLayouts();*/
 }
 
-bool XKBExtension::setXkbOptions(const TQString& options, bool resetOld)
+bool XKBExtension::setXkbOptions(const XkbOptions options)
 {
-    if (options.isEmpty())
-        return true;
-
-    TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
-    if (exe.isEmpty())
-        return false;
-
-    TDEProcess p;
-    p << exe;
-    if( resetOld )
-        p << "-option";
-    p << "-option" << options;
+	TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
+	if (exe.isEmpty())
+		return false;
 
-    p.start(TDEProcess::Block);
+	TDEProcess p;
+	p << exe;
 
-    return p.normalExit() && (p.exitStatus() == 0);
-}
+	if (!options.layouts.isEmpty())
+	{
+		p << "-layout";
+		p << options.layouts;
+	}
 
-bool XKBExtension::setLayout(const TQString& model,
-		const TQString& layout, const TQString& variant,
-		const TQString& includeGroup, bool useCompiledLayouts)
-{
-	if( useCompiledLayouts == false ) {
-		return setLayoutInternal( model, layout, variant, includeGroup );
+	if (!options.variants.isEmpty())
+	{
+		p << "-variant";
+		p << options.variants;
 	}
 	
-	const TQString layoutKey = getLayoutKey(layout, variant);
-	
-	bool res;
-	if( fileCache.contains(layoutKey) ) {
-		res = setCompiledLayout( layoutKey );
-		kdDebug() << "[kxkb-extension] setCompiledLayout " << layoutKey << ": " << res << endl;
-
-		if( res )
-			return res;
+	if (!options.model.isEmpty()) {
+		p << "-model";
+		p << options.model;
 	}
-//	else {
-		res = setLayoutInternal( model, layout, variant, includeGroup );
-		kdDebug() << "[kxkb-extension] setRawLayout " << layoutKey << ": " << res << endl;
-		if( res )
-			compileCurrentLayout( layoutKey );
-		
-//	}
-	return res;
-}
 
-// private
-bool XKBExtension::setLayoutInternal(const TQString& model,
-		const TQString& layout, const TQString& variant,
-		const TQString& includeGroup)
-{
-    if ( layout.isEmpty() )
-        return false;
+	if (options.resetOld) {
+		p << "-option";
+	}
 
-	TQString exe = TDEGlobal::dirs()->findExe("setxkbmap");
-	if( exe.isEmpty() ) {
-		kdError() << "[kxkb-extension] Can't find setxkbmap" << endl;
-		return false;
+	if (!options.options.isEmpty()) {
+		if (options.resetOld)
+		{
+			p << "-option" << options.options;
+		}
+		else
+		{
+			// Avoid duplication of options in Append mode
+			TQStringList srvOptions = TQStringList::split(",", XKBExtension::getServerOptions());
+			TQStringList kxkbOptions = TQStringList::split(",", options.options);
+			TQStringList newOptions;
+			for (TQStringList::Iterator it = kxkbOptions.begin(); it != kxkbOptions.end(); ++it)
+			{
+				TQString option(*it);
+				if (!srvOptions.contains(option))
+				{
+					newOptions << option;
+				}
+			}
+			if (!newOptions.isEmpty()) {
+				p <<  "-option" <<  newOptions.join(",");
+			}
+		}
 	}
 
-    TQString fullLayout = layout;
-    TQString fullVariant = variant;
-	if( includeGroup.isEmpty() == false ) {
-        fullLayout = includeGroup;
-        fullLayout += ",";
-        fullLayout += layout;
-		
-//    fullVariant = baseVar;
-        fullVariant = ",";
-        fullVariant += variant;
-    }
- 
-    TDEProcess p;
-    p << exe;
-//  p << "-rules" << rule;
-	if( model.isEmpty() == false )
-		p << "-model" << model;
-    p << "-layout" << fullLayout;
-    if( !fullVariant.isNull() && !fullVariant.isEmpty() )
-        p << "-variant" << fullVariant;
+	kdDebug() << "[setXkbOptions] Command: " << p.args() << endl;
 
-    p.start(TDEProcess::Block); 
+	p.start(TDEProcess::Block);
 
-    // reload system-wide hotkey-setup keycode -> keysym maps
-    TQString modmapFileName = TDEGlobal::dirs()->findResource( "data", "kxkb/system.xmodmap" );
-    if ( TQFile::exists( modmapFileName ) ) {
-        TDEProcess pXmodmap;
-        pXmodmap << "xmodmap" << modmapFileName;
-        pXmodmap.start(TDEProcess::Block);
-    }
+	return p.normalExit() && (p.exitStatus() == 0);
+}
 
-    if ( TQFile::exists( TQDir::home().path() + "/.Xmodmap" ) ) {
-        TDEProcess pXmodmapHome;
-        pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap";
-        pXmodmapHome.start(TDEProcess::Block);
+TQString 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 p.normalExit() && (p.exitStatus() == 0);
+    return TQString::null;
 }
 
 bool XKBExtension::setGroup(unsigned int group)
@@ -209,130 +167,13 @@ unsigned int XKBExtension::getGroup() const
 	return xkbState.group;
 }
 
-/**
- * @brief Gets the current layout in its binary compiled form
- *		and write it to the file specified by 'fileName'
- * @param[in] fileName file to store compiled layout to
- * @return true if no problem, false otherwise
- */
-bool XKBExtension::compileCurrentLayout(const TQString &layoutKey)
-{
-    XkbFileInfo result;
-    memset(&result, 0, sizeof(result));
-    result.type = XkmKeymapFile;
-    XkbReadFromServer(m_dpy, XkbAllMapComponentsMask, XkbAllMapComponentsMask, &result);
-	 
-	const TQString fileName = getPrecompiledLayoutFilename(layoutKey);
-
-	kdDebug() << "[kxkb-extension] compiling layout " << this << " cache size: " << fileCache.count() << endl;
-	if( fileCache.contains(layoutKey) ) {
-		kdDebug() << "[kxkb-extension] trashing old compiled layout for " << fileName << endl;
-		if( fileCache[ layoutKey ] != NULL )
-			fclose( fileCache[ layoutKey ] );	// recompiling - trash the old file
-		fileCache.remove(fileName);
-	}
-
-	FILE *output = fopen(TQFile::encodeName(fileName), "w");
-		
-    if ( output == NULL )
-    {
-		kdWarning() << "[kxkb-extension] Could not open " << fileName << " to precompile: " << strerror(errno) << endl;
-        XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-        return false;
-    }
-
-	if( !XkbWriteXKMFile(output, &result) ) {
-		kdWarning() << "[kxkb-extension] Could not write compiled layout to " << fileName << endl;
-		fclose(output);
-        return false;
-	}
-	
-	fclose(output);	// TODO: can we change mode w/out reopening?
-	FILE *input = fopen(TQFile::encodeName(fileName), "r");
-	fileCache[ layoutKey ] = input;
-
-	XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-    return true;
-}
-
-/**
- * @brief takes layout from its compiled binary snapshot in file 
- *	and sets it as current
- * TODO: cache layout in memory rather than in file
- */
-bool XKBExtension::setCompiledLayout(const TQString &layoutKey)
-{
-	FILE *input = NULL;
-	
-	if( fileCache.contains(layoutKey) ) {
-		input = fileCache[ layoutKey ];
-	}
-	
-	if( input == NULL ) {
-		kdWarning() << "[kxkb-extension] setCompiledLayout trying to reopen xkb file" << endl;	// should never happen
-		const TQString fileName = getPrecompiledLayoutFilename(layoutKey);
-		input = fopen(TQFile::encodeName(fileName), "r");
-		
-		// 	FILE *input = fopen(TQFile::encodeName(fileName), "r");
-		if ( input == NULL ) {
-			kdDebug() << "[kxkb-extension] Unable to open " << fileName << ": " << strerror(errno) << endl;
-			fileCache.remove(layoutKey);
-			return false;
-		}
-	}
-	else {
-		rewind(input);
-	}
-
-    XkbFileInfo result;
-    memset(&result, 0, sizeof(result));
-	if ((result.xkb = XkbAllocKeyboard())==NULL) {
-		kdWarning() << "[kxkb-extension] Unable to allocate memory for keyboard description" << endl;
-//      fclose(input);
-//		fileCache.remove(layoutKey);
-    	return false;
-	}
-	
-    unsigned retVal = XkmReadFile(input, 0, XkmKeymapLegal, &result);
-    if (retVal == XkmKeymapLegal)
-    {
-        // this means reading the Xkm didn't manage to read any section
-        kdWarning() << "[kxkb-extension] Unable to load map from file" << endl;
-        XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-        fclose(input);
-		fileCache.remove(layoutKey);
-		return false;
+/** 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);
     }
-
-	//    fclose(input);	// don't close - goes in cache
-
-    if (XkbChangeKbdDisplay(m_dpy, &result) == Success)
-    {
-        if (!XkbWriteToServer(&result))
-        {
-            kdWarning() << "[kxkb-extension] Unable to write the keyboard layout to X display" << endl;
-            XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-            return false;
-        }
-    }
-    else
-    {
-        kdWarning() << "[kxkb-extension] Unable prepare the keyboard layout for X display" << endl;
-    }
-
-    XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True);
-    return true;
 }
 
-
-// Deletes the precompiled layouts stored in temporary files
-// void XKBExtension::deletePrecompiledLayouts()
-// {
-// 	TQMapConstIterator<LayoutUnit, TQString> it, end;
-// 	end = m_compiledLayoutFileNames.end();
-// 	for (it = m_compiledLayoutFileNames.begin(); it != end; ++it)
-// 	{
-// 		unlink(TQFile::encodeName(it.data()));
-// 	}
-// 	m_compiledLayoutFileNames.clear();
-// }
+#include "extension.moc"
diff --git a/kxkb/extension.h b/kxkb/extension.h
index bf4293d2b..9a3d2da8e 100644
--- a/kxkb/extension.h
+++ b/kxkb/extension.h
@@ -2,36 +2,33 @@
 #define __EXTENSION_H__
 
 #include <X11/Xlib.h>
+#include <tqobject.h>
 
+#include "kxkbconfig.h"
 
-class XKBExtension
+class XKBExtension : public TQObject
 {
+    TQ_OBJECT
+
 public:
 	XKBExtension(Display *display=NULL);
 	~XKBExtension();
 	bool init();
-	void reset();
 
-	static bool setXkbOptions(const TQString& options, bool resetOldOptions);
-	bool setLayout(const TQString& model,
-					const TQString& layout, const TQString& variant,
-					const TQString& includeGroup, bool useCompiledLayouts=true);
+	static bool setXkbOptions(const XkbOptions options);
+	static TQString getServerOptions();
 	bool setGroup(unsigned int group);
 	unsigned int getGroup() const;
+	void processXEvent(XEvent *ev);
 
 private:
     Display *m_dpy;
 	TQString m_tempDir;
+	int m_keycode;
 	static TQMap<TQString, FILE*> fileCache;
-	
-	bool setLayoutInternal(const TQString& model,
-				   const TQString& layout, const TQString& variant,
-				   const TQString& includeGroup);
-	bool compileCurrentLayout(const TQString& layoutKey);
-	bool setCompiledLayout(const TQString& layoutKey);
-	
-	TQString getPrecompiledLayoutFilename(const TQString& layoutKey);
-//	void deletePrecompiledLayouts();
+
+signals:
+	void groupChanged(uint group);
 };
 
 #endif
diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index a306f0a33..73a500e21 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -13,7 +13,10 @@
 #include <tqlistview.h>
 #include <tqbuttongroup.h>
 #include <tqspinbox.h>
+#include <tqvbox.h>
 
+#include <tdefontrequester.h>
+#include <kcolorbutton.h>
 #include <kkeydialog.h>
 #include <tdeglobal.h>
 #include <tdeconfig.h>
@@ -22,6 +25,10 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
+#include <tdemessagebox.h>
+#include <kglobalaccel.h>
+#include <dcopref.h>
+#include <dcopclient.h>
 
 #include "extension.h"
 #include "kxkbconfig.h"
@@ -29,6 +36,7 @@
 #include "pixmap.h"
 #include "kcmmisc.h"
 #include "kcmlayoutwidget.h"
+#include "x11helper.h"
 
 #include "kcmlayout.h"
 #include "kcmlayout.moc"
@@ -39,8 +47,7 @@ enum {
  LAYOUT_COLUMN_NAME = 1,
  LAYOUT_COLUMN_MAP = 2,
  LAYOUT_COLUMN_VARIANT = 3,
- LAYOUT_COLUMN_INCLUDE = 4,
- LAYOUT_COLUMN_DISPLAY_NAME = 5,
+ LAYOUT_COLUMN_DISPLAY_NAME = 4,
  SRC_LAYOUT_COLUMN_COUNT = 3,
  DST_LAYOUT_COLUMN_COUNT = 6
 };
@@ -95,60 +102,70 @@ static TQListViewItem* copyLVI(const TQListViewItem* src, TQListView* parent)
 
 
 LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
-  : TDECModule(parent, name), 
-    m_rules(NULL)
+  : TDECModule(parent, name),
+    m_rules(NULL),
+    m_forceGrpOverwrite(false)
 {
+  X11Helper::initializeTranslations();
   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( TQT_TQOBJECT(widget->chkShowFlag), TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( TQT_TQOBJECT(widget->comboModel), TQT_SIGNAL(activated(int)), 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->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->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->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->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( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(displayNameChanged(const TQString&)));
+  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->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(changed()));
-  connect( widget->chkLatin, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(latinChanged()));
+  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->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed()));
+  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->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->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->chkEnableSticky, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed()));
+  connect( widget->spinStickyDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed()));
+
+  connect(widget->chkEnableNotify,       TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  connect(widget->chkNotifyUseKMilo,     TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
 
   widget->listLayoutsSrc->setColumnText(LAYOUT_COLUMN_FLAG, "");
   widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_FLAG, "");
-  widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_INCLUDE, "");
 //  widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_DISPLAY_NAME, "");
 
   widget->listLayoutsSrc->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
   widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_FLAG, 28);
 
-  widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_INCLUDE);
   widget->listLayoutsDst->header()->setResizeEnabled(FALSE, LAYOUT_COLUMN_DISPLAY_NAME);
-  widget->listLayoutsDst->setColumnWidthMode(LAYOUT_COLUMN_INCLUDE, TQListView::Manual);
-  widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_INCLUDE, 0);
 //  widget->listLayoutsDst->setColumnWidth(LAYOUT_COLUMN_DISPLAY_NAME, 0);
-  
+
   widget->listLayoutsDst->setSorting(-1);
 #if 0
   widget->listLayoutsDst->setResizeMode(TQListView::LastColumn);
@@ -159,9 +176,14 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name)
   //Read rules - we _must_ read _before_ creating xkb-options comboboxes
   loadRules();
 
-  makeOptionsTab();
+  // Load global shortcuts
+#define NOSLOTS
+  keys = new TDEGlobalAccel(this);
+#include "kxkbbindings.cpp"
 
+  makeOptionsTab();
   load();
+  makeShortcutsTab();
 }
 
 
@@ -175,32 +197,33 @@ void LayoutConfig::load()
 {
 	m_kxkbConfig.load(KxkbConfig::LOAD_ALL);
 
+	keys->readSettings();
+
 	initUI();
 }
-	
+
 void LayoutConfig::initUI() {
 	const char* modelName = m_rules->models()[m_kxkbConfig.m_model];
 	if( modelName == NULL )
 		modelName = DEFAULT_MODEL;
-	
+
 	widget->comboModel->setCurrentText(i18n(modelName));
 
 	TQValueList<LayoutUnit> otherLayouts = m_kxkbConfig.m_layouts;
 	widget->listLayoutsDst->clear();
-// to optimize we should have gone from it.end to it.begin
+	// to optimize we should have gone from it.end to it.begin
 	TQValueList<LayoutUnit>::ConstIterator it;
 	for (it = otherLayouts.begin(); it != otherLayouts.end(); ++it ) {
 		TQListViewItemIterator src_it( widget->listLayoutsSrc );
 		LayoutUnit layoutUnit = *it;
-		
+
 		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);
-				
+
 				newItem->setText(LAYOUT_COLUMN_VARIANT, layoutUnit.variant);
-				newItem->setText(LAYOUT_COLUMN_INCLUDE, layoutUnit.includeGroup);
 				newItem->setText(LAYOUT_COLUMN_DISPLAY_NAME, layoutUnit.displayName);
 				widget->listLayoutsDst->insertItem(newItem);
 				newItem->moveItem(widget->listLayoutsDst->lastItem());
@@ -210,12 +233,49 @@ void LayoutConfig::initUI() {
 		}
 	}
 
+	// initialize hotkey combo
+	TQDict<char> allOptions = m_rules->options();
+
+	TQStringList commonHotkeys;
+	commonHotkeys << "alt_shift_toggle" << "ctrl_shift_toggle"
+	              << "win_space_toggle" << "alt_space_toggle"
+	              << "caps_toggle" << "menu_toggle"
+	              << "lwin_toggle" << "rwin_toggle";
+
+	for (TQStringList::ConstIterator hk = commonHotkeys.begin(); hk != commonHotkeys.end(); ++hk ) {
+		const char *hkOpt  = tqstrdup(TQString("grp:" + (*hk)).ascii());
+		const char *hkDesc = allOptions[hkOpt];
+		if (hkDesc != 0) { // the option exists
+			widget->comboHotkey->insertItem(XkbRules::trOpt(hkDesc));
+		}
+	}
+	widget->comboHotkey->insertItem(i18n("None"));
+	widget->comboHotkey->insertItem(i18n("Other..."));
+
 	// display KXKB switching options
 	widget->chkShowSingle->setChecked(m_kxkbConfig.m_showSingle);
-	widget->chkShowFlag->setChecked(m_kxkbConfig.m_showFlag);
 
-	widget->chkEnableOptions->setChecked( m_kxkbConfig.m_enableXkbOptions );
-	widget->checkResetOld->setChecked(m_kxkbConfig.m_resetOldOptions);
+	bool showFlag = m_kxkbConfig.m_showFlag;
+	bool showLabel = m_kxkbConfig.m_showLabel;
+	widget->radFlagLabel->setChecked( showFlag && showLabel );
+	widget->radFlagOnly->setChecked( showFlag && !showLabel );
+	widget->radLabelOnly->setChecked( !showFlag && showLabel );
+
+	widget->xkbOptsMode->setButton(m_kxkbConfig.m_resetOldOptions ? 0 : 1);
+
+	widget->grpLabel->setButton( ( m_kxkbConfig.m_useThemeColors ? 0 : 1 )  );
+	widget->bgColor->setColor( m_kxkbConfig.m_colorBackground );
+	widget->fgColor->setColor( m_kxkbConfig.m_colorLabel );
+	widget->chkBgTransparent->setChecked( m_kxkbConfig.m_bgTransparent );
+	widget->labelFont->setFont( m_kxkbConfig.m_labelFont );
+	widget->chkLabelShadow->setChecked( m_kxkbConfig.m_labelShadow );
+	widget->shColor->setColor( m_kxkbConfig.m_colorShadow );
+
+	widget->grpLabel->setDisabled(showFlag && !showLabel);
+	widget->grpLabelColors->setDisabled(m_kxkbConfig.m_useThemeColors);
+	widget->labelBgColor->setDisabled(showFlag);
+	widget->bgColor->setDisabled(showFlag);
+	widget->chkBgTransparent->setDisabled(showFlag);
 
 	switch( m_kxkbConfig.m_switchingPolicy ) {
 		default:
@@ -234,21 +294,31 @@ 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);
+
 	updateStickyLimit();
 
 	widget->chkEnable->setChecked( m_kxkbConfig.m_useKxkb );
 	widget->grpLayouts->setEnabled( m_kxkbConfig.m_useKxkb );
-	widget->optionsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
+	widget->swOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
+	widget->indOptsFrame->setEnabled( m_kxkbConfig.m_useKxkb );
 
 	// display xkb options
-	TQStringList options = TQStringList::split(',', m_kxkbConfig.m_options);
-	for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+	TQStringList activeOptions = TQStringList::split(',', m_kxkbConfig.m_options);
+	bool foundGrp = false;
+	for (TQStringList::ConstIterator it = activeOptions.begin(); it != activeOptions.end(); ++it)
 	{
 		TQString option = *it;
 		TQString optionKey = option.mid(0, option.find(':'));
 		TQString optionName = m_rules->options()[option];
-		OptionListItem *item = m_optionGroups[i18n(optionKey.latin1())];
-		
+
+		if (optionKey == "grp") {
+			foundGrp = true;
+		}
+
+		OptionListItem *item = m_optionGroups[optionKey];
+
 		if (item != NULL) {
 			OptionListItem *child = item->findChildItem( option );
 
@@ -262,7 +332,15 @@ void LayoutConfig::initUI() {
 		}
 	}
 
+	if (!foundGrp) {
+		OptionListItem *grpNone = itemForOption("grp:none");
+		if (grpNone) {
+			grpNone->setOn(true);
+		}
+	}
+
 	updateOptionsCommand();
+	updateHotkeyCombo(true);
 	emit TDECModule::changed( false );
 }
 
@@ -272,26 +350,30 @@ void LayoutConfig::save()
 	TQString model = lookupLocalized(m_rules->models(), widget->comboModel->currentText());
 	m_kxkbConfig.m_model = model;
 
-	m_kxkbConfig.m_enableXkbOptions = widget->chkEnableOptions->isChecked();
-	m_kxkbConfig.m_resetOldOptions = widget->checkResetOld->isChecked();
+	m_kxkbConfig.m_resetOldOptions = widget->radXkbOverwrite->isOn();
 	m_kxkbConfig.m_options = createOptionString();
 
+	m_kxkbConfig.m_useThemeColors = widget->radLabelUseTheme->isChecked();
+	m_kxkbConfig.m_colorBackground = widget->bgColor->color();
+	m_kxkbConfig.m_colorLabel = widget->fgColor->color();
+	m_kxkbConfig.m_bgTransparent = widget->chkBgTransparent->isChecked();
+	m_kxkbConfig.m_labelFont = widget->labelFont->font();
+	m_kxkbConfig.m_labelShadow = widget->chkLabelShadow->isChecked();
+	m_kxkbConfig.m_colorShadow = widget->shColor->color();
+
 	TQListViewItem *item = widget->listLayoutsDst->firstChild();
 	TQValueList<LayoutUnit> layouts;
 	while (item) {
 		TQString layout = item->text(LAYOUT_COLUMN_MAP);
 		TQString variant = item->text(LAYOUT_COLUMN_VARIANT);
-		TQString includes = item->text(LAYOUT_COLUMN_INCLUDE);
 		TQString displayName = item->text(LAYOUT_COLUMN_DISPLAY_NAME);
-		
+
 		LayoutUnit layoutUnit(layout, variant);
-		layoutUnit.includeGroup = includes;
 		layoutUnit.displayName = displayName;
 		layouts.append( layoutUnit );
-		
+
 		item = item->nextSibling();
-		kdDebug() << "To save: layout " << layoutUnit.toPair() 
-				<< ", inc: " << layoutUnit.includeGroup 
+		kdDebug() << "To save: layout " << layoutUnit.toPair()
 				<< ", disp: " << layoutUnit.displayName << endl;
 	}
 	m_kxkbConfig.m_layouts = layouts;
@@ -303,7 +385,9 @@ void LayoutConfig::save()
 
 	m_kxkbConfig.m_useKxkb = widget->chkEnable->isChecked();
 	m_kxkbConfig.m_showSingle = widget->chkShowSingle->isChecked();
-	m_kxkbConfig.m_showFlag = widget->chkShowFlag->isChecked();
+
+	m_kxkbConfig.m_showFlag = ( widget->radFlagLabel->isChecked() || widget->radFlagOnly->isChecked() );
+	m_kxkbConfig.m_showLabel = ( widget->radFlagLabel->isChecked() || widget->radLabelOnly->isChecked() );
 
 	int modeId = widget->grpSwitching->id(widget->grpSwitching->selected());
 	switch( modeId ) {
@@ -322,9 +406,78 @@ 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();
-	
-	kapp->tdeinitExec("kxkb");
+
+	// We might need to unset previous hotkey options
+	if (m_forceGrpOverwrite)
+	{
+		// First get all the server's options
+		TQStringList srvOptions = TQStringList::split(",", XKBExtension::getServerOptions());
+		TQStringList newOptions;
+
+		// Then remove all grp: options
+		for (TQStringList::Iterator it = srvOptions.begin(); it != srvOptions.end(); ++it)
+		{
+			TQString opt(*it);
+			if (!opt.startsWith("grp:"))
+			{
+				newOptions << opt;
+			}
+		}
+
+		XkbOptions xkbOptions;
+		xkbOptions.options = newOptions.join(",");
+		xkbOptions.resetOld = true;
+
+		if (!XKBExtension::setXkbOptions(xkbOptions))
+		{
+			kdWarning() << "[LayoutConfig::save] Could not overwrite previous grp: options!" << endl;
+		}
+
+		m_forceGrpOverwrite = false;
+	}
+
+	// Save and apply global shortcuts
+	m_keyChooser->commitChanges();
+	keys->writeSettings(0, true);
+
+	// Get current layout from Kxkb
+	if (!kapp->dcopClient()->isAttached())
+		kapp->dcopClient()->attach();
+
+	DCOPRef kxkbref("kxkb", "kxkb");
+	DCOPReply reply = kxkbref.call( "getCurrentLayout" );
+
+	TQString currentLayout;
+	if ( reply.isValid() ) {
+		reply.get(currentLayout);
+	} else {
+		kdDebug() << "Warning: cannot get current layout! (invalid DCOP reply from Kxkb)" << endl;
+	}
+
+	// Cause Kxkb to reread configuration
+	kapp->tdeinitExecWait("kxkb");
+
+	// If previous call was valid, try to change layout
+	if ( reply.isValid() ) {
+		DCOPReply successReply = kxkbref.call( "setLayout", currentLayout );
+
+		if ( successReply.isValid() ) {
+			bool success;
+			successReply.get(success);
+
+			if ( ! success )
+				kdDebug() << "Warning: restoring previous layout failed!" << endl;
+		} else {
+			kdDebug() << "Warning: cannot restore previous layout! (invalid DCOP reply from Kxkb)" << endl;
+		}
+	}
+
+	updateHotkeyCombo();
+
 	emit TDECModule::changed( false );
 }
 
@@ -347,11 +500,11 @@ void LayoutConfig::updateStickyLimit()
 {
     int layoutsCnt = widget->listLayoutsDst->childCount();
 	int maxDepth = layoutsCnt - 1;
-	
+
 	if( maxDepth < 2 ) {
 		maxDepth = 2;
 	}
-	
+
 	widget->spinStickyDepth->setMaxValue(maxDepth);
 /*	if( value > maxDepth )
 		setValue(maxDepth);*/
@@ -366,9 +519,6 @@ void LayoutConfig::add()
     // Create a copy of the sel widget, as one might add the same layout more
     // than one time, with different variants.
     TQListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst);
-    
-    // Turn on "Include Latin layout" for new language by default (bnc:204402)
-    toadd->setText(LAYOUT_COLUMN_INCLUDE, "us");
 
     widget->listLayoutsDst->insertItem(toadd);
     if( widget->listLayoutsDst->childCount() > 1 )
@@ -376,12 +526,12 @@ void LayoutConfig::add()
 // disabling temporary: does not work reliable in Qt :(
 //    widget->listLayoutsDst->setSelected(sel, true);
 //    layoutSelChanged(sel);
-	
+
     updateStickyLimit();
     changed();
 }
 
-void LayoutConfig::remove() 
+void LayoutConfig::remove()
 {
     TQListViewItem* sel = widget->listLayoutsDst->selectedItem();
     TQListViewItem* newSel = 0;
@@ -430,17 +580,18 @@ void LayoutConfig::moveDown()
 
 void LayoutConfig::variantChanged()
 {
-    TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
-    if( selLayout == NULL ) {
-      widget->comboVariant->clear();
-      widget->comboVariant->setEnabled(false);
-      return;
-    }
+	TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
+	if( selLayout == NULL ) {
+		widget->comboVariant->clear();
+		widget->comboVariant->setEnabled(false);
+		return;
+	}
 
 	TQString selectedVariant = widget->comboVariant->currentText();
 	if( selectedVariant == DEFAULT_VARIANT_NAME )
 		selectedVariant = "";
 	selLayout->setText(LAYOUT_COLUMN_VARIANT, selectedVariant);
+	updateLayoutCommand();
 }
 
 // helper
@@ -456,15 +607,15 @@ void LayoutConfig::displayNameChanged(const TQString& newDisplayName)
 	TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
 	if( selLayout == NULL )
 		return;
-	
+
 	const LayoutUnit layoutUnitKey = getLayoutUnitKey( selLayout );
 	LayoutUnit& layoutUnit = *m_kxkbConfig.m_layouts.find(layoutUnitKey);
-	
+
 	TQString oldName = selLayout->text(LAYOUT_COLUMN_DISPLAY_NAME);
-	 
+
 	if( oldName.isEmpty() )
 		oldName = KxkbConfig::getDefaultDisplayName( layoutUnit );
-	
+
 	if( oldName != newDisplayName ) {
 		kdDebug() << "setting label for " << layoutUnit.toPair() << " : " << newDisplayName << endl;
 		selLayout->setText(LAYOUT_COLUMN_DISPLAY_NAME, newDisplayName);
@@ -479,33 +630,10 @@ void LayoutConfig::updateIndicator(TQListViewItem* selLayout)
 {
 }
 
-
-void LayoutConfig::latinChanged()
-{
-    TQListViewItem* selLayout = widget->listLayoutsDst->selectedItem();
-    if (  !selLayout ) {
-      widget->chkLatin->setChecked( false );
-      widget->chkLatin->setEnabled( false );
-      return;
-    }
-
-	TQString include;
-	if( widget->chkLatin->isChecked() )
-		include = "us";
-    else
-		include = "";
-	selLayout->setText(LAYOUT_COLUMN_INCLUDE, include);
-
- 	LayoutUnit layoutUnitKey = getLayoutUnitKey(selLayout);
-	kdDebug() << "layout " << layoutUnitKey.toPair() << ", inc: " << include << endl;
-}
-
 void LayoutConfig::layoutSelChanged(TQListViewItem *sel)
 {
     widget->comboVariant->clear();
     widget->comboVariant->setEnabled( sel != NULL );
-    widget->chkLatin->setChecked( false );
-    widget->chkLatin->setEnabled( sel != NULL );
 
     if( sel == NULL ) {
         updateLayoutCommand();
@@ -516,28 +644,13 @@ void LayoutConfig::layoutSelChanged(TQListViewItem *sel)
 	LayoutUnit layoutUnitKey = getLayoutUnitKey(sel);
 	TQString kbdLayout = layoutUnitKey.layout;
 
-	// TODO: need better algorithm here for determining if needs us group
-    if (  ! m_rules->isSingleGroup(kbdLayout) 
-	    		|| kbdLayout.startsWith("us") || kbdLayout.startsWith("en") ) {
-        widget->chkLatin->setEnabled( false );
-    }
-    else {
-		TQString inc = sel->text(LAYOUT_COLUMN_INCLUDE);
-		if ( inc.startsWith("us") || inc.startsWith("en") ) {
-            widget->chkLatin->setChecked(true);
-        }
-        else {
-            widget->chkLatin->setChecked(false);
-        }
-    }
-
 	TQStringList vars = m_rules->getAvailableVariants(kbdLayout);
 	kdDebug() << "layout " << kbdLayout << " has " << vars.count() << " variants" << endl;
-    
+
 	if( vars.count() > 0 ) {
 		vars.prepend(DEFAULT_VARIANT_NAME);
 		widget->comboVariant->insertStringList(vars);
-	
+
 		TQString variant = sel->text(LAYOUT_COLUMN_VARIANT);
 		if( variant != NULL && variant.isEmpty() == false ) {
 			widget->comboVariant->setCurrentText(variant);
@@ -558,13 +671,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(updateOptionsCommand()));
-
-  connect(widget->chkEnableOptions, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
+  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->checkResetOld, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
-  connect(widget->checkResetOld, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateOptionsCommand()));
+  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());
@@ -574,19 +687,26 @@ TQWidget* LayoutConfig::makeOptionsTab()
     if (!it.currentKey().contains(':'))
     {
       if( it.currentKey() == "ctrl" || it.currentKey() == "caps"
-          || it.currentKey() == "altwin" ) {
-        parent = new OptionListItem(listView, i18n( it.current() ),
+          || it.currentKey() == "altwin") {
+        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, 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);
     }
   }
 
@@ -604,12 +724,13 @@ TQWidget* LayoutConfig::makeOptionsTab()
       // workaroung for mistake in rules file for xkb options in XFree 4.2.0
         TQString text(it.current());
         text = text.replace( "Cap$", "Caps." );
-        if( parent->type() == TQCheckListItem::RadioButtonController )
-            new OptionListItem(parent, i18n(text.utf8()),
-                TQCheckListItem::RadioButton, key);
-        else
-            new OptionListItem(parent, i18n(text.utf8()),
+        if ( parent->type() == TQCheckListItem::CheckBoxController
+             || key.startsWith("grp:"))
+            new OptionListItem(parent, XkbRules::trOpt(text),
                 TQCheckListItem::CheckBox, key);
+        else
+            new OptionListItem(parent, XkbRules::trOpt(text),
+                TQCheckListItem::RadioButton, key);
       }
     }
   }
@@ -619,68 +740,368 @@ TQWidget* LayoutConfig::makeOptionsTab()
   return listView;
 }
 
+TQWidget* LayoutConfig::makeShortcutsTab() {
+  m_keyChooser = new KKeyChooser(keys, widget->tabShortcuts, false, false);
+  connect(m_keyChooser, TQ_SIGNAL(keyChange()), this, TQ_SLOT(changed()));
+  widget->tabShortcuts->layout()->add(m_keyChooser);
+  return m_keyChooser;
+}
+
 void LayoutConfig::updateOptionsCommand()
 {
   TQString setxkbmap;
   TQString options = createOptionString();
+  bool overwrite = widget->radXkbOverwrite->isOn();
 
   if( !options.isEmpty() ) {
     setxkbmap = "setxkbmap -option "; //-rules " + m_rule
-    if( widget->checkResetOld->isChecked() )
+    if (overwrite)
       setxkbmap += "-option ";
     setxkbmap += options;
   }
+  else if (overwrite) {
+    setxkbmap = "setxkbmap -option";
+  }
   widget->editCmdLineOpt->setText(setxkbmap);
+  widget->editCmdLineOpt->setDisabled(setxkbmap.isEmpty());
 }
 
 void LayoutConfig::updateLayoutCommand()
 {
-  TQString setxkbmap;
-  TQString layoutDisplayName;
-  TQListViewItem* sel = widget->listLayoutsDst->selectedItem();
-
-  if( sel != NULL ) {
-    TQString kbdLayout = sel->text(LAYOUT_COLUMN_MAP);
-    TQString variant = widget->comboVariant->currentText();
-	if( variant == DEFAULT_VARIANT_NAME )
-		variant = "";
-
-    setxkbmap = "setxkbmap"; //-rules " + m_rule
-    setxkbmap += " -model " + lookupLocalized(m_rules->models(), widget->comboModel->currentText())
-      + " -layout ";
-    setxkbmap += kbdLayout;
-    if( widget->chkLatin->isChecked() )
-      setxkbmap += ",us";
-
-/*	LayoutUnit layoutUnitKey = getLayoutUnitKey(sel);
-	layoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_layouts.find(layoutUnitKey) );*/
-	layoutDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME);
-	if( layoutDisplayName.isEmpty() ) {
-		int count = 0;
-		TQListViewItem *item = widget->listLayoutsDst->firstChild();
-		while (item) {
-			TQString layout_ = item->text(LAYOUT_COLUMN_MAP);
-			if( layout_ == kbdLayout )
-				++count;
-			item = item->nextSibling();
-		}
-		bool single = count < 2;
-		layoutDisplayName = m_kxkbConfig.getDefaultDisplayName(LayoutUnit(kbdLayout, variant), single);
-	}
-	kdDebug() << "disp: '" << layoutDisplayName << "'" << endl;
-	
-    if( !variant.isEmpty() ) {
-      setxkbmap += " -variant ";
-      if( widget->chkLatin->isChecked() )
-        setxkbmap += ",";
-      setxkbmap += variant;
+  TQString setxkbmap = "setxkbmap";
+  setxkbmap += " -model " + lookupLocalized(m_rules->models(),
+                                            widget->comboModel->currentText());
+  TQStringList layoutCodes;
+  TQStringList layoutVariants;
+  TQListViewItem *item = widget->listLayoutsDst->firstChild();
+  while (item) {
+    layoutCodes << item->text(LAYOUT_COLUMN_MAP);
+
+    TQString layoutVariant = item->text(LAYOUT_COLUMN_VARIANT);
+    if (layoutVariant == DEFAULT_VARIANT_NAME) {
+      layoutVariant = "";
     }
+    layoutVariants << layoutVariant;
+
+    item = item->nextSibling();
   }
-  
+
+  setxkbmap += " -layout " + layoutCodes.join(",");
+
+  if( !layoutVariants.isEmpty() ) {
+    setxkbmap += " -variant " + layoutVariants.join(",");
+  }
+
   widget->editCmdLine->setText(setxkbmap);
-  
+
+  /* update display name field */
+  TQListViewItem *sel = widget->listLayoutsDst->selectedItem();
+  if (!sel) {
+    return;
+  }
+  TQString selLayoutCode = sel->text(LAYOUT_COLUMN_MAP);
+  TQString selLayoutVariant = widget->comboVariant->currentText();
+  TQString selDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME);
+  if (selDisplayName.isEmpty()) {
+    int count = 0;
+    TQListViewItem *item = widget->listLayoutsDst->firstChild();
+    while (item) {
+      TQString layoutCode_ = item->text(LAYOUT_COLUMN_MAP);
+      if (layoutCode_ == selLayoutCode) {
+        ++count;
+      }
+      item = item->nextSibling();
+    }
+    bool single = count < 2;
+    selDisplayName = m_kxkbConfig.getDefaultDisplayName(LayoutUnit(selLayoutCode, selLayoutVariant), single);
+  }
+
   widget->editDisplayName->setEnabled( sel != NULL );
-  widget->editDisplayName->setText(layoutDisplayName);
+  widget->editDisplayName->setText(selDisplayName);
+}
+
+void LayoutConfig::checkConflicts(OptionListItem *current,
+                                  TQStringList conflicting,
+                                  TQStringList &conflicts)
+{
+    if (!current || conflicting.count() < 2 ||
+        !conflicting.contains(current->optionName()))
+    {
+        return;
+    }
+    TQStringList::Iterator it;
+    for (it = conflicting.begin(); it != conflicting.end(); ++it) {
+        TQString option(*it);
+        if (option == current->optionName()) {
+            continue;
+        }
+
+        OptionListItem *item = itemForOption(option);
+        if (item && item->isOn()) {
+            conflicts << item->text();
+        }
+    }
+}
+
+void LayoutConfig::resolveConflicts(TQListViewItem *lvi) {
+    OptionListItem *current = (OptionListItem*)lvi;
+
+    kdDebug() << "resolveConflicts : " << current->optionName() << endl;
+
+    if (current->optionName().startsWith("grp:")) {
+        OptionListItem *grpItem = m_optionGroups["grp"];
+        if (grpItem == NULL) {
+            kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+            return;
+        }
+
+        OptionListItem *noneItem = grpItem->findChildItem("grp:none");
+        if (!noneItem) {
+            kdDebug() << "LayoutConfig: unable to find None item for grp!" << endl;
+        }
+        else {
+            // Option "none" selected, uncheck all other options immediately
+            if (current->optionName() == "grp:none") {
+                if (current->isOn()) {
+                    OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+                    while (child) {
+                        if (child != current) {
+                            child->setOn(false);
+                        }
+                        child = (OptionListItem*)child->nextSibling();
+                    }
+                }
+                else {
+                    current->setOn(true);
+                }
+                updateOptionsCommand();
+                return;
+            }
+
+            // If no options are selected then select "none"
+            bool notNone = false;
+            OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+            while (child) {
+                if (child->isOn() && child->optionName() != "none") {
+                    notNone = true;
+                    break;
+                }
+                child = (OptionListItem*)child->nextSibling();
+            }
+
+            noneItem->setOn(!notNone);
+        }
+    }
+
+    TQStringList conflicts;
+    OptionListItem *conflict;
+
+    TQStringList conflicting;
+    /* Might be incomplete */
+    // Space
+    conflicting << "grp:win_space_toggle"
+                << "grp:alt_space_toggle"
+                << "grp:ctrl_space_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Shift
+    conflicting.clear();
+    conflicting << "grp:ctrl_shift_toggle"
+                << "grp:alt_shift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Control
+    conflicting.clear();
+    conflicting << "grp:ctrl_select"
+                << "grp:ctrl_alt_toggle"
+                << "grp:ctrl_shift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Left Ctrl
+    conflicting.clear();
+    conflicting << "grp:lctrl_toggle"
+                << "grp:lctrl_lshift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Right Ctrl
+    conflicting.clear();
+    conflicting << "grp:rctrl_toggle"
+                << "grp:rctrl_rshift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Win
+    conflicting.clear();
+    conflicting << "grp:win_space_toggle"
+                << "grp:win_switch"
+                << "win_menu_select";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Left Alt
+    conflicting.clear();
+    conflicting << "grp:lalt_toggle"
+                << "grp:lalt_lshift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Right Alt
+    conflicting.clear();
+    conflicting << "grp:ralt_toggle"
+                << "grp:ralt_rshift_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    // Caps Lock
+    conflicting.clear();
+    conflicting << "grp:caps_toggle"
+                << "grp:caps_select"
+                << "grp:caps_switch"
+                << "grp:alt_caps_toggle";
+    checkConflicts(current, conflicting, conflicts);
+
+    if (conflicts.count()) {
+        TQString curText = current->text();
+        int confirm = KMessageBox::warningYesNoList(this,
+                          i18n("<qt>The option <b>%1</b> might conflict with "
+                               "other options that you have already enabled.<br>"
+                               "Are you sure that you really want to enable "
+                               "<b>%2</b>?</qt>")
+                               .arg(curText).arg(curText),
+                          conflicts,
+                          i18n("Conflicting options"));
+        if (confirm == KMessageBox::No) {
+            current->setOn(false);
+        }
+    }
+    updateOptionsCommand();
+}
+
+// Synchronizes Xkb grp options --> hotkeys combobox
+void LayoutConfig::updateHotkeyCombo() {
+    updateHotkeyCombo(false);
+}
+
+void LayoutConfig::updateHotkeyCombo(bool initial) {
+    OptionListItem *grpItem = m_optionGroups["grp"];
+    if (grpItem == NULL) {
+        kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+        return;
+    }
+
+    TQStringList hotkeys;
+
+    // Get server options first
+    if (initial || widget->xkbOptsMode->selectedId() == 1)
+    {
+        TQStringList opts = TQStringList::split(",", XKBExtension::getServerOptions());
+        for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
+        {
+            TQString option(*it);
+
+            if (!option.startsWith("grp:"))
+            {
+                continue;
+            }
+
+            // Get description from existing item
+            // This spares us the trouble of querying Xkb rules second time
+            OptionListItem *item = itemForOption(option);
+            if (!item)
+            {
+                kdWarning() << "[updateHotkeyCombo] server has set unknown option: "
+                            << option << endl;
+                continue;
+            }
+
+            TQString optionName = item->text();
+            if (!hotkeys.contains(optionName) && option != "grp:none")
+            {
+                hotkeys << optionName;
+            }
+        }
+    }
+
+    OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+    while (child) {
+        TQString optionText = child->text();
+        if (child->isOn() && !hotkeys.contains(optionText) && child->optionName() != "grp:none") {
+            hotkeys << optionText;
+        }
+        child = (OptionListItem*)child->nextSibling();
+    }
+
+    if (!hotkeys.count()) {
+        OptionListItem *noneItem = itemForOption("grp:none");
+        if (noneItem)
+        {
+            hotkeys << noneItem->text();
+        }
+        else
+        {
+            kdWarning() << "[updateHotkeyCombo] cannot find grp:none item!" << endl;
+            hotkeys << widget->comboHotkey->text(0); // fallback
+        }
+    }
+
+    int other = widget->comboHotkey->count() - 1;
+    widget->comboHotkey->changeItem(i18n("Custom..."), other);
+    if (hotkeys.count() < 2) {
+        bool found = false;
+        for (int i = 0; i < widget->comboHotkey->count(); ++i) {
+            if (hotkeys[0] == widget->comboHotkey->text(i)) {
+                widget->comboHotkey->setCurrentItem(i);
+                found = true;
+            }
+        }
+        if (!found) {
+            widget->comboHotkey->changeItem(i18n("Other (%1)").arg(hotkeys[0]),
+                                            other);
+            widget->comboHotkey->setCurrentItem(other);
+        }
+    }
+    else {
+        widget->comboHotkey->changeItem(i18n("Multiple (%1)").arg(hotkeys.join("; ")),
+                                        other);
+        widget->comboHotkey->setCurrentItem(other);
+    }
+}
+
+// Synchronizes hotkeys combobox --> Xkb grp options
+void LayoutConfig::hotkeyComboChanged() {
+    TQStringList hotkeys;
+    int other = widget->comboHotkey->count() - 1;
+
+    if (widget->comboHotkey->currentItem() != other) {
+        hotkeys << widget->comboHotkey->currentText();
+    }
+    else {
+        TQString otherStr = widget->comboHotkey->text(other);
+        int i1 = otherStr.find("(");
+        if (i1 != -1) { // custom hotkey(s) set
+            ++i1;
+            int i2 = otherStr.findRev(")");
+            if (i2 != -1) {
+                hotkeys = TQStringList::split("; ", otherStr.mid(i1, i2-i1));
+            }
+        }
+    }
+
+    OptionListItem *grpItem = m_optionGroups["grp"];
+    if (grpItem == NULL) {
+        kdWarning() << "LayoutConfig: cannot find grp item group" << endl;
+        return;
+    }
+
+    OptionListItem *child = (OptionListItem*)grpItem->firstChild();
+    while (child) {
+        child->setOn(hotkeys.contains(child->text()));
+        child = (OptionListItem*)child->nextSibling();
+    }
+
+    if (widget->comboHotkey->currentItem() == other) {
+        widget->tabWidget->setCurrentPage(4);
+        widget->listOptions->ensureItemVisible(grpItem);
+        widget->listOptions->setFocus();
+    }
+
+    m_forceGrpOverwrite = true;
 }
 
 void LayoutConfig::changed()
@@ -704,7 +1125,7 @@ void LayoutConfig::loadRules()
         ++it;
     }
     modelsList.sort();
-	
+
 	widget->comboModel->clear();
 	widget->comboModel->insertStringList(modelsList);
 	widget->comboModel->setCurrentItem(0);
@@ -713,23 +1134,37 @@ void LayoutConfig::loadRules()
 	widget->listLayoutsSrc->clear();
 	widget->listLayoutsDst->clear();
 	TQDictIterator<char> it2(m_rules->layouts());
-	
+
 	while (it2.current())
 	{
 		TQString layout = it2.currentKey();
 		TQString layoutName = it2.current();
 		TQListViewItem *item = new TQListViewItem(widget->listLayoutsSrc);
-		
-		item->setPixmap(LAYOUT_COLUMN_FLAG, LayoutIcon::getInstance().findPixmap(layout, true));
+
+		item->setPixmap(LAYOUT_COLUMN_FLAG, LayoutIcon::getInstance().findPixmap(layout, false));
 		item->setText(LAYOUT_COLUMN_NAME, i18n(layoutName.latin1()));
 		item->setText(LAYOUT_COLUMN_MAP, layout);
 		++it2;
 	}
 	widget->listLayoutsSrc->setSorting(LAYOUT_COLUMN_NAME);	// from Qt3 TQListView sorts by language
-	
+
 	//TODO: reset options and xkb options
 }
 
+OptionListItem* LayoutConfig::itemForOption(TQString option) {
+    if (!option.contains(':')) {
+        return nullptr;
+    }
+
+    TQString optionKey = option.mid(0, option.find(':'));
+    OptionListItem *item = m_optionGroups[optionKey];
+
+    if( !item ) {
+        kdDebug() << "WARNING: skipping empty group for " << option << endl;
+        return nullptr;
+    }
+    return (OptionListItem*)item->findChildItem(option);
+}
 
 TQString LayoutConfig::createOptionString()
 {
@@ -737,32 +1172,17 @@ TQString LayoutConfig::createOptionString()
   for (TQDictIterator<char> it(m_rules->options()); it.current(); ++it)
   {
     TQString option(it.currentKey());
-
-    if (option.contains(':')) {
-
-      TQString optionKey = option.mid(0, option.find(':'));
-      OptionListItem *item = m_optionGroups[optionKey];
-
-      if( !item ) {
-        kdDebug() << "WARNING: skipping empty group for " << it.currentKey()
-          << endl;
-        continue;
-      }
-
-      OptionListItem *child = item->findChildItem( option );
-
-      if ( child ) {
-        if ( child->state() == TQCheckListItem::On ) {
-          TQString selectedName = child->optionName();
-          if ( !selectedName.isEmpty() && selectedName != "none" ) {
-            if (!options.isEmpty())
-              options.append(',');
-            options.append(selectedName);
-          }
-        }
+    OptionListItem *child = itemForOption(option);
+    if (!child) {
+      continue;
+    }
+    if ( child->state() == TQCheckListItem::On ) {
+      TQString selectedName = child->optionName();
+      if ( !selectedName.isEmpty() && selectedName != "none" ) {
+        if (!options.isEmpty())
+          options.append(',');
+        options.append(selectedName);
       }
-      else
-        kdDebug() << "Empty option button for group " << it.currentKey() << endl;
     }
   }
   return options;
@@ -813,29 +1233,25 @@ extern "C"
 	{
 		return new LayoutConfig(parent, "kcmlayout");
 	}
-	
+
 	KDE_EXPORT TDECModule *create_keyboard(TQWidget *parent, const char *)
 	{
 		return new KeyboardConfig(parent, "kcmlayout");
 	}
-	
+
 	KDE_EXPORT void init_keyboard()
 	{
 		KeyboardConfig::init_keyboard();
-		
+
 		KxkbConfig m_kxkbConfig;
 		m_kxkbConfig.load(KxkbConfig::LOAD_INIT_OPTIONS);
-	
+
 		if( m_kxkbConfig.m_useKxkb == true ) {
 			kapp->startServiceByDesktopName("kxkb");
 		}
 		else {
-		// Even if the layouts have been disabled we still want to set Xkb options
-		// user can always switch them off now in the "Options" tab
-			if( m_kxkbConfig.m_enableXkbOptions ) {
-				if( !XKBExtension::setXkbOptions(m_kxkbConfig.m_options, m_kxkbConfig.m_resetOldOptions) ) {
-					kdDebug() << "Setting XKB options failed!" << endl;
-				}
+			if (!XKBExtension::setXkbOptions(m_kxkbConfig.getKXkbOptions())) {
+				kdDebug() << "Setting XKB options failed!" << endl;
 			}
 		}
 	}
@@ -916,10 +1332,10 @@ extern "C"
  I18N_NOOP( "Left Alt key changes group" );
  I18N_NOOP( "Left Ctrl key changes group" );
  I18N_NOOP( "Compose Key" );
- 
+
 //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 987fff2b0..db0f89690 100644
--- a/kxkb/kcmlayout.h
+++ b/kxkb/kcmlayout.h
@@ -16,7 +16,7 @@ class XkbRules;
 
 class LayoutConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   LayoutConfig(TQWidget *parent = 0L, const char *name = 0L);
@@ -27,23 +27,27 @@ public:
   void defaults();
   void initUI();
   virtual TQString handbookDocPath() const;
-  
+
 protected:
   TQString createOptionString();
   void updateIndicator(TQListViewItem* selLayout);
+  OptionListItem* itemForOption(TQString option);
 
 protected slots:
   void moveUp();
   void moveDown();
+  void hotkeyComboChanged();
   void variantChanged();
   void displayNameChanged(const TQString& name);
-  void latinChanged();
   void layoutSelChanged(TQListViewItem *);
   void loadRules();
   void updateLayoutCommand();
   void updateOptionsCommand();
+  void updateHotkeyCombo();
+  void updateHotkeyCombo(bool initial);
   void add();
   void remove();
+  void resolveConflicts(TQListViewItem *lvi);
 
   void changed();
 
@@ -53,10 +57,16 @@ private:
   XkbRules *m_rules;
   KxkbConfig m_kxkbConfig;
   TQDict<OptionListItem> m_optionGroups;
+  bool m_forceGrpOverwrite;
+  KKeyChooser *m_keyChooser;
+  TDEGlobalAccel *keys;
 
   TQWidget* makeOptionsTab();
+  TQWidget* makeShortcutsTab();
   void updateStickyLimit();
   static LayoutUnit getLayoutUnitKey(TQListViewItem *sel);
+  void checkConflicts(OptionListItem *current, TQStringList conflicting,
+                      TQStringList &conflicts);
 };
 
 
diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui
index 2830c10e9..11d147211 100644
--- a/kxkb/kcmlayoutwidget.ui
+++ b/kxkb/kcmlayoutwidget.ui
@@ -76,7 +76,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>textLabel1_4</cstring>
                                 </property>
@@ -86,7 +86,7 @@
                             </widget>
                             <widget class="TQLabel" row="2" column="2" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>textLabel1_4_2</cstring>
+                                    <cstring>labelLayouts</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Active layouts:</string>
@@ -94,7 +94,7 @@
                             </widget>
                             <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>textLabel1_2</cstring>
+                                    <cstring>labelModel</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Keyboard &amp;model:</string>
@@ -167,17 +167,6 @@
                                 </column>
                                 <column>
                                     <property name="text">
-                                        <string>5</string>
-                                    </property>
-                                    <property name="clickable">
-                                        <bool>false</bool>
-                                    </property>
-                                    <property name="resizable">
-                                        <bool>false</bool>
-                                    </property>
-                                </column>
-                                <column>
-                                    <property name="text">
                                         <string>Label</string>
                                     </property>
                                     <property name="clickable">
@@ -266,7 +255,7 @@
                                     <cstring>editCmdLine</cstring>
                                 </property>
                             </widget>
-                            <widget class="TQListView" row="3" column="0" rowspan="5" colspan="2">
+                            <widget class="TQListView" row="1" column="0" rowspan="6" colspan="2">
                                 <column>
                                     <property name="text">
                                         <string></string>
@@ -327,20 +316,6 @@
                                     <string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of TDE.</string>
                                 </property>
                             </widget>
-                            <widget class="TQCheckBox" row="7" column="2" rowspan="1" colspan="3">
-                                <property name="name">
-                                    <cstring>chkLatin</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="text">
-                                    <string>Include latin layout</string>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>If after you switch to this layout some keyboard shortcuts based on latin keys do not work try to enable this option.</string>
-                                </property>
-                            </widget>
                             <widget class="TQLabel" row="6" column="2">
                                 <property name="name">
                                     <cstring>textLabel1_6</cstring>
@@ -423,35 +398,68 @@
             </widget>
             <widget class="TQWidget">
                 <property name="name">
-                    <cstring>tab</cstring>
+                    <cstring>tabShortcuts</cstring>
                 </property>
                 <attribute name="title">
-                    <string>Switching Options</string>
+                    <string>Keyboard Shortcuts</string>
                 </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="1" column="0">
+                <vbox>
+                    <widget class="TQLabel">
                         <property name="name">
-                            <cstring>spacer1</cstring>
+                            <cstring>labelHotkey</cstring>
                         </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
+                        <property name="text">
+                            <string>&lt;qt&gt;&lt;b&gt;Key combination to switch layout (X11):&lt;/b&gt;&lt;/qt&gt;</string>
                         </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
+                        <property name="buddy" stdset="0">
+                            <cstring>comboHotkey</cstring>
                         </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>20</width>
-                                <height>40</height>
-                            </size>
+                    </widget>
+                    <widget class="TQComboBox">
+                        <property name="name">
+                            <cstring>comboHotkey</cstring>
                         </property>
-                    </spacer>
-                    <widget class="TQFrame" row="0" column="0">
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>7</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>Here you can choose the key combination you want to use to switch to the next layout. This list includes only the most common variants. If you choose "Other...", then you will be redirected to the "Options" tab where you can pick from all the available variants. Note that if you have selected Append Mode in the Xkb Options tab this option is not available; you have to use the Xkb Options tab instead.</string>
+                        </property>
+                    </widget>
+                    <widget class="KSeparator">
                         <property name="name">
-                            <cstring>optionsFrame</cstring>
+                            <cstring>switchingGrpSeparator</cstring>
+                        </property>
+                    </widget>
+                    <widget class="TQLabel">
+                        <property name="name">
+                            <cstring>labelHotkey</cstring>
+                        </property>
+                        <property name="text">
+                            <string>&lt;qt&gt;&lt;b&gt;TDE shortcuts to switch layout:&lt;/b&gt;&lt;/qt&gt;</string>
+                        </property>
+                        <property name="buddy" stdset="0">
+                            <cstring>comboHotkey</cstring>
+                        </property>
+                    </widget>
+                </vbox>
+            </widget>
+            <widget class="TQWidget">
+                <property name="name">
+                    <cstring>tab</cstring>
+                </property>
+                <attribute name="title">
+                    <string>Switching Options</string>
+                </attribute>
+                <vbox>
+                    <widget class="TQFrame">
+                        <property name="name">
+                            <cstring>swOptsFrame</cstring>
                         </property>
                         <property name="frameShape">
                             <enum>StyledPanel</enum>
@@ -462,11 +470,8 @@
                         <property name="lineWidth">
                             <number>0</number>
                         </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="TQButtonGroup" row="2" column="0">
+                        <vbox>
+                            <widget class="TQButtonGroup">
                                 <property name="name">
                                     <cstring>grpSwitching</cstring>
                                 </property>
@@ -512,21 +517,7 @@
                                     </widget>
                                 </vbox>
                             </widget>
-                            <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>chkShowFlag</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Show country flag</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>Shows country flag on background of layout name in tray icon</string>
-                                </property>
-                            </widget>
-                            <widget class="TQGroupBox" row="2" column="1">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>grpBoxStickySwitching</cstring>
                                 </property>
@@ -537,7 +528,7 @@
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
                                         <property name="name">
                                             <cstring>chkEnableSticky</cstring>
                                         </property>
@@ -548,7 +539,41 @@
                                             <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string>
                                         </property>
                                     </widget>
-                                    <widget class="TQLabel" row="1" column="0">
+                                    <spacer row="1" column="0">
+                                        <property name="name">
+                                            <cstring>spacer2</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>
+                                    <spacer row="1" column="3">
+                                        <property name="name">
+                                            <cstring>spacer2</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Expanding</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="TQLabel" row="1" column="1">
                                         <property name="name">
                                             <cstring>textLabel1_5</cstring>
                                         </property>
@@ -562,7 +587,7 @@
                                             <cstring>spinBox1</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="TQSpinBox" row="1" column="1">
+                                    <widget class="TQSpinBox" row="1" column="2">
                                         <property name="name">
                                             <cstring>spinStickyDepth</cstring>
                                         </property>
@@ -575,20 +600,455 @@
                                         <property name="minValue">
                                             <number>2</number>
                                         </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>5</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQGroupBox">
                                 <property name="name">
-                                    <cstring>chkShowSingle</cstring>
+                                    <cstring>grpBoxNotifications</cstring>
                                 </property>
-                                <property name="text">
-                                    <string>Show indicator for single layout</string>
+                                <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>
+                        <property name="name">
+                            <cstring>spacer2</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>40</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
+            </widget>
+            <widget class="TQWidget">
+                <property name="name">
+                    <cstring>tab</cstring>
+                </property>
+                <attribute name="title">
+                    <string>Indicator Options</string>
+                </attribute>
+                <vbox>
+                    <widget class="TQFrame">
+                        <property name="name">
+                            <cstring>indOptsFrame</cstring>
+                        </property>
+                        <property name="frameShape">
+                            <enum>StyledPanel</enum>
+                        </property>
+                        <property name="frameShadow">
+                            <enum>Raised</enum>
+                        </property>
+                        <property name="lineWidth">
+                            <number>0</number>
+                        </property>
+                        <grid>
+                            <widget class="TQButtonGroup" row="0" column="0">
+                                <property name="name">
+                                    <cstring>grpStyle</cstring>
+                                </property>
+                                <property name="title">
+                                    <string>Indicator Style</string>
+                                </property>
+                                <property name="exclusive">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Here you can choose the way your keyboard layout indicator will look.</string>
+                                </property>
+                                <vbox>
+                                    <property name="name">
+                                        <cstring>unnamed</cstring>
+                                    </property>
+                                    <widget class="TQRadioButton">
+                                        <property name="name">
+                                            <cstring>radFlagLabel</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>&amp;Both Flag and Label</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>true</bool>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQRadioButton">
+                                        <property name="name">
+                                            <cstring>radFlagOnly</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>&amp;Flag Only</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQRadioButton">
+                                        <property name="name">
+                                            <cstring>radLabelOnly</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>&amp;Label Only</string>
+                                        </property>
+                                    </widget>
+                                </vbox>
+                            </widget>
+                            <widget class="TQButtonGroup" row="1" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>grpLabel</cstring>
+                                </property>
+                                <property name="title">
+                                    <string>Label Style</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Here you can choose the way the label of your keyboard layout indicator will be displayed. These options are relevant even when labels are disabled, for locales where the flag is missing.</string>
+                                </property>
+                                <grid>
+                                    <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="3">
+                                        <property name="name">
+                                            <cstring>radLabelUseTheme</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Use &amp;theme colors</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>false</bool>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3">
+                                        <property name="name">
+                                            <cstring>radLabelUseCustom</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Use c&amp;ustom colors</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>false</bool>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQFrame" row="2" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>grpLabelColors</cstring>
+                                        </property>
+                                        <property name="frameShape">
+                                            <enum>NoFrame</enum>
+                                        </property>
+                                        <property name="frameShadow">
+                                            <enum>Plain</enum>
+                                        </property>
+                                        <grid>
+                                            <property name="margin">
+                                                <number>0</number>
+                                            </property>
+                                            <spacer row="0" column="0">
+                                                <property name="name">
+                                                    <cstring>spacer2</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="TQLabel" row="0" column="1">
+                                                <property name="name">
+                                                    <cstring>labelBgColor</cstring>
+                                                </property>
+                                                <property name="text">
+                                                    <string>Background color:</string>
+                                                </property>
+                                                <property name="whatsThis" stdset="0">
+                                                    <string>This color will be used as the indicator's background unless the indicator was set to display a flag.</string>
+                                                </property>
+                                            </widget>
+                                            <widget class="KColorButton" row="0" column="2">
+                                                <property name="name">
+                                                    <cstring>bgColor</cstring>
+                                                </property>
+                                                <property name="whatsThis" stdset="0">
+                                                    <string>This color will be used as the indicator's background unless the indicator was set to display a flag.</string>
+                                                </property>
+                                                <property name="sizePolicy">
+                                                    <sizepolicy>
+                                                        <hsizetype>4</hsizetype>
+                                                        <vsizetype>0</vsizetype>
+                                                        <horstretch>0</horstretch>
+                                                        <verstretch>0</verstretch>
+                                                    </sizepolicy>
+                                                </property>
+                                            </widget>
+                                            <spacer row="0" column="3">
+                                                <property name="name">
+                                                    <cstring>spacer23</cstring>
+                                                </property>
+                                                <property name="orientation">
+                                                    <enum>Horizontal</enum>
+                                                </property>
+                                                <property name="sizeType">
+                                                    <enum>Expanding</enum>
+                                                </property>
+                                                <property name="sizeHint">
+                                                    <size>
+                                                        <width>20</width>
+                                                        <height>20</height>
+                                                    </size>
+                                                </property>
+                                            </spacer>
+                                            <spacer row="1" column="0">
+                                                <property name="name">
+                                                    <cstring>spacer2</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="TQLabel" row="1" column="1">
+                                                <property name="name">
+                                                    <cstring>labelFgColor</cstring>
+                                                </property>
+                                                <property name="text">
+                                                    <string>Text color:</string>
+                                                </property>
+                                                <property name="whatsThis" stdset="0">
+                                                    <string>This color will be used to draw the language label on the indicator.</string>
+                                                </property>
+                                            </widget>
+                                            <widget class="KColorButton" row="1" column="2">
+                                                <property name="name">
+                                                    <cstring>fgColor</cstring>
+                                                </property>
+                                                <property name="whatsThis" stdset="0">
+                                                    <string>This color will be used to draw the language label on the indicator.</string>
+                                                </property>
+                                                <property name="sizePolicy">
+                                                    <sizepolicy>
+                                                        <hsizetype>4</hsizetype>
+                                                        <vsizetype>0</vsizetype>
+                                                        <horstretch>0</horstretch>
+                                                        <verstretch>0</verstretch>
+                                                    </sizepolicy>
+                                                </property>
+                                            </widget>
+                                            <spacer row="1" column="3">
+                                                <property name="name">
+                                                    <cstring>spacer23</cstring>
+                                                </property>
+                                                <property name="orientation">
+                                                    <enum>Horizontal</enum>
+                                                </property>
+                                                <property name="sizeType">
+                                                    <enum>Expanding</enum>
+                                                </property>
+                                                <property name="sizeHint">
+                                                    <size>
+                                                        <width>20</width>
+                                                        <height>20</height>
+                                                    </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="KSeparator" row="5" column="0" rowspan="1" colspan="3">
+                                        <property name="name">
+                                            <cstring>separator1</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQLabel" row="6" column="0">
+                                        <property name="name">
+                                            <cstring>labelFontRequester</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Label font:</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>This is the font which will be used by the layout indicator to draw the label.</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TDEFontRequester" row="6" column="1" colspan="2">
+                                        <property name="name">
+                                            <cstring>labelFont</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox" row="7" column="0">
+                                        <property name="name">
+                                            <cstring>chkLabelShadow</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Enable shadow</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>Draw a drop shadow behind the language label. In some cases this option can improve readability.</string>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>4</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                    </widget>
+                                    <widget class="KColorButton" row="7" column="1">
+                                        <property name="name">
+                                            <cstring>shColor</cstring>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>The drop shadow behind the language label will be of this color.</string>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="sizePolicy">
+                                            <sizepolicy>
+                                                <hsizetype>4</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                                <horstretch>0</horstretch>
+                                                <verstretch>0</verstretch>
+                                            </sizepolicy>
+                                        </property>
+                                    </widget>                                           <spacer row="7" column="2">
+                                        <property name="name">
+                                            <cstring>spacer23</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Expanding</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                </grid>
+                            </widget>
+                            <widget class="TQButtonGroup" row="0" column="1">
+                                <property name="name">
+                                    <cstring>grpMisc</cstring>
                                 </property>
+                                <property name="title">
+                                    <string>Miscellaneous</string>
+                                </property>
+                                <vbox>
+                                    <widget class="TQCheckBox">
+                                        <property name="name">
+                                            <cstring>chkShowSingle</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Show indicator for single layout</string>
+                                        </property>
+                                    </widget>
+                                </vbox>
                             </widget>
                         </grid>
                     </widget>
-                </grid>
+                    <spacer>
+                        <property name="name">
+                            <cstring>spacer1</cstring>
+                        </property>
+                        <property name="orientation">
+                            <enum>Vertical</enum>
+                        </property>
+                        <property name="sizeType">
+                            <enum>Expanding</enum>
+                        </property>
+                        <property name="sizeHint">
+                            <size>
+                                <width>20</width>
+                                <height>40</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
             </widget>
             <widget class="TQWidget">
                 <property name="name">
@@ -601,17 +1061,6 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="TQCheckBox">
-                        <property name="name">
-                            <cstring>chkEnableOptions</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Enable xkb options</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                    </widget>
                     <widget class="TQGroupBox">
                         <property name="name">
                             <cstring>groupBox3_2</cstring>
@@ -626,15 +1075,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>checkResetOld</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Reset old options</string>
-                                </property>
-                            </widget>
-                            <widget class="TQLabel" row="2" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel1_3_2</cstring>
                                 </property>
@@ -642,7 +1083,7 @@
                                     <string>Command:</string>
                                 </property>
                             </widget>
-                            <widget class="TQLineEdit" row="2" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>editCmdLineOpt</cstring>
                                 </property>
@@ -650,7 +1091,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="TQListView" row="1" column="0" rowspan="1" colspan="2">
+                            <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2">
                                 <column>
                                     <property name="text">
                                         <string>Options</string>
@@ -668,6 +1109,41 @@
                             </widget>
                         </grid>
                     </widget>
+                    <widget class="TQButtonGroup">
+                        <property name="name">
+                            <cstring>xkbOptsMode</cstring>
+                        </property>
+                        <property name="title">
+                            <string>Options Mode</string>
+                        </property>
+                        <property name="whatsThis" stdset="0">
+                            <string>Here you can choose how the options you select here will be applied: in addition to, or instead of existing options.</string>
+                        </property>
+                        <vbox>
+                            <widget class="TQRadioButton">
+                                <property name="name">
+                                    <cstring>radXkbOverwrite</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Overwrite existing options (recommended)</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Overwrite any existing Xkb options that might have been previously set by another program or from a script (e.g. via setxkbmap). This is the recommended option.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQRadioButton">
+                                <property name="name">
+                                    <cstring>radXkbAppend</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>&amp;Append to existing options</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Append the selected options to any existing Xkb options that might have been previously set by another program or from a script (e.g. via setxkbmap). Only use this if you really need to.</string>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
                 </vbox>
             </widget>
         </widget>
@@ -681,9 +1157,15 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>chkEnableOptions</sender>
+        <sender>chkEnable</sender>
         <signal>toggled(bool)</signal>
-        <receiver>groupBox3_2</receiver>
+        <receiver>swOptsFrame</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>chkEnable</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>indOptsFrame</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
@@ -699,15 +1181,66 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>chkEnable</sender>
+        <sender>radLabelUseCustom</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>grpLabelColors</receiver>
+        <slot>setEnabled(bool)</slot>
+      </connection>
+      <connection>
+        <sender>chkLabelShadow</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>shColor</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radFlagOnly</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>grpLabel</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radLabelOnly</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>chkBgTransparent</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radLabelOnly</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>bgColor</receiver>
+        <slot>setEnabled(bool)</slot>
+      </connection>
+      <connection>
+        <sender>radLabelOnly</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>labelBgColor</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radFlagLabel</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>bgColor</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>radFlagLabel</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>labelBgColor</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>chkEnableNotify</sender>
         <signal>toggled(bool)</signal>
-        <receiver>optionsFrame</receiver>
+        <receiver>chkNotifyUseKMilo</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">kiconloader.h</include>
     <include location="local" impldecl="in implementation">kdialogbase.h</include>
+    <include location="local" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="local" impldecl="in implementation">kseparator.h</include>
+    <include location="local" impldecl="in implementation">tdefontrequester.h</include>
 </includes>
 <pixmapfunction>SmallIcon</pixmapfunction>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 358d10450..c23b3cf6c 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -48,6 +48,7 @@
 
 #include "kcmmisc.h"
 #include "kcmmiscwidget.h"
+#include "x11helper.h"
 #include <X11/Xlib.h>
 
 KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
@@ -71,14 +72,14 @@ KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *)
   ui->rateSlider->setSteps(50, 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 );
diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h
index d57714295..db4dad84d 100644
--- a/kxkb/kcmmisc.h
+++ b/kxkb/kcmmisc.h
@@ -32,7 +32,7 @@ class KeyboardConfigWidget;
 
 class KeyboardConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KeyboardConfig( TQWidget *parent=0, const char* name=0);
 
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index 2db4fb60f..34ed19334 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -47,6 +47,9 @@ DESCRIPTION
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
+#include <knotifyclient.h>
+#include <dcopclient.h>
+#include <dcopref.h>
 
 #include "x11helper.h"
 #include "kxkb.h"
@@ -63,59 +66,52 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled)
     m_prevWinId(X11Helper::UNKNOWN_WINDOW_ID),
     m_rules(NULL),
     m_tray(NULL),
-    kWinModule(NULL),
-    m_forceSetXKBMap( false )
+    kWinModule(NULL)
 {
+    X11Helper::initializeTranslations();
 	m_extension = new XKBExtension();
     if( !m_extension->init() ) {
 		kdDebug() << "xkb initialization failed, exiting..." << endl;
 		::exit(1);
     }
-	
-    // keep in sync with kcmlayout.cpp
-    keys = new TDEGlobalAccel(TQT_TQOBJECT(this));
-#include "kxkbbindings.cpp"
-    keys->updateConnections();
+    connect(m_extension, TQ_SIGNAL(groupChanged(uint)), this, TQ_SLOT(slotGroupChanged(uint)));
 
 	m_layoutOwnerMap = new LayoutMap(kxkbConfig);
 
-    connect( this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)) );
+	// keep in sync with kcmlayout.cpp
+	keys = new TDEGlobalAccel(this);
+#include "kxkbbindings.cpp"
+
+    connect( this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)) );
     addKipcEventMask( KIPC::SettingsChanged );
 }
 
 
 KXKBApp::~KXKBApp()
 {
-//    deletePrecompiledLayouts();
-
-    delete keys;
-    delete m_tray;
-    delete m_rules;
-    delete m_extension;
+	delete m_tray;
+	delete m_rules;
+	delete m_extension;
 	delete m_layoutOwnerMap;
 	delete kWinModule;
+	delete keys;
 }
 
 int KXKBApp::newInstance()
 {
-	m_extension->reset();
-	
-    if( settingsRead() )
-		layoutApply();
-	
+    if (settingsRead()) {
+        layoutApply();
+    }
+
     return 0;
 }
 
 bool KXKBApp::settingsRead()
 {
-	kxkbConfig.load( KxkbConfig::LOAD_ACTIVE_OPTIONS );
-
-    if( kxkbConfig.m_enableXkbOptions ) {
-		kdDebug() << "Setting XKB options " << kxkbConfig.m_options << endl;
-		if( !m_extension->setXkbOptions(kxkbConfig.m_options, kxkbConfig.m_resetOldOptions) ) {
-            kdDebug() << "Setting XKB options failed!" << endl;
-        }
-    }
+	XkbOptions options = kxkbConfig.getKXkbOptions();
+	if( !m_extension->setXkbOptions(options) ) {
+		kdDebug() << "Setting XKB options failed!" << endl;
+	}
 
     if ( kxkbConfig.m_useKxkb == false ) {
         kapp->quit();
@@ -137,7 +133,7 @@ bool KXKBApp::settingsRead()
 		
 		if( kWinModule == NULL ) {
 			kWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
-			connect(kWinModule, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(windowChanged(WId)));
+			connect(kWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId)));
 		}
 		m_prevWinId = kWinModule->activeWindow();
 		kdDebug() << "Active window " << m_prevWinId << endl;
@@ -151,32 +147,15 @@ bool KXKBApp::settingsRead()
 	
 	for(int ii=0; ii<(int)kxkbConfig.m_layouts.count(); ii++) {
 		LayoutUnit& layoutUnit = kxkbConfig.m_layouts[ii];
-		layoutUnit.defaultGroup = m_rules->getDefaultGroup(layoutUnit.layout, layoutUnit.includeGroup);
-		kdDebug() << "default group for " << layoutUnit.toPair() << " is " << layoutUnit.defaultGroup << endl;
 	}
 	
-	m_currentLayout = kxkbConfig.getDefaultLayout();
-	
-	if( kxkbConfig.m_layouts.count() == 1 ) {
-		TQString layoutName = m_currentLayout.layout;
-		TQString variantName = m_currentLayout.variant;
-		TQString includeName = m_currentLayout.includeGroup;
-		int group = m_currentLayout.defaultGroup;
-		
-		if( !m_extension->setLayout(kxkbConfig.m_model, layoutName, variantName, includeName, false) 
-				   || !m_extension->setGroup( group ) ) {
-			kdDebug() << "Error switching to single layout " << m_currentLayout.toPair() << endl;
-			// TODO: alert user
-		}
+	m_currentLayout = kxkbConfig.m_layouts[0];
+	kdDebug() << "default layout is " << m_currentLayout.toPair() << endl;
 	
-		if( kxkbConfig.m_showSingle == false ) {
-			kapp->quit();
-			return false;
-		}
+	if( kxkbConfig.m_layouts.count() == 1 && !kxkbConfig.m_showSingle) {
+		kapp->quit();
+		return false;
  	}
-	else {
-//		initPrecompiledLayouts();
-	}
 
 	initTray();
 	
@@ -196,8 +175,8 @@ void KXKBApp::initTray()
 	//	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(toggled()));
+ 		connect(popupMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuActivated(int)));
+		connect(sysTray, TQ_SIGNAL(toggled()), this, TQ_SLOT(nextLayout()));
 	}
 	
 	m_tray->setShowFlag(kxkbConfig.m_showFlag);
@@ -223,40 +202,57 @@ bool KXKBApp::setLayout(const TQString& layoutPair)
 	return false;
 }
 
-
 // Activates the keyboard layout specified by 'layoutUnit'
-bool KXKBApp::setLayout(const LayoutUnit& layoutUnit, int group)
+bool KXKBApp::setLayout(const LayoutUnit& layoutUnit)
 {
-	bool res = false;
-
-	if( group == -1 )
-		group = layoutUnit.defaultGroup;
-	
-	res = m_extension->setLayout(kxkbConfig.m_model, 
- 					layoutUnit.layout, layoutUnit.variant, 
- 					layoutUnit.includeGroup);
-	if( res )
-		m_extension->setGroup(group); // not checking for ret - not important
-	
-    if( res )
-        m_currentLayout = layoutUnit;
+	uint group = kxkbConfig.m_layouts.findIndex(layoutUnit);
+	bool res = m_extension->setGroup(group);
+	if (res) {
+		m_currentLayout = layoutUnit;
+		maybeShowLayoutNotification();
+	}
 
-    if (m_tray) {
-		if( res )
+	if (m_tray) {
+		if (res) {
 			m_tray->setCurrentLayout(layoutUnit);
-		else  
+		} else {
 			m_tray->setError(layoutUnit.toPair());
+		}
 	}
 
-    return res;
+	return res;
 }
+// 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 (m_tray) {
+		if (res)
+			m_tray->setCurrentLayout(m_currentLayout);
+		else
+			m_tray->setError(m_currentLayout.toPair());
+	}
 
-void KXKBApp::toggled()
+	return res;
+}
+
+
+void KXKBApp::nextLayout()
 {
 	const LayoutUnit& layout = m_layoutOwnerMap->getNextLayout().layoutUnit;
 	setLayout(layout);
 }
 
+void KXKBApp::prevLayout()
+{
+	const LayoutUnit& layout = m_layoutOwnerMap->getPrevLayout().layoutUnit;
+	setLayout(layout);
+}
+
 void KXKBApp::menuActivated(int id)
 {
 	if( KxkbLabelController::START_MENU_ID <= id 
@@ -276,9 +272,57 @@ void KXKBApp::menuActivated(int id)
 	{
 		TDEApplication::kApplication()->invokeHelp(0, "kxkb");
 	}
-	else
+//	else
+//	{
+//		quit();
+//	}
+}
+
+void KXKBApp::slotGroupChanged(uint group)
+{
+	if (group >= kxkbConfig.m_layouts.count())
 	{
-		quit();
+		group = 0;
+	}
+	m_currentLayout = kxkbConfig.m_layouts[group];
+	m_tray->setCurrentLayout(m_currentLayout);
+	maybeShowLayoutNotification();
+}
+
+void KXKBApp::maybeShowLayoutNotification() {
+	if (!kxkbConfig.m_enableNotify) return;
+
+	TQString layoutName(m_rules->getLayoutName(m_currentLayout));
+	bool useKMilo = kxkbConfig.m_notifyUseKMilo;
+	bool notificationSent = false;
+
+	// Query KDED whether KMiloD is loaded
+	if (useKMilo) {
+		QCStringList modules;
+		TQCString replyType;
+		TQByteArray replyData;
+		if (kapp->dcopClient()->call("kded", "kded", "loadedModules()",
+			TQByteArray(), replyType, replyData))
+		{
+			if (replyType == "QCStringList") {
+				TQDataStream reply(replyData, IO_ReadOnly);
+				reply >> modules;
+
+				if (!modules.contains("kmilod")) {
+					useKMilo = false;
+				}
+			}
+		}
+	}
+
+	if (useKMilo) {
+		DCOPRef kmilo("kded", "kmilod");
+		if (kmilo.send("displayText(TQString,TQPixmap)", layoutName, kapp->miniIcon()))
+			notificationSent = true;
+	}
+
+	if (!notificationSent) {
+		KNotifyClient::event(m_tray->winId(), "LayoutChange", layoutName);
 	}
 }
 
@@ -291,15 +335,11 @@ void KXKBApp::windowChanged(WId winId)
 		return;
 	}
 
-	int group = m_extension->getGroup();
-
 	kdDebug() << "old WinId: " << m_prevWinId << ", new WinId: " << winId << endl;
 	
-	if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) {	// saving layout/group from previous window
-// 		kdDebug() << "storing " << m_currentLayout.toPair() << ":" << group << " for " << m_prevWinId << endl;
+	if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) {	// saving layout from previous window
 // 		m_layoutOwnerMap->setCurrentWindow(m_prevWinId);
 		m_layoutOwnerMap->setCurrentLayout(m_currentLayout);
-		m_layoutOwnerMap->setCurrentGroup(group);
 	}
  
 	m_prevWinId = winId;
@@ -309,11 +349,8 @@ void KXKBApp::windowChanged(WId winId)
 		const LayoutState& layoutState = m_layoutOwnerMap->getCurrentLayout();
 		
 		if( layoutState.layoutUnit != m_currentLayout ) {
-			kdDebug() << "switching to " << layoutState.layoutUnit.toPair() << ":" << group << " for "  << winId << endl;
-			setLayout( layoutState.layoutUnit, layoutState.group );
-		}
-		else if( layoutState.group != group ) {	// we need to change only the group
-			m_extension->setGroup(layoutState.group);
+			kdDebug() << "switching to " << layoutState.layoutUnit.toPair() << " for "  << winId << endl;
+			setLayout(layoutState.layoutUnit);
 		}
 	}
 }
@@ -321,56 +358,20 @@ void KXKBApp::windowChanged(WId winId)
 
 void KXKBApp::slotSettingsChanged(int category)
 {
-    if ( category != TDEApplication::SETTINGS_SHORTCUTS)
-		return;
-
-    TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
-    keys->readSettings();
-    keys->updateConnections();
+	if (category == TDEApplication::SETTINGS_SHORTCUTS) {
+		TDEGlobal::config()->reparseConfiguration(); // kcontrol modified kdeglobals
+		keys->readSettings();
+		keys->updateConnections();
+    }
 }
 
-/*
- Viki (onscreen keyboard) has problems determining some modifiers states
- when kxkb uses precompiled layouts instead of setxkbmap. Probably a bug
- in the xkb functions used for the precompiled layouts *shrug*.
-*/
-void KXKBApp::forceSetXKBMap( bool set )
-{
-    if( m_forceSetXKBMap == set )
-        return;
-    m_forceSetXKBMap = set;
-    layoutApply();
+bool KXKBApp::x11EventFilter(XEvent *e) {
+    // let the extension process the event and emit signals if necessary
+    m_extension->processXEvent(e);
+    return TDEApplication::x11EventFilter(e);
 }
 
-/*Precompiles the keyboard layouts for faster activation later.
-This is done by loading each one of them and then dumping the compiled
-map from the X server into our local buffer.*/
-// void KXKBApp::initPrecompiledLayouts()
-// {
-//     TQStringList dirs = TDEGlobal::dirs()->findDirs ( "tmp", "" );
-//     TQString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0]; 
-// 
-// 	TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end();
-// 
-// 	for (TQValueList<LayoutUnit>::ConstIterator it = kxkbConfig.m_layouts.begin(); it != end; ++it)
-//     {
-// 		LayoutUnit layoutUnit(*it);
-// //	const char* baseGr = m_includes[layout]; 
-// //	int group = m_rules->getGroup(layout, baseGr);
-// //    	if( m_extension->setLayout(m_model, layout, m_variants[layout], group, baseGr) ) {
-// 		TQString compiledLayoutFileName = tempDir + layoutUnit.layout + "." + layoutUnit.variant + ".xkm";
-// //    	    if( m_extension->getCompiledLayout(compiledLayoutFileName) )
-// 		m_compiledLayoutFileNames[layoutUnit.toPair()] = compiledLayoutFileName;
-// //	}
-// //	else {
-// //    	    kdDebug() << "Error precompiling layout " << layout << endl;
-// //	}
-//     }
-// }
-
-
-const char * DESCRIPTION =
-  I18N_NOOP("A utility to switch keyboard maps");
+const char *DESCRIPTION = I18N_NOOP("A utility to switch keyboard maps");
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 {
diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h
index 18949ba75..ddde9a6c4 100644
--- a/kxkb/kxkb.h
+++ b/kxkb/kxkb.h
@@ -49,44 +49,50 @@ class LayoutMap;
 
 class KXKBApp : public KUniqueApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
-	KXKBApp(bool allowStyles=true, bool GUIenabled=true);
-	~KXKBApp();
+    KXKBApp(bool allowStyles=true, bool GUIenabled=true);
+    ~KXKBApp();
 
-	virtual int newInstance();
+    virtual int newInstance();
 
-	bool setLayout(const LayoutUnit& layoutUnit, int group=-1);
+    bool setLayout(const LayoutUnit& layoutUnit);
+    bool setLayout(const uint group);
 k_dcop:
-	bool setLayout(const TQString& layoutPair);
-	TQString getCurrentLayout() { return m_currentLayout.toPair(); }
-	TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
-	void forceSetXKBMap( bool set );
+    bool setLayout(const TQString& layoutPair);
+    TQString getCurrentLayout() { return m_currentLayout.toPair(); }
+    TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); }
+
+public slots:
+    void nextLayout();
+    void prevLayout();
 
 protected slots:
     void menuActivated(int id);
-    void toggled();
     void windowChanged(WId winId);
+    void layoutApply();
+    void slotGroupChanged(uint group);
 
     void slotSettingsChanged(int category);
+    void maybeShowLayoutNotification();
 
 protected:
     // Read settings, and apply them.
     bool settingsRead();
-    void layoutApply();
-    
+
 private:
-	void initTray();
+    void initTray();
+    bool x11EventFilter(XEvent *e);
 
 private:
-	KxkbConfig kxkbConfig;
+    KxkbConfig kxkbConfig;
 
     WId m_prevWinId;	// for tricky part of saving xkb group
     LayoutMap* m_layoutOwnerMap;
 
-	LayoutUnit m_currentLayout;
+    LayoutUnit m_currentLayout;
 
     XKBExtension *m_extension;
     XkbRules *m_rules;
diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp
index fad480f7c..02da8a4ea 100644
--- a/kxkb/kxkbbindings.cpp
+++ b/kxkb/kxkbbindings.cpp
@@ -1,12 +1,13 @@
 #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 )
+   keys->insert( name, i18n(name), TQString(), key3, key4, 0, 0 )
 #endif
 
-	keys->insert( "Program:kxkb", i18n("Keyboard") );
-	DEF( I18N_NOOP("Switch to Next Keyboard Layout"), ALT+CTRL+Qt::Key_K, KKey::QtWIN+CTRL+Qt::Key_K, toggled() );
+    keys->insert( "Program:kxkb", i18n("Keyboard") );
+    DEF( I18N_NOOP("Switch to Next Keyboard Layout"), TDEShortcut(), TDEShortcut(), nextLayout() );
+    DEF( I18N_NOOP("Switch to Previous Keyboard Layout"), TDEShortcut(), TDEShortcut(), prevLayout() );
 
-#undef DEF
+#undef DEF
\ No newline at end of file
diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp
index 517f0ccdd..0c3dc9e0a 100644
--- a/kxkb/kxkbconfig.cpp
+++ b/kxkb/kxkbconfig.cpp
@@ -1,7 +1,7 @@
 //
 // C++ Implementation: kxkbconfig
 //
-// Description: 
+// Description:
 //
 //
 // Author: Andriy Rysin <rysin@kde.org>, (C) 2006
@@ -30,29 +30,16 @@ static const char* switchModes[SWITCH_POLICY_COUNT] = {
 const LayoutUnit DEFAULT_LAYOUT_UNIT = LayoutUnit("us", "");
 const char* DEFAULT_MODEL = "pc104";
 
-LayoutUnit KxkbConfig::getDefaultLayout()
-{
-	if( m_layouts.size() == 0 )
-		return DEFAULT_LAYOUT_UNIT;
-	
-	return m_layouts[0];
-}
-
-bool KxkbConfig::load(int loadMode) 
+bool KxkbConfig::load(int loadMode)
 {
 	TDEConfig *config = new TDEConfig("kxkbrc", true, false);
 	config->setGroup("Layout");
 
-// Even if the layouts have been disabled we still want to set Xkb options
-// user can always switch them off now in the "Options" tab
-	m_enableXkbOptions = config->readBoolEntry("EnableXkbOptions", false);
-	
-	if( m_enableXkbOptions == true || loadMode == LOAD_ALL ) {
-		m_resetOldOptions = config->readBoolEntry("ResetOldOptions", false);
+	if( loadMode == LOAD_ALL ) {
+		m_resetOldOptions = config->readBoolEntry("ResetOldOptions", true);
 		m_options = config->readEntry("Options", "");
-		kdDebug() << "Xkb options (enabled=" << m_enableXkbOptions << "): " << m_options << endl;
 	}
-	
+
 	m_useKxkb = config->readBoolEntry("Use", false);
 	kdDebug() << "Use kxkb " << m_useKxkb << endl;
 
@@ -62,7 +49,7 @@ bool KxkbConfig::load(int loadMode)
 
 	m_model = config->readEntry("Model", DEFAULT_MODEL);
 	kdDebug() << "Model: " << m_model << endl;
-	
+
 	TQStringList layoutList;
 	if( config->hasKey("LayoutList") ) {
 		layoutList = config->readListEntry("LayoutList");
@@ -74,15 +61,15 @@ bool KxkbConfig::load(int loadMode)
 	}
 	if( layoutList.count() == 0 )
 		layoutList.append("us");
-	
+
 	m_layouts.clear();
 	for(TQStringList::ConstIterator 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() << "Found " << m_layouts.count() << " layouts, default is " << getDefaultLayout().toPair() << endl;
-	
+	kdDebug() << "Found " << m_layouts.count() << " layouts" << endl;
+
 	TQStringList displayNamesList = config->readListEntry("DisplayNames", ',');
 	for(TQStringList::ConstIterator it = displayNamesList.begin(); it != displayNamesList.end() ; ++it) {
 		TQStringList displayNamePair = TQStringList::split(':', *it );
@@ -94,40 +81,18 @@ bool KxkbConfig::load(int loadMode)
 		}
 	}
 
-// 	m_includes.clear();
-	if( X11Helper::areSingleGroupsSupported() ) {
-		if( config->hasKey("IncludeGroups") ) {
-			TQStringList includeList = config->readListEntry("IncludeGroups", ',');
-			for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
-				TQStringList includePair = TQStringList::split(':', *it );
-				if( includePair.count() == 2 ) {
-					LayoutUnit layoutUnit( includePair[0] );
-					if( m_layouts.contains( layoutUnit ) ) {
-						m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = includePair[1];
-						kdDebug() << "Got inc group: " << includePair[0] << ": " << includePair[1] << endl;
-					}
-				}
-			}
-		}
-		else { //old includes format
-			kdDebug() << "Old includes..." << endl;
-			TQStringList includeList = config->readListEntry("Includes");
-			for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) {
-				TQString layoutName = LayoutUnit::parseLayout( *it );
-				LayoutUnit layoutUnit( layoutName, "" );
-				kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.contains( layoutUnit ) << endl;
-				if( m_layouts.contains( layoutUnit ) ) {
-					TQString variantName = LayoutUnit::parseVariant(*it);
-					m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = variantName;
-					kdDebug() << "Got inc group: " << layoutUnit.toPair() << ": " <<  variantName << endl;
-				}
-			}
-		}
-	}
-
 	m_showSingle = config->readBoolEntry("ShowSingle", false);
 	m_showFlag = config->readBoolEntry("ShowFlag", true);
-	
+	m_showLabel = config->readBoolEntry("ShowLabel", 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));
+
 	TQString layoutOwner = config->readEntry("SwitchMode", "Global");
 
 	if( layoutOwner == "WinClass" ) {
@@ -139,14 +104,14 @@ bool KxkbConfig::load(int loadMode)
 	else /*if( layoutOwner == "Global" )*/ {
 		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;
-	
+
 	m_stickySwitching = config->readBoolEntry("StickySwitching", false);
 	m_stickySwitchingDepth = config->readEntry("StickySwitchingDepth", "2").toInt();
 	if( m_stickySwitchingDepth < 2 )
@@ -157,44 +122,41 @@ bool KxkbConfig::load(int loadMode)
 			kdWarning() << "Layout count is less than 3, sticky switching will be off" << endl;
 			m_stickySwitching = false;
 		}
-		else	
+		else
 		if( (int)m_layouts.count() - 1 < m_stickySwitchingDepth ) {
 			kdWarning() << "Sticky switching depth is more than layout count -1, adjusting..." << endl;
 			m_stickySwitchingDepth = m_layouts.count() - 1;
 		}
 	}
 
+	config->setGroup("Notifications");
+	m_enableNotify = config->readBoolEntry("Enable", false);
+	m_notifyUseKMilo = config->readBoolEntry("UseKMilo", true);
+
 	delete config;
 
 	return true;
 }
 
-void KxkbConfig::save() 
+void KxkbConfig::save()
 {
 	TDEConfig *config = new TDEConfig("kxkbrc", false, false);
 	config->setGroup("Layout");
 
 	config->writeEntry("Model", m_model);
 
-	config->writeEntry("EnableXkbOptions", m_enableXkbOptions );
 	config->writeEntry("ResetOldOptions", m_resetOldOptions);
 	config->writeEntry("Options", m_options );
 
 	TQStringList layoutList;
-	TQStringList includeList;
 	TQStringList displayNamesList;
-	
+
 	TQValueList<LayoutUnit>::ConstIterator it;
 	for(it = m_layouts.begin(); it != m_layouts.end(); ++it) {
 		const LayoutUnit& layoutUnit = *it;
-		
+
 		layoutList.append( layoutUnit.toPair() );
-		
-		if( layoutUnit.includeGroup.isEmpty() == false ) {
-			TQString incGroupUnit = TQString("%1:%2").arg(layoutUnit.toPair(), layoutUnit.includeGroup);
-			includeList.append( incGroupUnit );
-		}
-	
+
 		TQString displayName( layoutUnit.displayName );
 		kdDebug() << " displayName " << layoutUnit.toPair() << " : " << displayName << endl;
 		if( displayName.isEmpty() == false && displayName != layoutUnit.layout ) {
@@ -202,13 +164,10 @@ void KxkbConfig::save()
 			displayNamesList.append( displayName );
 		}
 	}
-	
+
 	config->writeEntry("LayoutList", layoutList);
 	kdDebug() << "Saving Layouts: " << layoutList << endl;
- 	
-	config->writeEntry("IncludeGroups", includeList);
- 	kdDebug() << "Saving includeGroups: " << includeList << endl;
-	
+
 //	if( displayNamesList.empty() == false )
 		config->writeEntry("DisplayNames", displayNamesList);
 // 	else
@@ -216,21 +175,35 @@ void KxkbConfig::save()
 
 	config->writeEntry("Use", m_useKxkb);
 	config->writeEntry("ShowSingle", m_showSingle);
+
 	config->writeEntry("ShowFlag", m_showFlag);
+	config->writeEntry("ShowLabel", m_showLabel);
+
+	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("SwitchMode", switchModes[m_switchingPolicy]);
-	
+
 	config->writeEntry("StickySwitching", m_stickySwitching);
 	config->writeEntry("StickySwitchingDepth", m_stickySwitchingDepth);
 
-	// remove old options 
+	// remove old options
  	config->deleteEntry("Variants");
 	config->deleteEntry("Includes");
 	config->deleteEntry("Encoding");
 	config->deleteEntry("AdditionalEncodings");
 	config->deleteEntry("Additional");
 	config->deleteEntry("Layout");
-	
+
+	config->setGroup("Notifications");
+	config->writeEntry("Enable", m_enableNotify);
+	config->writeEntry("UseKMilo", m_notifyUseKMilo);
+
 	config->sync();
 
 	delete config;
@@ -240,8 +213,7 @@ void KxkbConfig::setDefaults()
 {
 	m_model = DEFAULT_MODEL;
 
-	m_enableXkbOptions = false;
-	m_resetOldOptions = false;
+	m_resetOldOptions = true;
 	m_options = "";
 
 	m_layouts.clear();
@@ -252,7 +224,7 @@ void KxkbConfig::setDefaults()
 	m_showFlag = true;
 
 	m_switchingPolicy = SWITCH_POLICY_GLOBAL;
-	
+
 	m_stickySwitching = false;
 	m_stickySwitchingDepth = 2;
 }
@@ -271,7 +243,7 @@ TQStringList KxkbConfig::getLayoutStringList(/*bool compact*/)
 TQString KxkbConfig::getDefaultDisplayName(const TQString& code_)
 {
 	TQString displayName;
-	
+
 	if( code_.length() <= 2 ) {
 		displayName = code_;
 	}
@@ -281,13 +253,13 @@ TQString KxkbConfig::getDefaultDisplayName(const TQString& code_)
 		TQString rightCode;
 		if( sepPos != -1 )
 			rightCode = code_.mid(sepPos+1);
-		
+
 		if( rightCode.length() > 0 )
 			displayName = leftCode.left(2) + rightCode.left(1).lower();
 		else
 			displayName = leftCode.left(3);
 	}
-	
+
 	return displayName;
 }
 
@@ -295,13 +267,33 @@ TQString KxkbConfig::getDefaultDisplayName(const LayoutUnit& layoutUnit, bool si
 {
 	if( layoutUnit.variant == "" )
 		return getDefaultDisplayName( layoutUnit.layout );
-	
+
 	TQString displayName = layoutUnit.layout.left(2);
 	if( single == false )
 		displayName += layoutUnit.variant.left(1);
 	return displayName;
 }
 
+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) {
+		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;
+	return options;
+}
+
 /**
  * @brief Gets the single layout part of a layout(variant) string
  * @param[in] layvar String in form layout(variant) to parse
@@ -337,4 +329,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 82fe610c9..4e424102a 100644
--- a/kxkb/kxkbconfig.h
+++ b/kxkb/kxkbconfig.h
@@ -1,7 +1,7 @@
 //
 // C++ Interface: kxkbconfig
 //
-// Description: 
+// Description:
 //
 //
 // Author: Andriy Rysin <rysin@kde.org>, (C) 2006
@@ -14,74 +14,30 @@
 
 #include <tqstring.h>
 #include <tqstringlist.h>
+#include <tqcolor.h>
+#include <tqfont.h>
 #include <tqptrqueue.h>
 #include <tqmap.h>
 
+#include "layoutunit.h"
+
+struct XkbOptions {
+	TQString layouts;
+	TQString variants;
+	TQString model;
+	TQString options;
+	bool resetOld;
+};
 
 /* Utility classes for per-window/per-application layout implementation
 */
-enum SwitchingPolicy { 
+enum SwitchingPolicy {
 	SWITCH_POLICY_GLOBAL = 0,
 	SWITCH_POLICY_WIN_CLASS = 1,
 	SWITCH_POLICY_WINDOW = 2,
 	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 includeGroup;
-	TQString displayName;
- 	int defaultGroup;
-	
-	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;
 
@@ -90,31 +46,42 @@ class KxkbConfig
 {
 public:
 	enum { LOAD_INIT_OPTIONS, LOAD_ACTIVE_OPTIONS, LOAD_ALL };
-	
+
 	bool m_useKxkb;
 	bool m_showSingle;
 	bool m_showFlag;
+	bool m_showLabel;
 	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;
+	bool m_bgTransparent;
+	TQColor m_colorLabel;
+	TQFont m_labelFont;
+	bool m_labelShadow;
+	TQColor m_colorShadow;
+
 	TQString m_model;
 	TQString m_options;
 	TQValueList<LayoutUnit> m_layouts;
 
-	LayoutUnit getDefaultLayout();
-	
 	bool load(int loadMode);
 	void save();
 	void setDefaults();
-	
+
 	TQStringList getLayoutStringList(/*bool compact*/);
 	static TQString getDefaultDisplayName(const TQString& code_);
 	static TQString getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single=false);
 
-private:	
+	const XkbOptions getKXkbOptions();
+
+private:
 	static const TQMap<TQString, TQString> parseIncludesMap(const TQStringList& pairList);
 };
 
diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp
index ec91df670..573b0b4ef 100644
--- a/kxkb/kxkbtraywindow.cpp
+++ b/kxkb/kxkbtraywindow.cpp
@@ -1,7 +1,7 @@
 //
 // C++ Implementation: kxkbtraywindow
 //
-// Description: 
+// Description:
 //
 //
 // Author: Andriy Rysin <rysin@kde.org>, (C) 2006
@@ -25,7 +25,7 @@
 #include "kxkbconfig.h"
 
 
-KxkbLabelController::KxkbLabelController(TQLabel* label_, TQPopupMenu* contextMenu_) :
+KxkbLabelController::KxkbLabelController(TQLabel* label_, TDEPopupMenu* contextMenu_) :
     label(label_),
     contextMenu(contextMenu_),
  	m_menuStartIndex(contextMenu_->count()),
@@ -51,7 +51,7 @@ void KxkbLabelController::setPixmap(const TQPixmap& pixmap)
 void KxkbLabelController::setCurrentLayout(const LayoutUnit& layoutUnit)
 {
 	setToolTip(m_descriptionMap[layoutUnit.toPair()]);
-	setPixmap( LayoutIcon::getInstance().findPixmap(layoutUnit.layout, m_showFlag, layoutUnit.displayName) );
+	setPixmap( LayoutIcon::getInstance().findPixmap(layoutUnit.layout, PIXMAP_STYLE_INDICATOR, layoutUnit.displayName) );
 }
 
 
@@ -60,14 +60,14 @@ void KxkbLabelController::setError(const TQString& layoutInfo)
     TQString msg = i18n("Error changing keyboard layout to '%1'").arg(layoutInfo);
 	setToolTip(msg);
 
-	label->setPixmap(LayoutIcon::getInstance().findPixmap("error", m_showFlag));
+	label->setPixmap(LayoutIcon::getInstance().findPixmap("error", PIXMAP_STYLE_NORMAL));
 }
 
 
 void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rules)
 {
-//	TDEPopupMenu* menu = contextMenu();
-	TQPopupMenu* menu = contextMenu;
+	TDEPopupMenu* menu = contextMenu;
+//	TQPopupMenu* menu = contextMenu;
 //	int index = menu->indexOf(0);
 
     m_descriptionMap.clear();
@@ -80,30 +80,32 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts,
 	}
 /*	menu->removeItem(CONFIG_MENU_ID);
 	menu->removeItem(HELP_MENU_ID);*/
-	
+
     TDEIconEffect iconeffect;
-    
+
 	int cnt = 0;
     TQValueList<LayoutUnit>::ConstIterator it;
     for (it=layouts.begin(); it != layouts.end(); ++it)
     {
 		const TQString layoutName = (*it).layout;
 		const TQString variantName = (*it).variant;
-		
-		const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, m_showFlag, (*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);
+
+		const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(
+			(*it).layout, PIXMAP_STYLE_CONTEXTMENU, (*it).displayName);
+		const TQPixmap pix = iconeffect.apply(layoutPixmap, TDEIcon::Small,
+			TDEIcon::DefaultState);
+
+		TQString fullName = rules.getLayoutName((*it));
+		contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt,
+			m_menuStartIndex + cnt);
+
 		m_descriptionMap.insert((*it).toPair(), fullName);
-		
+
 		cnt++;
     }
 
 	m_prevLayoutCount = cnt;
-	
+
 	// if show config, if show help
 	if( menu->indexOf(CONFIG_MENU_ID) == -1 ) {
 		contextMenu->insertSeparator();
@@ -114,7 +116,7 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts,
 
 /*    if( index != -1 ) { //not first start
 		menu->insertSeparator();
-		TDEAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection());
+		TDEAction* quitAction = KStdAction::quit(this, TQ_SIGNAL(quitSelected()), actionCollection());
         if (quitAction)
     	    quitAction->plug(menu);
     }*/
diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h
index 38e42db5d..46d66c44b 100644
--- a/kxkb/kxkbtraywindow.h
+++ b/kxkb/kxkbtraywindow.h
@@ -21,21 +21,21 @@
 
 
 class TQLabel;
-class TQPopupMenu;
+class TDEPopupMenu;
 class XkbRules;
 
 /* This class is responsible for displaying flag/label for the layout,
     catching keyboard/mouse events and displaying menu when selected
 */
 
-class KxkbLabelController: public QObject
+class KxkbLabelController: public TQObject
 {
-// 	Q_OBJECT
+// 	TQ_OBJECT
 			
 public:
 	enum { START_MENU_ID = 100, CONFIG_MENU_ID = 130, HELP_MENU_ID = 131 };
 
-    KxkbLabelController(TQLabel *label, TQPopupMenu* contextMenu);
+    KxkbLabelController(TQLabel *label, TDEPopupMenu* contextMenu);
 
     void initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rule);
     void setCurrentLayout(const LayoutUnit& layout);
@@ -43,6 +43,8 @@ public:
 	void setError(const TQString& layoutInfo="");
     void setShowFlag(bool showFlag) { m_showFlag = showFlag; }
 	void show() { label->show(); }
+
+	WId winId() { return label->winId(); }
 	
 // signals:
 // 
@@ -55,7 +57,7 @@ public:
 
 private:
 	TQLabel* label;
-	TQPopupMenu* contextMenu;
+	TDEPopupMenu* contextMenu;
 	
 	const int m_menuStartIndex;
 	bool m_showFlag;
@@ -69,7 +71,7 @@ private:
 
 class KxkbSystemTray : public KSystemTray
 {
-	Q_OBJECT 
+	TQ_OBJECT 
 			
 	public:
 	KxkbSystemTray():
@@ -78,7 +80,7 @@ class KxkbSystemTray : public KSystemTray
 	
 	void mouseReleaseEvent(TQMouseEvent *ev)
 	{
-		if (ev->button() == Qt::LeftButton)
+		if (ev->button() == TQt::LeftButton)
 			emit toggled();
 		KSystemTray::mouseReleaseEvent(ev);
 	}
diff --git a/kxkb/layoutmap.cpp b/kxkb/layoutmap.cpp
index 106f70950..62b44da10 100644
--- a/kxkb/layoutmap.cpp
+++ b/kxkb/layoutmap.cpp
@@ -88,19 +88,28 @@ LayoutState& LayoutMap::getNextLayout() {
 	layoutQueue.enqueue(layoutState);
 	
 	kdDebug() << "map: Next layout: " << layoutQueue.head()->layoutUnit.toPair() 
-			<< " group: " << layoutQueue.head()->layoutUnit.defaultGroup << " for " << m_currentWinId << endl;
+	          << " for " << m_currentWinId << endl;
 	
 	return *layoutQueue.head();
 }
 
-void LayoutMap::setCurrentGroup(int group) {
-	getCurrentLayout().group = group;
+LayoutState& LayoutMap::getPrevLayout() {
+	LayoutQueue& layoutQueue = getCurrentLayoutQueue(m_currentWinId);
+	for (int i = 1; i < layoutQueue.count(); ++i) {
+		LayoutState* layoutState = layoutQueue.dequeue();
+		layoutQueue.enqueue(layoutState);
+	}
+
+	kdDebug() << "map: Next layout: " << layoutQueue.head()->layoutUnit.toPair()
+	          << " for " << m_currentWinId << endl;
+
+	return *layoutQueue.head();
 }
 
 void LayoutMap::setCurrentLayout(const LayoutUnit& layoutUnit) {
 	LayoutQueue& layoutQueue = getCurrentLayoutQueue(m_currentWinId);
 	kdDebug() << "map: Storing layout: " << layoutUnit.toPair() 
-			<< " group: " << layoutUnit.defaultGroup << " for " << m_currentWinId << endl;
+	          << " for " << m_currentWinId << endl;
 	
 	int queueSize = (int)layoutQueue.count();
 	for(int ii=0; ii<queueSize; ii++) {
diff --git a/kxkb/layoutmap.h b/kxkb/layoutmap.h
index 7b0ebad61..812814fff 100644
--- a/kxkb/layoutmap.h
+++ b/kxkb/layoutmap.h
@@ -27,13 +27,11 @@
 // LayoutInfo is used for sticky switching and per-window/application switching policy
 struct LayoutState {
 	const LayoutUnit& layoutUnit;
-	int group;
 	
 	LayoutState(const LayoutUnit& layoutUnit_):
-		layoutUnit(layoutUnit_),
-		group(layoutUnit_.defaultGroup)
+		layoutUnit(layoutUnit_)
 	{
-// 		kdDebug() << "new LayoutState " << layoutUnit.toPair() << " group: " << group << endl;
+// 		kdDebug() << "new LayoutState " << layoutUnit.toPair() << endl;
 	}
 };
 
@@ -49,8 +47,8 @@ public:
 //	void setConfig(const KxkbConfig& kxkbConfig);
 	
 	void setCurrentLayout(const LayoutUnit& layoutUnit);
-	void setCurrentGroup(int group);
 	LayoutState& getNextLayout();
+	LayoutState& getPrevLayout();
 	LayoutState& getCurrentLayout();
 	
 	void setCurrentWindow(WId winId);
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 8752c258a..63fc4f1db 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -1,21 +1,20 @@
 #include <tqimage.h>
-//#include <tqbitmap.h>
+#include <tqbitmap.h>
 #include <tqfont.h>
 #include <tqpainter.h>
 #include <tqregexp.h>
 #include <tqdict.h>
 
 #include <kstandarddirs.h>
+#include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 
 #include "pixmap.h"
 #include "x11helper.h"
-#include "kxkbconfig.h"
 
 
-static const int FLAG_MAX_WIDTH = 21;
-static const int FLAG_MAX_HEIGHT = 14;
+static const int FLAG_MAX_DIM = 24;
 
 const TQString LayoutIcon::flagTemplate("l10n/%1/flag.png");
 const TQString& LayoutIcon::ERROR_CODE("error");
@@ -30,16 +29,53 @@ LayoutIcon& LayoutIcon::getInstance() {
 }
 
 LayoutIcon::LayoutIcon():
-		m_pixmapCache(80),
-		m_labelFont("sans")
+		m_pixmapCache(80)
 {
-	m_labelFont.setPixelSize(10);
-	m_labelFont.setWeight(TQFont::Bold);
 }
 
 const TQPixmap&
-LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& displayName_)
+LayoutIcon::findPixmap(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
+		m_bgColor = TDEGlobalSettings::highlightColor();
+		m_fgColor = TDEGlobalSettings::highlightedTextColor();
+	} else {
+		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;
+
+	// 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;
+			break;
+
+		case PIXMAP_STYLE_CONTEXTMENU:
+			m_fitToBox = false; // causes white color loss
+			m_showFlag = true;
+			m_showLabel = false;
+			break;
+	}
+
+	// Label only mode is always 'fit to box'
+	if( m_showLabel && !m_showFlag )
+		m_fitToBox = true;
+
 	TQPixmap* pm = NULL;
 
 	if( code_ == ERROR_CODE ) {
@@ -52,61 +88,89 @@ LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& dis
 	}
 
 	TQString displayName(displayName_);
-	
+
 	if( displayName.isEmpty() ) {
 		displayName = KxkbConfig::getDefaultDisplayName(code_);
 	}
 	if( displayName.length() > 3 )
 		displayName = displayName.left(3);
 
-	const TQString pixmapKey( showFlag ? code_ + "." + displayName : displayName );
-	
-	pm = m_pixmapCache[pixmapKey];
-	if( pm )
-		return *pm;
+	const TQString pixmapKey(
+		TQString( m_showFlag ? "f" : "" ) + TQString( m_showLabel ? "l" : "" ) + TQString( m_labelShadow ? "s" : "" ) + "." +
+		m_labelFont.key() + "." + ( m_bgTransparent ? "x" : m_bgColor.name() ) + "." + m_fgColor.name() + "." + m_shColor.name() + '.' + code_ + "." + displayName
+	);
 
-	TQString flag;
-	if( showFlag ) {
-		TQString countryCode = getCountryFromLayoutName( code_ );
-		flag = locate("locale", flagTemplate.arg(countryCode));
+	// Only use cache for indicator
+	if( pixmapStyle == PIXMAP_STYLE_INDICATOR ) {
+		pm = m_pixmapCache[pixmapKey];
+		if( pm )
+			return *pm;
 	}
 
-	if( flag.isEmpty() ) {
-		pm = new TQPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT);
-		pm->fill(Qt::gray);
-	}
-	else {
-		pm = new TQPixmap(flag);
-		dimPixmap( *pm );
-
-#if 0		
-		if( pm->height() < FLAG_MAX_HEIGHT ) {
-			TQPixmap* pix = new TQPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT);
-			pix->fill( Qt::lightGray );
-//			pix->fill( TQColor(tqRgba(127,127,127,255)) );
-//			TQBitmap mask;
-//			mask.fill(1);
-//			pix->setMask(mask);
-			
-			int dy = (pix->height() - pm->height()) / 2;
-			copyBlt( pix, 0, dy, pm, 0, 0, -1, -1 );
-//			TQPixmap* px = new TQPixmap(21, 14);
-//			px->convertFromImage(img);*/
-			delete pm;
-			pm = pix;
+	// Need to create new pixmap
+	pm = new TQPixmap();
+
+	if( m_fitToBox ) // Resize to box size
+		pm->resize(FLAG_MAX_DIM, FLAG_MAX_DIM);
+
+	if( m_showFlag ) {
+		TQString countryCode = getCountryFromLayoutName( code_ );
+		TQString flag = locate("locale", flagTemplate.arg(countryCode));
+
+		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);
+			}
+
+			if( m_showLabel ) // only dim for label
+				dimPixmap( *pm );
 		}
-#endif
+	} else {
+		pm->fill(m_bgColor);
 	}
 
-	TQPainter p(pm);
-	p.setFont(m_labelFont);
+	if( m_showLabel ) {
+		TQPainter p(pm);
+		p.setFont(m_labelFont);
+
+		if( m_labelShadow ) {
+			p.setPen(m_shColor);
+			p.drawText(1, 1, pm->width(), pm->height(), TQt::AlignCenter, displayName);
+		}
+
+		p.setPen(m_fgColor);
+		p.drawText(0, 0, pm->width(), pm->height(), TQt::AlignCenter, displayName);
+
+		if( m_bgTransparent && !m_showFlag )
+		{
+			TQPixmap maskpix(pm->width(), pm->height());
+			TQPainter maskp(&maskpix);
+
+			maskpix.fill(TQt::white);
+			maskp.setPen(TQt::black);
+			maskp.setFont(m_labelFont);
+
+			maskp.drawText(0, 0, maskpix.width(), maskpix.height(), TQt::AlignCenter, displayName);
+			if( m_labelShadow )
+			{
+				maskp.drawText(1, 1, maskpix.width(), maskpix.height(), TQt::AlignCenter, displayName);
+			}
+
+			TQBitmap mask;
+			mask = maskpix;
+			pm->setMask(mask);
+		}
+	}
 
-	p.setPen(Qt::black);
-	p.drawText(1, 1, pm->width(), pm->height()-2, Qt::AlignCenter, displayName);
-	p.setPen(Qt::white);
-	p.drawText(0, 0, pm->width(), pm->height()-2, Qt::AlignCenter, displayName);
 
-	m_pixmapCache.insert(pixmapKey, pm);
+	if( pixmapStyle == PIXMAP_STYLE_INDICATOR )
+		m_pixmapCache.insert(pixmapKey, pm);
 
 	return *pm;
 }
@@ -117,21 +181,30 @@ LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& dis
 TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
 {
 	TQString flag;
-	
+
 	if( X11Helper::areLayoutsClean() ) { // >= Xorg 6.9.0
 		if( layoutName == "mkd" )
 			flag = "mk";
 		else
-		if( layoutName == "srp" ) {
-			TQString csFlagFile = locate("locale", flagTemplate.arg("cs"));
-			flag = csFlagFile.isEmpty() ? "yu" : "cs";
+		  if( layoutName == "srp" ) {
+			  TQString csFlagFile = locate("locale", flagTemplate.arg("cs"));
+			  flag = csFlagFile.isEmpty() ? "yu" : "cs";
 		}
 		else
 			if( layoutName.endsWith("/jp") )
 				flag = "jp";
-        else
-            if( layoutName == "trq" || layoutName == "trf" || layoutName == "tralt" )
-                flag = "tr";
+    else
+      if( layoutName == "trq" || layoutName == "trf" || layoutName == "tralt" )
+        flag = "tr";
+    else
+      if( layoutName == "epo" ) // Esperanto
+        flag = "eo";
+    else
+      if( layoutName == "mao" ) // Maori
+        flag = "mi";
+    else
+      if( layoutName == "brai" ) // Braille
+        flag = "braille";
 		else
 			if( layoutName.length() > 2 )
 				flag = "";
@@ -140,10 +213,19 @@ TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
 	}
 	else {
 		if( layoutName == "ar" )	// Arabic - not argentina
-			;
-		else
-			if( layoutName == "sr" || layoutName == "cs")	// Serbian language - Yugoslavia
-				flag = "yu";
+      ;
+    else
+      if( layoutName == "epo" ) // Esperanto
+          flag = "eo";
+    else
+      if( layoutName == "mao" ) // Maori
+          flag = "mi";
+    else
+      if( layoutName == "brai" ) // Braille
+          flag = "braille";
+    else
+      if( layoutName == "sr" || layoutName == "cs") // Serbian language - Yugoslavia
+          flag = "yu";
 		else
 			if( layoutName == "bs" )	// Bosnian language - Bosnia
 				flag = "ba";
@@ -178,8 +260,8 @@ TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
 			if( layoutName.endsWith("/jp") )
 				flag = "jp";
 		else
-			if( layoutName == "ml" || layoutName == "dev" || layoutName == "gur" 
-						 || layoutName == "guj" || layoutName == "kan" || layoutName == "ori" 
+			if( layoutName == "ml" || layoutName == "dev" || layoutName == "gur"
+						 || layoutName == "guj" || layoutName == "kan" || layoutName == "ori"
 						 || layoutName == "tel" || layoutName == "tml" || layoutName == "ben" ) // some Indian languages
 				flag = "in";
 		else {
@@ -189,8 +271,8 @@ TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
 			if( sepPos != -1 )
 				rightCode = layoutName.mid(sepPos+1);
 //			kdDebug() << "layout name breakup: " << leftCode << ":" << rightCode << endl;
-	
-			if( rightCode.length() == 2 
+
+			if( rightCode.length() == 2
 					&& TQRegExp("[A-Z][A-Z]").exactMatch(rightCode) ) {
 				flag = rightCode.lower();
 			}
@@ -199,7 +281,7 @@ TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
 			}
 		}
 	}
-	
+
     return flag;
 }
 
@@ -210,8 +292,8 @@ void LayoutIcon::dimPixmap(TQPixmap& pm)
 	for (int y=0; y<image.height(); y++)
 		for(int x=0; x<image.width(); x++)
 	{
-		QRgb rgb = image.pixel(x,y);
-		QRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4));
+		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);
@@ -223,15 +305,15 @@ static const char* ERROR_LABEL = "err";
 TQPixmap* LayoutIcon::createErrorPixmap()
 {
 	TQPixmap* pm = new TQPixmap(21, 14);
-	pm->fill(Qt::white);
+	pm->fill(TQt::white);
 
 	TQPainter p(pm);
 
 	p.setFont(m_labelFont);
-	p.setPen(Qt::red);
-	p.drawText(1, 1, pm->width(), pm->height()-2, Qt::AlignCenter, ERROR_LABEL);
-	p.setPen(Qt::blue);
-	p.drawText(0, 0, pm->width(), pm->height()-2, Qt::AlignCenter, ERROR_LABEL);
+	p.setPen(TQt::red);
+	p.drawText(1, 1, pm->width(), pm->height()-2, TQt::AlignCenter, ERROR_LABEL);
+	p.setPen(TQt::blue);
+	p.drawText(0, 0, pm->width(), pm->height()-2, TQt::AlignCenter, ERROR_LABEL);
 	m_pixmapCache.insert(ERROR_CODE, pm);
 
 	return pm;
diff --git a/kxkb/pixmap.h b/kxkb/pixmap.h
index 7070d91b2..a17f48d89 100644
--- a/kxkb/pixmap.h
+++ b/kxkb/pixmap.h
@@ -6,26 +6,43 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
+#include "kxkbconfig.h"
+
+enum PixmapStyle {
+  PIXMAP_STYLE_NORMAL = 0,
+  PIXMAP_STYLE_INDICATOR = 1,
+  PIXMAP_STYLE_CONTEXTMENU = 2
+};
 
 class LayoutIcon {
 
 private:
-	static LayoutIcon* instance;
-	static const TQString flagTemplate;
-	
-	TQDict<TQPixmap> m_pixmapCache;
-	TQFont m_labelFont;
-
-	LayoutIcon();
-	TQPixmap* createErrorPixmap();
-	void dimPixmap(TQPixmap& pixmap);
-	TQString getCountryFromLayoutName(const TQString& layoutName);
-	
-  public:
-	static const TQString& ERROR_CODE;
-	
-	static LayoutIcon& getInstance();
-	const TQPixmap& findPixmap(const TQString& code, bool showFlag, const TQString& displayName="");
+  static LayoutIcon* instance;
+  static const TQString flagTemplate;
+
+  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;
+
+  TQDict<TQPixmap> m_pixmapCache;
+
+  LayoutIcon();
+  TQPixmap* createErrorPixmap();
+  void dimPixmap(TQPixmap& pixmap);
+  TQString getCountryFromLayoutName(const TQString& layoutName);
+
+public:
+  static const TQString& ERROR_CODE;
+
+  static LayoutIcon& getInstance();
+  const TQPixmap& findPixmap(const TQString& code, int pixmapStyle, const TQString& displayName="");
 };
 
 #endif
diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index 20f817602..ab89b4f17 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -35,8 +35,6 @@ XkbRules::XkbRules(bool layoutsOnly):
 	}
 
 	loadRules(rulesFile, layoutsOnly);
-	loadOldLayouts(rulesFile);
-	loadGroups(::locate("config", "kxkb_groups"));
 }
 
 
@@ -58,84 +56,6 @@ void XkbRules::loadRules(TQString file, bool layoutsOnly)
 	//  fixLayouts();
 }
 
-// void XkbRules::fixLayouts() {
-// // THIS IS TEMPORARY!!!
-// // This should be fixed in XFree86 (and actually is fixed in XFree 4.2)
-// // some handcoded ones, because the X11 rule file doesn't get them correctly, or in case
-// // the rule file wasn't found
-// 	static struct {
-// 		const char * locale;
-// 		const char * layout;
-// 	} fixedLayouts[] = {
-// 		{ "ben", "Bengali" },
-// 		{ "ar", "Arabic" },
-// 		{ "ir", "Farsi" },
-// 		{ 0, 0 }
-// 	};
-// 	
-// 	for(int i=0; fixedLayouts[i].layout != 0; i++ ) {
-// 		if( m_layouts.find(fixedLayouts[i].locale) == 0 )
-// 			m_layouts.insert(fixedLayouts[i].locale, fixedLayouts[i].layout);
-// 	}
-// }
-
-bool XkbRules::isSingleGroup(const TQString& layout)
-{
-	  return X11Helper::areSingleGroupsSupported()
-			  && !m_oldLayouts.contains(layout)
-			  && !m_nonLatinLayouts.contains(layout);
-}
-
-
-// check $oldlayouts and $nonlatin groups for XFree 4.3 and later
-void XkbRules::loadOldLayouts(TQString rulesFile)
-{
-	OldLayouts* oldLayoutsStruct = X11Helper::loadOldLayouts( rulesFile );
-	m_oldLayouts = oldLayoutsStruct->oldLayouts;
-	m_nonLatinLayouts = oldLayoutsStruct->nonLatinLayouts;
-}
-
-// for multi-group layouts in XFree 4.2 and older
-//    or if layout is present in $oldlayout or $nonlatin groups
-void XkbRules::loadGroups(TQString file)
-{
-  TQFile f(file);
-  if (f.open(IO_ReadOnly))
-    {
-      TQTextStream ts(&f);
-      TQString locale;
-      unsigned int grp;
-
-      while (!ts.eof()) {
-         ts >> locale >> grp;
-	 locale.simplifyWhiteSpace();
-
-	 if (locale[0] == '#' || locale.left(2) == "//" || locale.isEmpty())
-	    continue;
-
-    	 m_initialGroups.insert(locale, grp);
-      }
-      
-      f.close();
-    }
-}
-
-unsigned int 
-XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup)
-{
-// check for new one-group layouts in XFree 4.3 and older
-    if( isSingleGroup(layout) ) {
-		if( includeGroup.isEmpty() == false )
-			return 1;
-		else
-			return 0;
-    }
-    
-    TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout);
-    return it == m_initialGroups.end() ? 0 : it.data();
-}
-
-
 TQStringList
 XkbRules::getAvailableVariants(const TQString& layout)
 {
@@ -146,11 +66,24 @@ XkbRules::getAvailableVariants(const TQString& layout)
     if( result1 )
         return *result1;
 
-    bool oldLayouts = m_oldLayouts.contains(layout);
-    TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts);
+    TQStringList* result = X11Helper::getVariants(layout, X11_DIR);
 
     m_varLists.insert(layout, result);
 
     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 a4955317e..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
 {
@@ -15,30 +17,26 @@ public:
   const TQDict<char> &models() const { return m_models; };
   const TQDict<char> &layouts() const { return m_layouts; };
   const TQDict<char> &options() const { return m_options; };
-  
+
   TQStringList getAvailableVariants(const TQString& layout);
-  unsigned int getDefaultGroup(const TQString& layout, const TQString& includeGroup);
 
-  bool isSingleGroup(const TQString& layout);
+  TQString getLayoutName(LayoutUnit layout) const;
 
-protected:
+  /// A helper to translate option description
+  static TQString trOpt(TQString opt);
 
+protected:
   void loadRules(TQString filename, bool layoutsOnly=false);
-  void loadGroups(TQString filename);
-  void loadOldLayouts(TQString filename);
 
 private:
 
   TQDict<char> m_models;
   TQDict<char> m_layouts;
   TQDict<char> m_options;
-  TQMap<TQString, unsigned int> m_initialGroups;
   TQDict<TQStringList> m_varLists;
-  TQStringList m_oldLayouts;
-  TQStringList m_nonLatinLayouts;
-  
+
   TQString X11_DIR;	// pseudo-constant
-  
+
 //  void fixLayouts();
 };
 
diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp
index 1c8db4a4a..90e29d9e2 100644
--- a/kxkb/x11helper.cpp
+++ b/kxkb/x11helper.cpp
@@ -1,3 +1,4 @@
+#include <tqdom.h>
 #include <tqdir.h>
 #include <tqstring.h>
 #include <tqwindowdefs.h>
@@ -7,6 +8,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
+#include <kstandarddirs.h>
+#include <tdelocale.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -119,13 +122,12 @@ X11Helper::findXkbRulesFile(TQString x11Dir, Display *dpy)
 		    }
     	}
     }
-	
+
 	return rulesFile;
 }
 
 RulesInfo*
-X11Helper::loadRules(const TQString& file, bool layoutsOnly) 
-{
+X11Helper::loadRules(const TQString& file, bool layoutsOnly) {
 	XkbRF_RulesPtr xkbRules = XkbRF_Load(TQFile::encodeName(file).data(), "", true, true);
 
 	if (xkbRules == NULL) {
@@ -151,32 +153,87 @@ X11Helper::loadRules(const TQString& file, bool layoutsOnly)
 		XkbRF_Free(xkbRules, true);
 		return rulesInfo;
 	}
-  
+
   for (int i = 0; i < xkbRules->models.num_desc; ++i)
       rulesInfo->models.replace(xkbRules->models.desc[i].name, tqstrdup( xkbRules->models.desc[i].desc ) );
-  for (int i = 0; i < xkbRules->options.num_desc; ++i)
-      rulesInfo->options.replace(xkbRules->options.desc[i].name, tqstrdup( xkbRules->options.desc[i].desc ) );
 
-  XkbRF_Free(xkbRules, true);
+  // Prefer XML file for Xkb options
+  if (TQFile(file + ".xml").exists()) {
+      XkbRF_Free(xkbRules, true);
+
+      TQDomDocument xmlrules("xkbrules");
+      TQFile xmlfile(file + ".xml");
+      if (!xmlfile.open(IO_ReadOnly)) {
+          return NULL;
+      }
+      if (!xmlrules.setContent(&xmlfile)) {
+          xmlfile.close();
+          return NULL;
+      }
+      xmlfile.close();
+
+      TQDomElement options = xmlrules.documentElement().namedItem("optionList").toElement();
+      TQDomNode optGroupNode = options.firstChild();
+      while (!optGroupNode.isNull()) {
+          TQDomElement optGroupElem = optGroupNode.toElement();
+          if (optGroupElem.tagName() == "group") {
+              TQDomNode optNode = optGroupElem.firstChild();
+              while (!optNode.isNull()) {
+                TQDomElement optElem = optNode.toElement();
+                if (!optElem.isNull()) {
+                    // This might be either a configItem (group) or an option tag
+                    // If it is an option tag, it contains a configItem that describes
+                    // the option
+                    if (optElem.tagName() == "option") {
+                        optElem = optElem.namedItem("configItem").toElement();
+                    }
+
+                    TQString optName = optElem.namedItem("name").toElement().text();
+                    TQString optDesc = optElem.namedItem("description").toElement().text();
+                    if (optDesc.isEmpty()) {
+                        optDesc = optName;
+                    }
+                    // Items from these 'meta' groups fall into other groups
+                    // Admittedly not the best way to handle this
+                    if (optName == "currencysign" || optName == "compat") break;
+
+                    // HACK this should be called "compose" or else the code breaks
+                    if (optName == "Compose key") optName = "compose";
+
+                    rulesInfo->options.replace(optName.ascii(), tqstrdup(optDesc.ascii()));
+                }
+                optNode = optNode.nextSibling();
+              }
+          }
+          optGroupNode = optGroupNode.nextSibling();
+      }
+  }
+  else {
+      for (int i = 0; i < xkbRules->options.num_desc; ++i)
+          rulesInfo->options.replace(xkbRules->options.desc[i].name, tqstrdup( xkbRules->options.desc[i].desc ) );
+
+      XkbRF_Free(xkbRules, true);
+
+      // workaround for empty 'compose' options group description
+      if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) {
+          rulesInfo->options.replace("compose", I18N_NOOP("Compose Key Position"));
+      }
+  }
 
-// workaround for empty 'compose' options group description
-   if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) {
-     rulesInfo->options.replace("compose", "Compose Key Position");
-   }
 
   for(TQDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) {
-	  TQString option(it.currentKey());
-	  int columnPos = option.find(":");
-	  
-	  if( columnPos != -1 ) {
-		  TQString group = option.mid(0, columnPos);
-		  if( rulesInfo->options.find(group) == NULL ) {
-			  rulesInfo->options.replace(group, group.latin1());
-			  kdDebug() << "Added missing option group: " << group << endl;
-		  }
-	  }
+      // Add missing option groups
+      TQString option(it.currentKey());
+      int columnPos = option.find(":");
+
+      if( columnPos != -1 ) {
+          TQString group = option.mid(0, columnPos);
+          if( rulesInfo->options.find(group) == NULL ) {
+              rulesInfo->options.replace(group, group.latin1());
+              kdDebug() << "Added missing option group: " << group << endl;
+          }
+      }
   }
-  
 //   // workaround for empty misc options group description in XFree86 4.4.0
 //   if( rulesInfo->options.find("numpad:microsoft") && !rulesInfo->options.find("misc") ) {
 //     rulesInfo->options.replace("misc", "Miscellaneous compatibility options" );
@@ -335,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/be/flag.png b/l10n/be/flag.png
index 0a86c4e8b..8f247f7c2 100644
--- a/l10n/be/flag.png
+++ b/l10n/be/flag.png
diff --git a/l10n/bg/flag.png b/l10n/bg/flag.png
index d9e01788e..eb84bcfd8 100644
--- a/l10n/bg/flag.png
+++ b/l10n/bg/flag.png
diff --git a/l10n/br/flag.png b/l10n/br/flag.png
index 130042070..b88f9e4d6 100644
--- a/l10n/br/flag.png
+++ b/l10n/br/flag.png
diff --git a/l10n/braille/entry.desktop b/l10n/braille/entry.desktop
new file mode 100644
index 000000000..78b58ac14
--- /dev/null
+++ b/l10n/braille/entry.desktop
@@ -0,0 +1,19 @@
+[KCM Locale]
+Name=Braille
+# Region=
+Languages=brai
+# DecimalSymbol=
+# ThousandsSeparator=
+# CurrencySymbol=
+# MonetaryDecimalSymbol=
+# MonetaryThousandsSeparator=
+# PositiveSign=
+# NegativeSign=
+# FracDigits=
+# PositivePrefixCurrencySymbol=
+# NegativePrefixCurrencySymbol=
+# PositiveMonetarySignPosition=
+# NegativeMonetarySignPosition=
+# DateFormat=
+# DateFormatShort=
+# TimeFormat=
diff --git a/l10n/braille/flag.png b/l10n/braille/flag.png
new file mode 100644
index 000000000..1cfdea7e4
--- /dev/null
+++ b/l10n/braille/flag.png
diff --git a/l10n/ca/flag.png b/l10n/ca/flag.png
index 35993331f..c3174aaba 100644
--- a/l10n/ca/flag.png
+++ b/l10n/ca/flag.png
diff --git a/l10n/ch/flag.png b/l10n/ch/flag.png
index 2247b3991..1eed85c97 100644
--- a/l10n/ch/flag.png
+++ b/l10n/ch/flag.png
diff --git a/l10n/cn/flag.png b/l10n/cn/flag.png
index dfc481b7e..b6af69a5b 100644
--- a/l10n/cn/flag.png
+++ b/l10n/cn/flag.png
diff --git a/l10n/cz/flag.png b/l10n/cz/flag.png
index c0cd5feb0..29a66d30c 100644
--- a/l10n/cz/flag.png
+++ b/l10n/cz/flag.png
diff --git a/l10n/de/flag.png b/l10n/de/flag.png
index 5cf8fd97e..5df725ac3 100644
--- a/l10n/de/flag.png
+++ b/l10n/de/flag.png
diff --git a/l10n/ee/flag.png b/l10n/ee/flag.png
index dd5c4a0bb..b05acf94e 100644
--- a/l10n/ee/flag.png
+++ b/l10n/ee/flag.png
diff --git a/l10n/eo/entry.desktop b/l10n/eo/entry.desktop
new file mode 100644
index 000000000..76eb14339
--- /dev/null
+++ b/l10n/eo/entry.desktop
@@ -0,0 +1,19 @@
+[KCM Locale]
+Name=Esperanto
+# Region=
+Languages=epo
+DecimalSymbol=,
+ThousandsSeparator=.
+# CurrencySymbol=
+MonetaryDecimalSymbol=,
+MonetaryThousandsSeparator=.
+PositiveSign=
+NegativeSign=-
+FracDigits=2
+PositivePrefixCurrencySymbol=false
+NegativePrefixCurrencySymbol=false
+PositiveMonetarySignPosition=1
+NegativeMonetarySignPosition=1
+DateFormat[eo]=%A, la %ea de %B %Y
+DateFormatShort=%d/%m/%Y
+TimeFormat=%H:%M:%S
diff --git a/l10n/eo/flag.png b/l10n/eo/flag.png
new file mode 100644
index 000000000..ab11c1ec0
--- /dev/null
+++ b/l10n/eo/flag.png
diff --git a/l10n/es/flag.png b/l10n/es/flag.png
index 269c1fba0..36460c044 100644
--- a/l10n/es/flag.png
+++ b/l10n/es/flag.png
diff --git a/l10n/fi/flag.png b/l10n/fi/flag.png
index 10ff1d3e5..e6d813adb 100644
--- a/l10n/fi/flag.png
+++ b/l10n/fi/flag.png
diff --git a/l10n/fo/flag.png b/l10n/fo/flag.png
index e6d14f3dc..61fbd452c 100644
--- a/l10n/fo/flag.png
+++ b/l10n/fo/flag.png
diff --git a/l10n/fr/flag.png b/l10n/fr/flag.png
index 1f838c4e4..b1f16d9c3 100644
--- a/l10n/fr/flag.png
+++ b/l10n/fr/flag.png
diff --git a/l10n/gb/flag.png b/l10n/gb/flag.png
index 0cab30b34..30433110d 100644
--- a/l10n/gb/flag.png
+++ b/l10n/gb/flag.png
diff --git a/l10n/gr/flag.png b/l10n/gr/flag.png
index 79bf55176..d644d2a0c 100644
--- a/l10n/gr/flag.png
+++ b/l10n/gr/flag.png
diff --git a/l10n/hr/entry.desktop b/l10n/hr/entry.desktop
index 034e4e334..6fae771fe 100644
--- a/l10n/hr/entry.desktop
+++ b/l10n/hr/entry.desktop
@@ -4,7 +4,7 @@ Region=southeurope
 Languages=hr
 DecimalSymbol=,
 ThousandsSeparator=
-CurrencySymbol=Kn
+CurrencySymbol=€
 MonetaryDecimalSymbol=,
 MonetaryThousandsSeparator=$0 $0
 PositiveSign=
diff --git a/l10n/hr/flag.png b/l10n/hr/flag.png
index 6af0f205e..67b6572c4 100644
--- a/l10n/hr/flag.png
+++ b/l10n/hr/flag.png
diff --git a/l10n/hu/flag.png b/l10n/hu/flag.png
index 8ffc67d10..6f4d79f67 100644
--- a/l10n/hu/flag.png
+++ b/l10n/hu/flag.png
diff --git a/l10n/id/flag.png b/l10n/id/flag.png
index fd94581e8..ca9c32e1d 100644
--- a/l10n/id/flag.png
+++ b/l10n/id/flag.png
diff --git a/l10n/ie/flag.png b/l10n/ie/flag.png
index 8749cfb3c..e67118e7c 100644
--- a/l10n/ie/flag.png
+++ b/l10n/ie/flag.png
diff --git a/l10n/is/flag.png b/l10n/is/flag.png
index 734cf083f..d61548a8a 100644
--- a/l10n/is/flag.png
+++ b/l10n/is/flag.png
diff --git a/l10n/it/flag.png b/l10n/it/flag.png
index b5cc3caec..e8da48432 100644
--- a/l10n/it/flag.png
+++ b/l10n/it/flag.png
diff --git a/l10n/jp/flag.png b/l10n/jp/flag.png
index c61eee796..69a1094ec 100644
--- a/l10n/jp/flag.png
+++ b/l10n/jp/flag.png
diff --git a/l10n/jv/entry.desktop b/l10n/jv/entry.desktop
new file mode 100644
index 000000000..9207d197e
--- /dev/null
+++ b/l10n/jv/entry.desktop
@@ -0,0 +1,19 @@
+[KCM Locale]
+Name=Indonesia (Java)
+Region=southeastasia
+Languages=jv
+DecimalSymbol=,
+ThousandsSeparator=.
+CurrencySymbol=Rp.
+MonetaryDecimalSymbol=,
+MonetaryThousandsSeparator=.
+PositiveSign=
+NegativeSign=-
+FractDigits=2
+PositivePrefixCurrencySymbol=true
+NegativePrefixCurrencySymbol=true
+NegativeMonetarySignPosition=1
+DateFormat[jv]=%A, %d %B %Y
+DateFormat[eo]=%A, la %ea de %B %Y
+DateFormatShort=%e/%m/%Y
+TimeFormat=%H:%M:%S
diff --git a/l10n/jv/flag.png b/l10n/jv/flag.png
new file mode 100644
index 000000000..ca9c32e1d
--- /dev/null
+++ b/l10n/jv/flag.png
diff --git a/l10n/kr/flag.png b/l10n/kr/flag.png
index e332a5aec..9a723af64 100644
--- a/l10n/kr/flag.png
+++ b/l10n/kr/flag.png
diff --git a/l10n/lt/entry.desktop b/l10n/lt/entry.desktop
index 3eeef4b8e..1059a08af 100644
--- a/l10n/lt/entry.desktop
+++ b/l10n/lt/entry.desktop
@@ -4,7 +4,7 @@ Region=northeurope
 Languages=lt
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-CurrencySymbol=Lt
+CurrencySymbol=€
 MonetaryDecimalSymbol=,
 MonetaryThousandsSeparator=$0 $0
 PositiveSign=
diff --git a/l10n/lu/flag.png b/l10n/lu/flag.png
index 9fa189894..8a207778a 100644
--- a/l10n/lu/flag.png
+++ b/l10n/lu/flag.png
diff --git a/l10n/lv/entry.desktop b/l10n/lv/entry.desktop
index 07b09e394..8f4713f11 100644
--- a/l10n/lv/entry.desktop
+++ b/l10n/lv/entry.desktop
@@ -4,7 +4,7 @@ Region=northeurope
 Languages=lv
 DecimalSymbol=,
 ThousandsSeparator=.
-CurrencySymbol=Ls
+CurrencySymbol=€
 MonetaryDecimalSymbol=,
 MonetaryThousandsSeparator=.
 PositiveSign=
diff --git a/l10n/mc/flag.png b/l10n/mc/flag.png
index fed650ed0..5ddca2bcd 100644
--- a/l10n/mc/flag.png
+++ b/l10n/mc/flag.png
diff --git a/l10n/me/flag.png b/l10n/me/flag.png
index 696a2ce26..b754ff4c9 100644
--- a/l10n/me/flag.png
+++ b/l10n/me/flag.png
diff --git a/l10n/mi/entry.desktop b/l10n/mi/entry.desktop
new file mode 100644
index 000000000..34b2b4fdb
--- /dev/null
+++ b/l10n/mi/entry.desktop
@@ -0,0 +1,30 @@
+[KCM Locale]
+Name=New Zealand
+Region=oceania
+Languages=mi,en_GB,en
+DecimalSymbol=.
+ThousandsSeparator=,
+CurrencySymbol=A$
+MonetaryDecimalSymbol=.
+MonetaryThousandsSeparator=,
+PositiveSign=
+NegativeSign=-
+FracDigits=2
+#PositivePrefixCurrencySymbol=
+#NegativePrefixCurrencySymbol=
+#PositiveMonetarySignPosition=
+#NegativeMonetarySignPosition=
+DateFormat[en_GB]=%a, %e %b %Y
+DateFormat[en]=%a, %e %b %Y
+DateFormat[en_US]=%a, %e %b %Y
+DateFormat[eo]=%A, la %ea de %B %Y
+DateFormatShort=%d/%m/%y
+TimeFormat[en_GB]=%I:%M:%S %p
+TimeFormat[en]=%I:%M:%S %p
+TimeFormat[en_US]=%I:%M:%S %p
+TimeFormat[eo]=%H:%M:%S
+#WeekStartDay=
+#PageSize=
+#MeasureSystem=
+AddressFormat=%0(%n\n)%0(%cm\n)%0(%s\n)%0(PO BOX %p\n)%0(%L%w%w%R%w%w)%z
+AddressCountryPosition=BELOW
diff --git a/l10n/mi/flag.png b/l10n/mi/flag.png
new file mode 100644
index 000000000..ba71ef4d5
--- /dev/null
+++ b/l10n/mi/flag.png
diff --git a/l10n/mt/flag.png b/l10n/mt/flag.png
index 599251ccc..882ac9525 100644
--- a/l10n/mt/flag.png
+++ b/l10n/mt/flag.png
diff --git a/l10n/nl/flag.png b/l10n/nl/flag.png
index 9462408e7..1d90ac47c 100644
--- a/l10n/nl/flag.png
+++ b/l10n/nl/flag.png
diff --git a/l10n/no/flag.png b/l10n/no/flag.png
index ba73fd393..f183da7b6 100644
--- a/l10n/no/flag.png
+++ b/l10n/no/flag.png
diff --git a/l10n/np/flag.png b/l10n/np/flag.png
index ab1b265d7..3f500f236 100644
--- a/l10n/np/flag.png
+++ b/l10n/np/flag.png
diff --git a/l10n/pa/flag.png b/l10n/pa/flag.png
index 72ef8208b..725c330a6 100644
--- a/l10n/pa/flag.png
+++ b/l10n/pa/flag.png
diff --git a/l10n/pe/flag.png b/l10n/pe/flag.png
index 950612aaf..614cdbbde 100644
--- a/l10n/pe/flag.png
+++ b/l10n/pe/flag.png
diff --git a/l10n/pl/flag.png b/l10n/pl/flag.png
index ec01938c6..0d34cf4da 100644
--- a/l10n/pl/flag.png
+++ b/l10n/pl/flag.png
diff --git a/l10n/pt/flag.png b/l10n/pt/flag.png
index 490668054..6866f71cd 100644
--- a/l10n/pt/flag.png
+++ b/l10n/pt/flag.png
diff --git a/l10n/rs/flag.png b/l10n/rs/flag.png
index 6c8e16da1..463cb641b 100644
--- a/l10n/rs/flag.png
+++ b/l10n/rs/flag.png
diff --git a/l10n/ru/flag.png b/l10n/ru/flag.png
index a750b8f29..a7eaf3863 100644
--- a/l10n/ru/flag.png
+++ b/l10n/ru/flag.png
diff --git a/l10n/se/flag.png b/l10n/se/flag.png
index 2921fb060..0df66e6e8 100644
--- a/l10n/se/flag.png
+++ b/l10n/se/flag.png
diff --git a/l10n/si/flag.png b/l10n/si/flag.png
index aa5dab013..18dc5f1c8 100644
--- a/l10n/si/flag.png
+++ b/l10n/si/flag.png
diff --git a/l10n/sk/flag.png b/l10n/sk/flag.png
index 123d7ab81..5dc4cc2e5 100644
--- a/l10n/sk/flag.png
+++ b/l10n/sk/flag.png
diff --git a/l10n/uy/flag.png b/l10n/uy/flag.png
index 09a7fb4eb..d034a03ac 100644
--- a/l10n/uy/flag.png
+++ b/l10n/uy/flag.png
diff --git a/l10n/vc/flag.png b/l10n/vc/flag.png
index f261d4efa..13dd46176 100644
--- a/l10n/vc/flag.png
+++ b/l10n/vc/flag.png
diff --git a/l10n/za/flag.png b/l10n/za/flag.png
index e3a28a3be..5f67ac8f8 100644
--- a/l10n/za/flag.png
+++ b/l10n/za/flag.png
diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt
index 9c8842785..c1780780d 100644
--- a/libkonq/CMakeLists.txt
+++ b/libkonq/CMakeLists.txt
@@ -43,6 +43,7 @@ install( FILES
     konq_historymgr.h konq_historycomm.h konq_pixmapprovider.h
     kivdirectoryoverlay.h kivfreespaceoverlay.h konq_faviconmgr.h
     konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h
+    konq_sort_constants.h konq_string_compare.h
   DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
@@ -65,12 +66,12 @@ tde_create_translated_desktop(
 
 tde_add_library( konq SHARED AUTOMOC
   SOURCES
-    konq_popupmenu.cc knewmenu.cc konq_xmlguiclient.cc tdefileivi.cc
-    konq_iconviewwidget.cc konq_settings.cc konq_drag.cc konq_operations.cc
-    konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc konq_undo.cc
-    konq_undo.skel konq_historymgr.cc konq_historycomm.cc konq_historycomm.skel
-    konq_pixmapprovider.cc kivdirectoryoverlay.cc kivfreespaceoverlay.cc
-    konq_faviconmgr.cc konq_faviconmgr.skel konq_filetip.cc
+    konq_popupmenu.cpp knewmenu.cpp konq_xmlguiclient.cpp tdefileivi.cpp
+    konq_iconviewwidget.cpp konq_settings.cpp konq_drag.cpp konq_operations.cpp
+    konq_dirpart.cpp konq_propsview.cpp konq_events.cpp konq_bgnddlg.cpp konq_undo.cpp
+    konq_undo.skel konq_historymgr.cpp konq_historycomm.cpp konq_historycomm.skel
+    konq_pixmapprovider.cpp kivdirectoryoverlay.cpp kivfreespaceoverlay.cpp
+    konq_faviconmgr.cpp konq_faviconmgr.skel konq_filetip.cpp
   VERSION 4.2.0
   LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
@@ -81,7 +82,7 @@ tde_add_library( konq SHARED AUTOMOC
 
 if( WITH_ARTS )
   tde_add_kpart( konq_sound
-    SOURCES konq_sound.cc
+    SOURCES konq_sound.cpp
     LINK artskde-shared
     DESTINATION ${PLUGIN_INSTALL_DIR} )
 endif( )
diff --git a/libkonq/Makefile.am b/libkonq/Makefile.am
index 131449d7e..3c3897155 100644
--- a/libkonq/Makefile.am
+++ b/libkonq/Makefile.am
@@ -23,17 +23,17 @@ lib_LTLIBRARIES = libkonq.la
 libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
 libkonq_la_LIBADD = $(LIB_TDEPARTS)
 
-libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
-   konq_xmlguiclient.cc\
-   tdefileivi.cc konq_iconviewwidget.cc konq_settings.cc konq_drag.cc  \
-   konq_operations.cc \
-   konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc \
-   konq_undo.cc konq_undo.skel \
-   konq_historymgr.cc konq_historycomm.cc konq_historycomm.skel \
-   konq_pixmapprovider.cc \
-   kivdirectoryoverlay.cc \
-   kivfreespaceoverlay.cc \
-   konq_faviconmgr.cc konq_faviconmgr.skel konq_filetip.cc
+libkonq_la_SOURCES = konq_popupmenu.cpp knewmenu.cpp \
+   konq_xmlguiclient.cpp\
+   tdefileivi.cpp konq_iconviewwidget.cpp konq_settings.cpp konq_drag.cpp  \
+   konq_operations.cpp \
+   konq_dirpart.cpp konq_propsview.cpp konq_events.cpp konq_bgnddlg.cpp \
+   konq_undo.cpp konq_undo.skel \
+   konq_historymgr.cpp konq_historycomm.cpp konq_historycomm.skel \
+   konq_pixmapprovider.cpp \
+   kivdirectoryoverlay.cpp \
+   kivfreespaceoverlay.cpp \
+   konq_faviconmgr.cpp konq_faviconmgr.skel konq_filetip.cpp
 
 directory_DATA = directory_bookmarkbar.desktop 
 directorydir   = $(kde_datadir)/kbookmark
@@ -52,7 +52,8 @@ include_HEADERS = konq_popupmenu.h knewmenu.h \
     konq_pixmapprovider.h \
     kivdirectoryoverlay.h \
     kivfreespaceoverlay.h \
-    konq_faviconmgr.h konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h
+    konq_faviconmgr.h konq_xmlguiclient.h konqbookmarkmanager.h konq_filetip.h \
+    konq_sort_constants.h konq_string_compare.h
 
 
 if include_ARTS
@@ -60,14 +61,14 @@ ARTS_MODULE = konq_sound.la
 endif
 
 kde_module_LTLIBRARIES = $(ARTS_MODULE)
-konq_sound_la_SOURCES = konq_sound.cc
+konq_sound_la_SOURCES = konq_sound.cpp
 konq_sound_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 konq_sound_la_LIBADD = -lsoundserver_idl -lartskde
 
 noinst_HEADERS = konq_sound.h
 
 messages:
-	$(XGETTEXT) *.cc *.h -o $(podir)/libkonq.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/libkonq.pot
 
 DOXYGEN_REFERENCES = dcop tdecore tdeio/bookmarks
 include ../admin/Doxyfile.am
diff --git a/libkonq/PLUGINS b/libkonq/PLUGINS.md
index 4eb535a59..f89ca70ef 100644
--- a/libkonq/PLUGINS
+++ b/libkonq/PLUGINS.md
@@ -1,13 +1,20 @@
+Menu Plugins
+============
+
 Thus file explains how to add plugins into the konqpopupmenu
 used by konqueror and kdesktop.
 
-Why?
+Why
+---
+
 Why do we need this kind of functionality? We do have SERVICEMENUS.
 A plugin can be much more dynamic. If you want to add features that
 are runtime specific or need some interaction with different things
-a plugin comes in handy
+a plugin comes in handy.
+
+How
+---
 
-How?
-Please look at ?no_location? to get the latest plugin template
+Please look at *no_location* to get the latest plugin template.
 
-Holger Freyther 30th October 2001 
\ No newline at end of file
+Holger Freyther 30th October 2001
diff --git a/libkonq/SERVICEMENUS b/libkonq/SERVICEMENUS
deleted file mode 100644
index 12035388c..000000000
--- a/libkonq/SERVICEMENUS
+++ /dev/null
@@ -1,52 +0,0 @@
-This file explains how to add an item in the popupmenu (for both
-konqueror and kdesktop), without using the file associations.
-
-Why
-===
-One reason for doing this is being able to associate
-some action with all files without this action becoming a default handler
-(called on left click).
-Another is that for text-based programs and tools (e.g. gzip) it's faster
-than defining a desktop file for the application, making it hidden, and
-associate it with the relevant file types.
-
-How
-===
-Create a file ~/.trinity/share/apps/konqueror/servicemenus/something.desktop
-and write into it something like (without the comments) :
-
-[Desktop Entry]
-ServiceTypes=text/html,text/plain # use all/all for all entries
-                                  # all/allfiles for files only
-                                  # and use inode/directory for dirs only
-                                  # you can also do things like image/* for all
-                                  # image mimetypes
-Actions=gzip;mail                 # those are ';' separated, per the standard !
-X-TDE-Submenu=Menuname            # this optional entry allows grouping the 
-                                  # entries in this servicemenu file into a
-                                  # common submenu, in this case "Menuname"
-TryExec=gzip			  # Find if executable exist, if it doesn't exist
-				  # menu entry is not displaying
-ExcludeServiceTypes=application/x-zip # This entry is used to avoid to display menu
-				      # when it's a specific servicetype
-				      # for exemple when we use all/allfiles and zip
-				      # them, we don't want to zip a zip file
-
-
-[Desktop Action gzip]            # One "Desktop Action <name>" group per Action
-Name=GZip this file
-Name[fr]=...
-Icon=tgz
-Exec=gzip %f
-
-[Desktop Action mail]
-Name=Mail this file
-Name[fr]=...
-Icon=kmail
-Exec=kmail --there-is-no-such-option-yet %f
-
-
-See also the "desktop entry standard", which defines more formally the same
-concept of actions but for desktop files (e.g. eject on a device desktop file,
-etc.)
-
diff --git a/libkonq/SERVICEMENUS.md b/libkonq/SERVICEMENUS.md
new file mode 100644
index 000000000..bcd7ae1f7
--- /dev/null
+++ b/libkonq/SERVICEMENUS.md
@@ -0,0 +1,55 @@
+Service Menus
+=============
+
+This file explains how to add an item in the popupmenu (for both
+konqueror and kdesktop), without using the file associations.
+
+Why
+---
+
+One reason for doing this is being able to associate
+some action with all files without this action becoming a default handler
+(called on left click).
+
+Another is that for text-based programs and tools (e.g. gzip) it's faster
+than defining a desktop file for the application, making it hidden, and
+associate it with the relevant file types.
+
+How
+---
+
+Create a file `~/.trinity/share/apps/konqueror/servicemenus/something.desktop`
+and write into it something like (without the comments):
+
+    [Desktop Entry]
+    ServiceTypes=text/html,text/plain # use all/all for all entries
+                                      # all/allfiles for files only
+                                      # and use inode/directory for dirs only
+                                      # you can also do things like image/* for all
+                                      # image mimetypes
+    Actions=gzip;mail                 # those are ';' separated, per the standard !
+    X-TDE-Submenu=Menuname            # this optional entry allows grouping the 
+                                      # entries in this servicemenu file into a
+                                      # common submenu, in this case "Menuname"
+    TryExec=gzip                      # Find if executable exist, if it doesn't exist
+                                      # menu entry is not displaying
+    ExcludeServiceTypes=application/x-zip # This entry is used to avoid to display menu
+                                      # when it's a specific servicetype
+                                      # for exemple when we use all/allfiles and zip
+                                      # them, we don't want to zip a zip file
+
+    [Desktop Action gzip]             # One "Desktop Action <name>" group per Action
+    Name=GZip this file
+    Name[fr]=...
+    Icon=tgz
+    Exec=gzip %f
+
+    [Desktop Action mail]
+    Name=Mail this file
+    Name[fr]=...
+    Icon=kmail
+    Exec=kmail --there-is-no-such-option-yet %f
+
+See also the *desktop entry standard*, which defines more formally the same
+concept of actions but for desktop files (e.g. eject on a device desktop file,
+etc.).
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 234bcf19d..c0d5a4f38 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -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());
@@ -219,7 +219,7 @@ void FaviconsModule::slotResult(TDEIO::Job *job)
         TQBuffer buffer(download.iconData);
         buffer.open(IO_ReadOnly);
         TQImageIO io;
-        io.setIODevice(TQT_TQIODEVICE(&buffer));
+        io.setIODevice(&buffer);
         io.setParameters("size=16");
         // Check here too, the job might have had no error, but the downloaded
         // file contains just a 404 message sent with a 200 status.
@@ -271,5 +271,3 @@ extern "C" {
         return new FaviconsModule(obj);
     }
 }
-
-// vim: ts=4 sw=4 et
diff --git a/libkonq/favicons/favicons.h b/libkonq/favicons/favicons.h
index e42dace1b..61480e5b9 100644
--- a/libkonq/favicons/favicons.h
+++ b/libkonq/favicons/favicons.h
@@ -44,7 +44,7 @@ namespace TDEIO { class Job; }
  */
 class FaviconsModule : public KDEDModule
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 public:
     FaviconsModule(const TQCString &obj);
@@ -101,5 +101,3 @@ private:
 };
 
 #endif
-
-// vim: ts=4 sw=4 et
diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cpp
index bb1b0d6c2..590747b9c 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cpp
@@ -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/kivdirectoryoverlay.h b/libkonq/kivdirectoryoverlay.h
index 1734f8108..0aa7e912e 100644
--- a/libkonq/kivdirectoryoverlay.h
+++ b/libkonq/kivdirectoryoverlay.h
@@ -30,7 +30,7 @@ class KFileIVI;
 
 class LIBKONQ_EXPORT KIVDirectoryOverlay : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     KIVDirectoryOverlay(KFileIVI* directory);
diff --git a/libkonq/kivfreespaceoverlay.cc b/libkonq/kivfreespaceoverlay.cpp
index 29069cf4f..d0cd82e7d 100644
--- a/libkonq/kivfreespaceoverlay.cc
+++ b/libkonq/kivfreespaceoverlay.cpp
@@ -1,6 +1,6 @@
 /*  This file is part of the TDE libraries
     Copyright (C) 2013 Timothy Pearson
-    Based on kivdirectoryoverlay.cc
+    Based on kivdirectoryoverlay.cpp
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -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/kivfreespaceoverlay.h b/libkonq/kivfreespaceoverlay.h
index 6527ccd29..a31d66b92 100644
--- a/libkonq/kivfreespaceoverlay.h
+++ b/libkonq/kivfreespaceoverlay.h
@@ -31,7 +31,7 @@ class KFileIVI;
 
 class LIBKONQ_EXPORT KIVFreeSpaceOverlay : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     KIVFreeSpaceOverlay(KFileIVI* freespace);
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cpp
index 621b1f614..4dc1070cb 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cpp
@@ -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" );
 
@@ -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++;
@@ -368,11 +368,11 @@ void KNewMenu::slotNewDir()
 
 void KNewMenu::slotNewFile()
 {
-    int id = TQString( TQT_TQOBJECT_CONST(sender())->name() + 7 ).toInt(); // skip "newmenu"
+    int id = TQString( sender()->name() + 7 ).toInt(); // skip "newmenu"
     if (id == 0)
     {
 	// run the command for the templates
-	KRun::runCommand(TQString(TQT_TQOBJECT_CONST(sender())->name()));
+	KRun::runCommand(TQString(sender()->name()));
 	return;
     }
 
@@ -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 );
@@ -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/knewmenu.h b/libkonq/knewmenu.h
index a0ea38f44..5d28e58cb 100644
--- a/libkonq/knewmenu.h
+++ b/libkonq/knewmenu.h
@@ -51,7 +51,7 @@ class TQPopupMenu;
  */
 class LIBKONQ_EXPORT KNewMenu : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
@@ -184,7 +184,7 @@ private:
  */
 class KURLDesktopFileDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KURLDesktopFileDlg( const TQString& textFileName, const TQString& textUrl );
     KURLDesktopFileDlg( const TQString& textFileName, const TQString& textUrl, TQWidget *parent );
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cpp
index 60f3aa63d..04a95f3b0 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cpp
@@ -47,15 +47,15 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
     TQVBoxLayout* mainLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
 
     m_buttonGroup = new TQButtonGroup( i18n("Background"), page );
-    m_buttonGroup->setColumnLayout( 0, Qt::Vertical );
+    m_buttonGroup->setColumnLayout( 0, TQt::Vertical );
     m_buttonGroup->layout()->setMargin( KDialog::marginHint() );
     m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() );
     TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() );
-    groupLayout->setAlignment( Qt::AlignTop );
+    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_bgnddlg.h b/libkonq/konq_bgnddlg.h
index a5e179b6f..68667e316 100644
--- a/libkonq/konq_bgnddlg.h
+++ b/libkonq/konq_bgnddlg.h
@@ -37,7 +37,7 @@ class TQRadioButton;
  */
 class KonqBgndDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cpp
index 030cc90a9..c4d90d5b7 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cpp
@@ -121,7 +121,7 @@ int KonqDirPart::KonqDirPartPrivate::findNearestIconSize(int preferred)
 
 int KonqDirPart::KonqDirPartPrivate::nearestIconSizeError(int size)
 {
-    return QABS(size - findNearestIconSize(size));
+    return TQABS(size - findNearestIconSize(size));
 }
 
 KonqDirPart::KonqDirPart( TQObject *parent, const char *name )
@@ -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( kapp, 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_dirpart.h b/libkonq/konq_dirpart.h
index 4a8d82cca..1b71eb125 100644
--- a/libkonq/konq_dirpart.h
+++ b/libkonq/konq_dirpart.h
@@ -38,7 +38,7 @@ class KonqDirPartBrowserExtension;
 
 class LIBKONQ_EXPORT KonqDirPart: public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KonqDirPartBrowserExtension;
 
diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cpp
index bb05fc8d8..bb05fc8d8 100644
--- a/libkonq/konq_drag.cc
+++ b/libkonq/konq_drag.cpp
diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h
index c30bbe49b..e2a75133c 100644
--- a/libkonq/konq_drag.h
+++ b/libkonq/konq_drag.h
@@ -37,7 +37,7 @@
 // Clipboard/dnd data for: Icons + URLS + isCut
 class LIBKONQ_EXPORT KonqIconDrag : public TQIconDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqIconDrag( TQWidget * dragSource, const char* name = 0 );
@@ -65,7 +65,7 @@ protected: // KDE4: private. And d pointer...
  */
 class LIBKONQ_EXPORT KonqIconDrag2 : public KonqIconDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqIconDrag2( TQWidget * dragSource );
diff --git a/libkonq/konq_events.cc b/libkonq/konq_events.cpp
index 17e0f3381..17e0f3381 100644
--- a/libkonq/konq_events.cc
+++ b/libkonq/konq_events.cpp
diff --git a/libkonq/konq_faviconmgr.cc b/libkonq/konq_faviconmgr.cpp
index c5c828ec0..c5c828ec0 100644
--- a/libkonq/konq_faviconmgr.cc
+++ b/libkonq/konq_faviconmgr.cpp
diff --git a/libkonq/konq_faviconmgr.h b/libkonq/konq_faviconmgr.h
index 48c345bcd..083c7e7df 100644
--- a/libkonq/konq_faviconmgr.h
+++ b/libkonq/konq_faviconmgr.h
@@ -30,7 +30,7 @@
  */
 class LIBKONQ_EXPORT KonqFavIconMgr : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 public:
     /**
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cpp
index 8ad1e0d6f..5bc3de86b 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cpp
@@ -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 );
     }
 }
@@ -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_filetip.h b/libkonq/konq_filetip.h
index 4bbc9d0e2..7a418510f 100644
--- a/libkonq/konq_filetip.h
+++ b/libkonq/konq_filetip.h
@@ -37,7 +37,7 @@ class TQTimer;
 
 class LIBKONQ_EXPORT KonqFileTip : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KonqFileTip( TQScrollView *parent );
diff --git a/libkonq/konq_historycomm.cc b/libkonq/konq_historycomm.cpp
index 6cfd9b53f..6cfd9b53f 100644
--- a/libkonq/konq_historycomm.cc
+++ b/libkonq/konq_historycomm.cpp
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cpp
index 25cfef345..ac6916c81 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cpp
@@ -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() ));
 }
 
 
diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h
index c4cc6a9b1..ad704868d 100644
--- a/libkonq/konq_historymgr.h
+++ b/libkonq/konq_historymgr.h
@@ -74,7 +74,7 @@ protected:
 class LIBKONQ_EXPORT KonqHistoryManager : public KParts::HistoryProvider,
 			   public KonqHistoryComm
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static KonqHistoryManager *kself() {
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cpp
index b51c8502d..09ed599fd 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -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 &)) );
+    connect( kapp, 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 );
                     }
@@ -356,7 +356,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
         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 );
@@ -561,7 +561,7 @@ bool KonqIconViewWidget::initConfig( bool bInit )
       if ( itemTextBg.isValid() )
           setItemTextBackground( itemTextBg );
       else
-          setItemTextBackground( Qt::NoBrush );
+          setItemTextBackground( TQt::NoBrush );
     }
 
     bool on = m_pSettings->showFileTips() && TQToolTip::isGloballyEnabled();
@@ -639,7 +639,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
         int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
         // choose spacing depending on font, but min 5 (due to KFileIVI  move limit)
         setSpacing( ( m_bDesktop || ( realSize > TDEIcon::SizeSmall ) ) ?
-                    TQMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
+                    TQMAX( spacing(), TQFontMetrics(font()).width('n') ) : 0 );
     }
 
     if ( sizeChanged || previewSizeChanged || !stopImagePreviewFor.isEmpty() )
@@ -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()
@@ -1300,7 +1300,7 @@ void KonqIconViewWidget::doubleClickTimeout()
             if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
                 brenameTrash = true;
 
-            if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).contains(e.pos()))
+            if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == TQt::LeftButton && item->textRect( false ).contains(e.pos()))
             {
                 if( d->pActivateDoubleClick->isActive () )
                     d->pActivateDoubleClick->stop();
@@ -1378,7 +1378,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
          bool brenameTrash =false;
          if ( url.isLocalFile() && (url.directory(false) == TDEGlobalSettings::trashPath() || url.path(1).startsWith(TDEGlobalSettings::trashPath())))
              brenameTrash = true;
-         if ( !brenameTrash && !TDEGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick &&  url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
+         if ( !brenameTrash && !TDEGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == TQt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick &&  url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
          {
              d->firstClick = true;
              d->mousePos = e->pos();
@@ -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();
@@ -1423,7 +1423,7 @@ void KonqIconViewWidget::slotSaveIconPositions()
   // This code is currently not used but left in for compatibility reasons.
   // It can be removed in KDE 4.0
   // Saving of desktop icon positions is now done in KDIconView::saveIconPositions()
-  // in tdebase/kdesktop/kdiconview.cc
+  // in tdebase/kdesktop/kdiconview.cpp
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   printf("WARNING: Strongly deprecated method KonqIconViewWidget::slotSaveIconPositions() called!\n"); fflush(stdout);
@@ -1473,7 +1473,7 @@ void KonqIconViewWidget::slotSaveIconPositions()
   // This code is currently not used but left in for compatibility reasons.
   // It can be removed in KDE 4.0
   // Saving of desktop icon positions is now done in KDIconView::saveIconPositions()
-  // in tdebase/kdesktop/kdiconview.cc
+  // in tdebase/kdesktop/kdiconview.cpp
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 }
 
@@ -1937,5 +1937,3 @@ void KonqIconViewWidget::updatePreviewMimeTypes()
 }
 
 #include "konq_iconviewwidget.moc"
-
-/* vim: set et sw=4 ts=8 softtabstop=4: */
diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h
index d4adf7ed5..9f00e3aee 100644
--- a/libkonq/konq_iconviewwidget.h
+++ b/libkonq/konq_iconviewwidget.h
@@ -41,7 +41,7 @@ namespace TDEIO { class Job; }
  */
 class LIBKONQ_EXPORT KonqIconViewWidget : public TDEIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool sortDirectoriesFirst READ sortDirectoriesFirst WRITE setSortDirectoriesFirst )
     TQ_PROPERTY( TQRect iconArea READ iconArea WRITE setIconArea )
     TQ_PROPERTY( int lineupMode READ lineupMode WRITE setLineupMode )
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cpp
index 4f754681e..0897cc2c1 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cpp
@@ -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 )
@@ -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
 
@@ -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;
             }
@@ -543,7 +543,7 @@ void KonqOperations::doFileCopy()
               linkOnly )
     {
         // Neither control nor shift are pressed => show popup menu
-        KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
+        KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
         bool bSetWallpaper = false;
         if ( iconView && iconView->maySetWallpaper() && lst.count() == 1 )
 	{
@@ -579,7 +579,7 @@ void KonqOperations::doFileCopy()
         if (bSetWallpaper)
             popup.insertItem(SmallIconSet("background"), i18n( "Set as &Wallpaper" ), 4 );
         popup.insertSeparator();
-        popup.insertItem(SmallIconSet("cancel"), i18n( "C&ancel" ) + "\t" + KKey( Qt::Key_Escape ).toString(), 5);
+        popup.insertItem(SmallIconSet("cancel"), i18n( "C&ancel" ) + "\t" + KKey( TQt::Key_Escape ).toString(), 5);
 
         int result = popup.exec( m_info->mousePos );
 
@@ -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 * ) ) );
-        TDEIO::CopyJob *copyJob = tqt_dynamic_cast<TDEIO::CopyJob*>(job);
-        KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent());
+        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_operations.h b/libkonq/konq_operations.h
index c6cef7431..ebc127189 100644
--- a/libkonq/konq_operations.h
+++ b/libkonq/konq_operations.h
@@ -36,7 +36,7 @@ class KonqMainWindow;
  */
 class LIBKONQ_EXPORT KonqOperations : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 protected:
     KonqOperations( TQWidget * parent );
     virtual ~KonqOperations();
@@ -197,7 +197,7 @@ private:
 /// Restore multiple trashed files
 class KonqMultiRestoreJob : public TDEIO::Job
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KonqMultiRestoreJob( const KURL::List& urls, bool showProgressInfo );
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cpp
index 28d5a9992..b814af2f3 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ 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( kapp, "KonqPixmapProvider" );
 
     return s_self;
 }
@@ -186,7 +186,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
  	if ( big.mask() ) {
  	    TQBitmap mask = *big.mask();
  	    bitBlt( &mask, x, y,
-            small.mask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(small.mask())) : &small, 0, 0,
+            small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0,
  		    small.width(), small.height(),
  		    small.mask() ? OrROP : SetROP );
  	    big.setMask( mask );
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cpp
index 482c152c5..1728e83f4 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cpp
@@ -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() )
@@ -337,22 +337,22 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
     m_ownActions.setWidget( this );
 
-    const bool bIsLink  = (kpf & IsLink);
-    bool currentDir     = false;
-    bool sReading       = true;
-    bool sDeleting      = ( d->m_itemFlags & KParts::BrowserExtension::NoDeletion ) == 0;
-    bool sMoving        = sDeleting;
-    bool sWriting       = sDeleting && m_lstItems.first()->isWritable();
-    m_sMimeType         = m_lstItems.first()->mimetype();
+    const bool bIsLink   = (kpf & IsLink);
+    bool currentDir      = false;
+    bool sReading        = true;
+    bool sDeleting       = ( d->m_itemFlags & KParts::BrowserExtension::NoDeletion ) == 0;
+    bool sMoving         = sDeleting;
+    bool sWriting        = sDeleting && m_lstItems.first()->isWritable();
+    m_sMimeType          = m_lstItems.first()->mimetype();
     TQString mimeGroup   = m_sMimeType.left(m_sMimeType.find('/'));
-    mode_t mode         = m_lstItems.first()->mode();
-    bool isDirectory    = S_ISDIR(mode);
-    bool bTrashIncluded = false;
-    bool mediaFiles     = false;
-    bool isReallyLocal = m_lstItems.first()->isLocalFile();
-    bool isLocal        = isReallyLocal
-                       || m_lstItems.first()->url().protocol()=="media"
-                       || m_lstItems.first()->url().protocol()=="system";
+    mode_t mode          = m_lstItems.first()->mode();
+    bool isDirectory     = S_ISDIR(mode);
+    bool isMediaFile     = false;
+    bool isEncryptedMediaFile = false;
+    bool isReallyLocal   = m_lstItems.first()->isLocalFile();
+    bool isLocal         = isReallyLocal || m_lstItems.first()->url().protocol()=="media" ||
+                           m_lstItems.first()->url().protocol()=="system";
+    bool isTrashIncluded = false;
     bool isTrashLink     = false;
     m_lstPopupURLs.clear();
     int id = 0;
@@ -398,10 +398,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         if ( isLocal && !url.isLocalFile() && url.protocol() != "media" && url.protocol() != "system" )
             isLocal = false;
 
-        if ( !bTrashIncluded && (
+        if ( !isTrashIncluded && (
              ( url.protocol() == "trash" && url.path().length() <= 1 )
              || url.url() == "system:/trash" || url.url() == "system:/trash/" ) ) {
-            bTrashIncluded = true;
+            isTrashIncluded = true;
             isLocal = false;
         }
 
@@ -416,8 +416,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
         if ( sMoving )
             sMoving = KProtocolInfo::supportsMoving( url );
-        if ( (*it)->mimetype().startsWith("media/") )
-            mediaFiles = true;
+        if ( (*it)->mimetype().startsWith("media/") ) {
+            isMediaFile = true;
+            if ( (*it)->mimetype().contains("encrypted")) {
+                isEncryptedMediaFile = true;
+            }
+        }
     }
 
     // If a local path is available, monitor that instead of the given remote URL...
@@ -426,8 +430,8 @@ 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();
             }
@@ -469,13 +473,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
     m_info.m_Writing = sWriting;
     m_info.m_Deleting = sDeleting;
     m_info.m_Moving = sMoving;
-    m_info.m_TrashIncluded = bTrashIncluded;
+    m_info.m_TrashIncluded = isTrashIncluded;
 
     // isCurrentTrash: popup on trash:/ itself, or on the trash.desktop link
-    bool isCurrentTrash = ( m_lstItems.count() == 1 && bTrashIncluded ) || isTrashLink;
+    bool isCurrentTrash = ( m_lstItems.count() == 1 && isTrashIncluded ) || isTrashLink;
     bool isIntoTrash = ( url.protocol() == "trash" || url.url().startsWith( "system:/trash" ) ) && !isCurrentTrash; // trashed file, not trash:/ itself
-    //kdDebug() << "isLocal=" << isLocal << " url=" << url << " isCurrentTrash=" << isCurrentTrash << " isIntoTrash=" << isIntoTrash << " bTrashIncluded=" << bTrashIncluded << endl;
-    bool isSingleMedium = m_lstItems.count() == 1 && mediaFiles;
+    //kdDebug() << "isLocal=" << isLocal << " url=" << url << " isCurrentTrash=" << isCurrentTrash << " isIntoTrash=" << isIntoTrash << " isTrashIncluded=" << isTrashIncluded << endl;
     clear();
 
     //////////////////////////////////////////////////////////////////////////
@@ -486,7 +489,6 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         addMerge( "konqueror" );
 
     bool isKDesktop = TQCString( kapp->name() ) == "kdesktop";
-    TDEAction *actNewWindow = 0;
 
     if (( kpf & ShowProperties ) && isKDesktop &&
         !kapp->authorize("editable_desktop_icons"))
@@ -496,20 +498,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
     // Either 'newview' is in the actions we're given (probably in the tabhandling group)
     // or we need to insert it ourselves (e.g. for kdesktop). In the first case, actNewWindow must remain 0.
-    if ( ((kpf & ShowNewWindow) != 0) && sReading )
+    if ( ((kpf & ShowNewWindow) != 0) && sReading  && !isEncryptedMediaFile)
     {
         TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" );
-        actNewWindow = new TDEAction( openStr, "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" );
-    }
-
-    if ( actNewWindow && !isKDesktop )
-    {
-        if (isCurrentTrash)
-            actNewWindow->setToolTip( i18n( "Open the trash in a new window" ) );
-        else if (isSingleMedium)
-            actNewWindow->setToolTip( i18n( "Open the medium in a new window") );
-        else
-            actNewWindow->setToolTip( i18n( "Open the document in a new window" ) );
+        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();
     }
 
     if ( S_ISDIR(mode) && sWriting && !isCurrentTrash ) // A dir, and we can create things into it
@@ -528,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 );
     }
 
@@ -550,13 +545,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         addSeparator();
     }
 
-    // "open in new window" is either provided by us, or by the tabhandling group
-    if (actNewWindow)
+    if (!isEncryptedMediaFile)
     {
-        addAction( actNewWindow );
-        addSeparator();
+        addGroup( "tabhandling" ); // includes a separator
     }
-    addGroup( "tabhandling" ); // includes a separator
 
     if ( !bIsLink )
     {
@@ -606,7 +598,7 @@ 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" );
+        act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQ_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" );
         KSimpleConfig trashConfig( "trashrc", true );
         trashConfig.setGroup( "Status" );
         act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) );
@@ -639,7 +631,7 @@ 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"))
@@ -705,10 +697,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         }
 
         // findAllResources() also removes duplicates
-        const TQStringList entries = TDEGlobal::dirs()->findAllResources("data",
-                                                                      "konqueror/servicemenus/*.desktop",
-                                                                      false /* recursive */,
-                                                                      true /* unique */);
+        TQStringList entries = TDEGlobal::dirs()->findAllResources("data",
+                "konqueror/servicemenus/*.desktop", false, true);
+        entries.sort();  // sort to ensure consistent order in popup menu
         TQStringList::ConstIterator eIt = entries.begin();
         const TQStringList::ConstIterator eEnd = entries.end();
         for (; eIt != eEnd; ++eIt )
@@ -840,7 +831,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                     const TQString priority = cfg.readEntry("X-TDE-Priority");
                     const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
 
-                    ServiceList* list = s.selectList( priority, submenuName );
+                    ServiceList *list = s.selectList( priority, submenuName );
                     (*list) += KDEDesktopMimeType::userDefinedServices( *eIt, cfg, url.isLocalFile(), m_lstPopupURLs );
                 }
             }
@@ -924,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 );
 
@@ -941,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 );
             }
 
@@ -995,12 +986,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         addPendingSeparator();
     }
 
-    if ( !isCurrentTrash && !isIntoTrash && !mediaFiles && sReading )
+    if ( !isCurrentTrash && !isIntoTrash && !isMediaFile && sReading )
         addPlugins(); // now it's time to add plugins
 
     if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) )
     {
-        act = new TDEAction( i18n( "&Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupProperties() ),
+        act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQ_SLOT( slotPopupProperties() ),
                            &m_ownActions, "properties" );
         addAction( act );
     }
@@ -1014,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 );
         }
@@ -1096,7 +1087,7 @@ void KonqPopupMenu::slotPopupAddToBookmark()
 
 void KonqPopupMenu::slotRunService()
 {
-  TQCString senderName = TQT_TQOBJECT_CONST(sender())->name();
+  TQCString senderName = sender()->name();
   int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt();
 
   // Is it a usual service (application)
@@ -1194,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;
diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h
index 5785d53ab..d50142c2f 100644
--- a/libkonq/konq_popupmenu.h
+++ b/libkonq/konq_popupmenu.h
@@ -55,7 +55,7 @@ class KBookmarkManager;
  */
 class LIBKONQ_EXPORT KonqPopupMenu : public TQPopupMenu, public KonqXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
@@ -210,7 +210,7 @@ private:
 };
 
 class LIBKONQ_EXPORT KonqPopupMenuPlugin : public TQObject, public KonqXMLGUIClient {
-	Q_OBJECT
+	TQ_OBJECT
 public:
   /**
   * Constructor
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cpp
index f9a69b8f6..f72aee191 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cpp
@@ -34,6 +34,8 @@
 
 #include <ksimpleconfig.h>
 
+#include "konq_sort_constants.h"
+
 static TQPixmap wallpaperPixmap( const TQString & _wallpaper )
 {
     TQString key = "wallpapers/";
@@ -65,9 +67,11 @@ static TQPixmap wallpaperPixmap( const TQString & _wallpaper )
 struct KonqPropsView::Private
 {
    TQStringList* previewsToShow;
+   TextSortOrder textSortOrder;
    bool previewsEnabled:1;
    bool caseInsensitiveSort:1;
    bool dirsfirst:1;
+   bool hiddenfirst:1;
    bool descending:1;
    TQString sortcriterion;
 };
@@ -90,7 +94,9 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro
   m_iIconSize = config->readNumEntry( "IconSize", 0 );
   m_iItemTextPos = config->readNumEntry( "ItemTextPos", TQIconView::Bottom );
   d->sortcriterion = config->readEntry( "SortingCriterion", "sort_nci" );
+  d->textSortOrder = (TextSortOrder) config->readNumEntry( "TextSortOrder", 1 );
   d->dirsfirst = config->readBoolEntry( "SortDirsFirst", true );
+  d->hiddenfirst = config->readBoolEntry( "SortHiddenFirst", true );
   d->descending = config->readBoolEntry( "SortDescending", false );
   m_bShowDot = config->readBoolEntry( "ShowDotFiles", false );
   m_bShowDirectoryOverlays = config->readBoolEntry( "ShowDirectoryOverlays", false );
@@ -138,11 +144,21 @@ bool KonqPropsView::isCaseInsensitiveSort() const
    return d->caseInsensitiveSort;
 }
 
+TextSortOrder KonqPropsView::getSortOrder() const
+{
+   return d->textSortOrder;
+}
+
 bool KonqPropsView::isDirsFirst() const
 {
    return d->dirsfirst;
 }
 
+bool KonqPropsView::isHiddenFirst() const
+{
+   return d->hiddenfirst;
+}
+
 bool KonqPropsView::isDescending() const
 {
    return d->descending;
@@ -199,7 +215,9 @@ bool KonqPropsView::enterDir( const KURL & dir )
     m_iIconSize = m_defaultProps->iconSize();
     m_iItemTextPos = m_defaultProps->itemTextPos();
     d->sortcriterion = m_defaultProps->sortCriterion();
+    d->textSortOrder = m_defaultProps->getSortOrder();
     d->dirsfirst = m_defaultProps->isDirsFirst();
+    d->hiddenfirst = m_defaultProps->isHiddenFirst();
     d->descending = m_defaultProps->isDescending();
     m_bShowDot = m_defaultProps->isShowingDotFiles();
     d->caseInsensitiveSort=m_defaultProps->isCaseInsensitiveSort();
@@ -218,7 +236,9 @@ bool KonqPropsView::enterDir( const KURL & dir )
     m_iIconSize = config->readNumEntry( "IconSize", m_iIconSize );
     m_iItemTextPos = config->readNumEntry( "ItemTextPos", m_iItemTextPos );
     d->sortcriterion = config->readEntry( "SortingCriterion" , d->sortcriterion );
+    d->textSortOrder = (TextSortOrder) config->readNumEntry( "TextSortOrder", d->textSortOrder );
     d->dirsfirst = config->readBoolEntry( "SortDirsFirst", d->dirsfirst );
+    d->hiddenfirst = config->readBoolEntry( "SortHiddenFirst", d->hiddenfirst );
     d->descending = config->readBoolEntry( "SortDescending", d->descending );
     m_bShowDot = config->readBoolEntry( "ShowDotFiles", m_bShowDot );
     d->caseInsensitiveSort=config->readBoolEntry("CaseInsensitiveSort",d->caseInsensitiveSort);
@@ -315,6 +335,20 @@ void KonqPropsView::setSortCriterion( const TQString &criterion )
     }
 }
 
+void KonqPropsView::setSortOrder( TextSortOrder order)
+{
+    d->textSortOrder = order;
+    if ( m_defaultProps && !m_bSaveViewPropertiesLocally ) {
+        m_defaultProps->setSortOrder( order );
+    }
+    else if (currentConfig())
+    {
+        TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
+        currentConfig()->writeEntry( "TextSortOrder", d->textSortOrder );
+        currentConfig()->sync();
+    }
+}
+
 void KonqPropsView::setDirsFirst( bool first)
 {
     d->dirsfirst = first;
@@ -328,6 +362,19 @@ void KonqPropsView::setDirsFirst( bool first)
     }
 }
 
+void KonqPropsView::setHiddenFirst(bool first)
+{
+    d->hiddenfirst = first;
+    if ( m_defaultProps && !m_bSaveViewPropertiesLocally )
+        m_defaultProps->setHiddenFirst( first );
+    else if (currentConfig())
+    {
+        TDEConfigGroupSaver cgs(currentConfig(), currentGroup());
+        currentConfig()->writeEntry( "SortHiddenFirst", d->hiddenfirst );
+        currentConfig()->sync();
+    }
+}
+
 void KonqPropsView::setDescending( bool descend)
 {
     d->descending = descend;
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index c2759693f..132c53a55 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -26,6 +26,8 @@
 #include <kurl.h>
 #include <libkonq_export.h>
 
+#include "konq_sort_constants.h"
+
 class TDEInstance;
 class TDEConfigBase;
 class TDEConfig;
@@ -90,9 +92,15 @@ public:
   void setSortCriterion( const TQString &criterion );
   const TQString& sortCriterion() const;
 
+  void setSortOrder( TextSortOrder order);
+  TextSortOrder getSortOrder() const;
+
   void setDirsFirst ( bool first );
   bool isDirsFirst() const;
 
+  void setHiddenFirst ( bool first );
+  bool isHiddenFirst() const;
+
   void setDescending (bool descending);
   bool isDescending() const;
 
@@ -174,7 +182,7 @@ private:
 
   /**
    * Private data for KonqPropsView
-   * Implementation in konq_propsview.cc
+   * Implementation in konq_propsview.cpp
    */
   struct Private;
 
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cpp
index 41460e8ae..fe61d150a 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cpp
@@ -121,6 +121,8 @@ void KonqFMSettings::init( TDEConfig * config )
 
   /// true if TQString::localeAwareCompare is case sensitive (it usually isn't, when LC_COLLATE is set)
   d->localeAwareCompareIsCaseSensitive = TQString( "a" ).localeAwareCompare( "B" ) > 0; // see #40131
+
+  m_doubleClickMoveToParent = config->readBoolEntry("DoubleClickMoveToParent", true);
 }
 
 bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
diff --git a/libkonq/konq_settings.h b/libkonq/konq_settings.h
index daca8babe..52e9ac3b6 100644
--- a/libkonq/konq_settings.h
+++ b/libkonq/konq_settings.h
@@ -81,12 +81,13 @@ public:
   bool underlineLink() const { return m_underlineLink; }
   bool fileSizeInBytes() const { return m_fileSizeInBytes; }
   bool alwaysNewWin() const { return m_alwaysNewWin; }
+  bool doubleClickMoveToParent() const { return m_doubleClickMoveToParent; }
   const TQString & homeURL() const { return m_homeURL; }
 
   bool showFileTips() const {return m_showFileTips; }
   bool showPreviewsInFileTips() const;
   int numFileTips() const {return m_numFileTips; }
-    bool renameIconDirectly() const;
+  bool renameIconDirectly() const;
 
   // Font settings
   const TQFont& standardFont() const { return m_standardFont; }
@@ -107,7 +108,7 @@ private:
   bool m_underlineLink;
   bool m_fileSizeInBytes;
   bool m_alwaysNewWin;
-  bool m_bTreeFollow;
+  bool m_doubleClickMoveToParent;
 
   TQMap<TQString, TQString> m_embedMap;
 
diff --git a/libkonq/konq_sort_constants.h b/libkonq/konq_sort_constants.h
new file mode 100644
index 000000000..f6c695b19
--- /dev/null
+++ b/libkonq/konq_sort_constants.h
@@ -0,0 +1,13 @@
+#ifndef KONQ_SORT_CONSTANTS_H
+#define KONQ_SORT_CONSTANTS_H
+
+typedef unsigned short TextSortOrder;
+  // Can't use name 'SortOrder' because that's part of TQt
+
+enum {
+  UNICODE_UNMODIFIED      = 0,
+  LOCALE_UNMODIFIED       = 1,
+  UNICODE_CASEINSENSITIVE = 2,
+} TextSortOrders;
+
+#endif // KONQ_SORT_CONSTANTS_H
diff --git a/libkonq/konq_sound.cc b/libkonq/konq_sound.cpp
index 9e1ca66fb..a0c95c19b 100644
--- a/libkonq/konq_sound.cc
+++ b/libkonq/konq_sound.cpp
@@ -115,14 +115,14 @@ public:
 
 protected:
 	virtual TQObject *createObject(TQObject * = 0, const char * = 0,
-		const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+		const char *className = "TQObject", const TQStringList &args = TQStringList());
 };
 
 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;
 }
 
@@ -133,5 +133,3 @@ extern "C"
 		return new KonqSoundFactory();
 	}
 }
-
-// vim: ts=4 sw=4 noet
diff --git a/libkonq/konq_sound.h b/libkonq/konq_sound.h
index c0139e763..9563984d9 100644
--- a/libkonq/konq_sound.h
+++ b/libkonq/konq_sound.h
@@ -31,5 +31,3 @@ public:
 };
 
 #endif
-
-// vim: ts=4 sw=4 noet
diff --git a/libkonq/konq_string_compare.h b/libkonq/konq_string_compare.h
new file mode 100644
index 000000000..8d17d409f
--- /dev/null
+++ b/libkonq/konq_string_compare.h
@@ -0,0 +1,51 @@
+#ifndef KONQ_STRING_COMPARE_H
+#define KONQ_STRING_COMPARE_H
+
+#include "konq_sort_constants.h"
+
+static inline int stringCompare(
+  const TextSortOrder sortorder,
+  const TQString& a,
+  const TQString& b
+)
+{
+  // Our caller probably determined sortorder from KonqPropsView::getSortOrder()
+  // but we have a reasonable fallback position for bogus values.
+
+  switch(sortorder) {
+
+    case UNICODE_UNMODIFIED:
+      /*
+       * Strictly character code(point) numeric comparison as defined
+       * by the Unicode Standard that is backward compatible with the
+       * the ASCII standard.
+   . */
+      return a.compare( b );
+      break;
+
+    case UNICODE_CASEINSENSITIVE:
+      /*
+       * This is the traditional "case-insensitive" variation on character
+       * code order that ensures that ASCII lowercase and uppercase alphabetic
+       * characters are are grouped together instead of being separated by
+       * non-alphabetic ASCII characters [ \ ] ^ _ `
+      */
+      return a.lower().compare( b.lower() );
+      break;
+
+    case LOCALE_UNMODIFIED:
+      /*
+       * This is the pure locale-aware comparison as defined by ICU.
+       * Note: if LC_COLLATE == 'C' or 'Posix', this will produce same
+       * result as UNICODE_UNMODIFIED.
+      */
+      return a.localeAwareCompare( b );
+      break;
+
+    default: // Treat as UNICODE_UNMODIFIED
+      return a.compare( b );
+      break;
+  }
+}
+
+#endif // KONQ_STRING_COMPARE_H
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cpp
index 51d85587d..9272bbf5c 100644
--- a/libkonq/konq_undo.cc
+++ 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();
@@ -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()
diff --git a/libkonq/konq_undo.h b/libkonq/konq_undo.h
index fa908de67..17af645b5 100644
--- a/libkonq/konq_undo.h
+++ b/libkonq/konq_undo.h
@@ -70,7 +70,7 @@ struct KonqCommand
 
 class KonqCommandRecorder : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, TDEIO::Job *job );
   virtual ~KonqCommandRecorder();
@@ -88,7 +88,7 @@ private:
 
 class LIBKONQ_EXPORT KonqUndoManager : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
   friend class KonqUndoJob;
 public:
diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cpp
index c3c7215b9..a12d237c6 100644
--- a/libkonq/konq_xmlguiclient.cc
+++ b/libkonq/konq_xmlguiclient.cpp
@@ -154,4 +154,21 @@ bool KonqXMLGUIClient::hasAction() const
   return d->hasAction;
 }
 
+bool KonqXMLGUIClient::hasGroup(const TQString &name) const
+{
+	if (name.isEmpty())
+	{
+		return false;
+	}
+	TQDomNodeList groups = m_doc.elementsByTagName("definegroup");
+	for (uint idx = 0; idx < groups.count(); ++idx)
+	{
+		TQDomElement group = groups.item(idx).toElement();
+		if (group.hasAttribute(d->attrName) && group.attribute(d->attrName) == name)
+		{
+			return true;
+		}
+	}
+	return false;
+}
 
diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h
index 685b58a34..5696573da 100644
--- a/libkonq/konq_xmlguiclient.h
+++ b/libkonq/konq_xmlguiclient.h
@@ -34,24 +34,26 @@
 class LIBKONQ_EXPORT KonqXMLGUIClient : public KXMLGUIClient
 {
 public:
-  KonqXMLGUIClient( );
-  KonqXMLGUIClient( KXMLGUIClient *parent );
-  virtual ~KonqXMLGUIClient( );
+  KonqXMLGUIClient();
+  KonqXMLGUIClient(KXMLGUIClient *parent);
+  virtual ~KonqXMLGUIClient();
   /**
    * Reimplemented for internal purpose
    */
-  TQDomDocument domDocument( ) const;
+  TQDomDocument domDocument() const;
+  TQDomElement  DomElement() const; // KDE4: s/D/d/
 
-  TQDomElement DomElement( ) const; // KDE4: s/D/d/
+  // @return true if the group named "name" exists
+  bool hasGroup(const TQString &name) const;
 
 protected:
-  void addAction( TDEAction *action, const TQDomElement &menu = TQDomElement() );
-  void addAction( const char *name, const TQDomElement &menu = TQDomElement() );
-  void addSeparator( const TQDomElement &menu = TQDomElement() );
+  void addAction(TDEAction *action, const TQDomElement &menu = TQDomElement());
+  void addAction(const char *name, const TQDomElement &menu = TQDomElement());
+  void addSeparator(const TQDomElement &menu = TQDomElement());
   /// only add a separator if an action is added afterwards
   void addPendingSeparator();
-  void addGroup( const TQString &grp );
-  void addMerge( const TQString &name );
+  void addGroup(const TQString &grp);
+  void addMerge(const TQString &name);
 
   // @return true if addAction was called at least once
   bool hasAction() const;
diff --git a/libkonq/libkonq_export.h b/libkonq/libkonq_export.h
index 4e10a4ec0..7f489e84f 100644
--- a/libkonq/libkonq_export.h
+++ b/libkonq/libkonq_export.h
@@ -27,7 +27,7 @@
 /* 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 */
 
diff --git a/libkonq/tdefileivi.cc b/libkonq/tdefileivi.cpp
index fa3a9557b..ad2d743a1 100644
--- a/libkonq/tdefileivi.cc
+++ b/libkonq/tdefileivi.cpp
@@ -32,6 +32,8 @@
 #include <kdebug.h>
 #include <krun.h>
 #include <kservice.h>
+#include <kmimetype.h> // for KDEDesktopMimeType
+#include <kstandarddirs.h>
 
 #undef Bool
 
@@ -386,7 +388,28 @@ void KFileIVI::returnPressed()
     if ( static_cast<KonqIconViewWidget*>(iconView())->isDesktop() ) {
         KURL url = m_fileitem->url();
         if (url.protocol() == "media") {
-            (void) new KRun( url, m_fileitem->mode(), m_fileitem->isLocalFile() );
+            TQString mimetype = m_fileitem->mimetype();
+            TQString lockingAction = TQString::null;
+            if (mimetype.contains("encrypted_locked")) {
+                lockingAction = "konqueror/servicemenus/media_unlock.desktop";
+            }
+            else if (mimetype.contains("encrypted_unlocked")) {
+                lockingAction = "konqueror/servicemenus/media_lock.desktop";
+            }
+            if (!lockingAction.isEmpty()) {
+                TQString lockingService = TDEGlobal::dirs()->findResource("data", lockingAction);
+                if (!lockingService.isEmpty()) {
+                    TQValueList<KDEDesktopMimeType::Service> serviceList = KDEDesktopMimeType::userDefinedServices(lockingService, m_fileitem->isLocalFile());
+                    if (serviceList.count() == 1) {
+                        KURL::List m_lstURLs;
+                        m_lstURLs.append(m_fileitem->url());
+                        KDEDesktopMimeType::executeService(m_lstURLs, serviceList[0]);
+                    }
+                }
+            }
+            else {
+                (void) new KRun( url, m_fileitem->mode(), m_fileitem->isLocalFile() );
+            }
         }
         else {
             // When clicking on a link to e.g. $HOME from the desktop, we want to open $HOME
@@ -596,5 +619,3 @@ void KFileIVI::mimeTypeAndIconDetermined()
 {
     updatePixmapSize();
 }
-
-/* vim: set noet sw=4 ts=8 softtabstop=4: */
diff --git a/libkonq/tdefileivi.h b/libkonq/tdefileivi.h
index 4701fb9c1..3fb7e3734 100644
--- a/libkonq/tdefileivi.h
+++ b/libkonq/tdefileivi.h
@@ -251,7 +251,7 @@ private:
 
     /**
      * Private data for KFileIVI
-     * Implementation in tdefileivi.cc
+     * Implementation in tdefileivi.cpp
      */
     struct Private;
 
diff --git a/nsplugins/README b/nsplugins/README
index d465ddc24..769b3ee08 100644
--- a/nsplugins/README
+++ b/nsplugins/README
@@ -79,11 +79,11 @@ it can be resized, focused and unfocused with standard X11 functions
 as long as we know its' window ID.
 
 PluginPart gets a NSPluginInstance (from NSPluginLoader::newInstance),
-which it sees as a regular QWidget. e.g. it can resize the QWidget and
+which it sees as a regular TQWidget. e.g. it can resize the TQWidget and
 nspluginviewer's window will resize.
 
 This magic happens thanks to KJavaEmbed which NSPluginInstance inherits.
-KJavaEmbed inherits QWidget and hooks up to QWidget's events, mapping
+KJavaEmbed inherits TQWidget and hooks up to TQWidget's events, mapping
 those events to the appropriate X11 window operations.
 Resizing, focusing in and out is about all PluginPart could ever do
 with the nspluginviewer.
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 037798cb2..da6c5d780 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -69,9 +69,9 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam
         TQDateTime current = lastChanged( *it );
         // store non-existent directory as "N" string rather than empty string, TDEConfig
         // has a bug with storing a list of empty items
-        if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, Qt::ISODate ))
+        if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, TQt::ISODate ))
             changed = true;
-        currentTimestamps.append( current.isNull() ? "N" : current.toString( Qt::ISODate ));
+        currentTimestamps.append( current.isNull() ? "N" : current.toString( TQt::ISODate ));
     }
     if( changed )
     {
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 8c9e6fe2c..2df8ed163 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -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()));
     }
 }
 
@@ -203,8 +203,8 @@ NSPluginLoader::NSPluginLoader()
   // trap dcop register events
   kapp->dcopClient()->setNotifications(true);
   TQObject::connect(kapp->dcopClient(),
-                   TQT_SIGNAL(applicationRegistered(const TQCString&)),
-                   this, TQT_SLOT(applicationRegistered(const TQCString&)));
+                   TQ_SIGNAL(applicationRegistered(const TQCString&)),
+                   this, TQ_SLOT(applicationRegistered(const TQCString&)));
 
   // load configuration
   TDEConfig cfg("kcmnspluginrc", false);
@@ -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");
@@ -524,5 +524,3 @@ NSPluginInstance *NSPluginLoader::newInstance(TQWidget *parent, TQString url,
 
    return plugin;
 }
-
-// vim: ts=4 sw=4 et
diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h
index 988697848..a0c55c00a 100644
--- a/nsplugins/nspluginloader.h
+++ b/nsplugins/nspluginloader.h
@@ -45,7 +45,7 @@ class TQGridLayout;
 
 class NSPluginInstance : public EMBEDCLASS
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     NSPluginInstance(TQWidget *parent);
@@ -80,7 +80,7 @@ private: // wrappers
 
 class NSPluginLoader : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   NSPluginLoader();
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 99cbc780f..3e5530f3a 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");
     }
 
@@ -228,12 +228,12 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject
     // create a canvas to insert our widget
     _canvas = new PluginCanvasWidget( parentWidget, widgetName );
     //_canvas->setFocusPolicy( TQWidget::ClickFocus );
-    _canvas->setFocusPolicy( TQ_WheelFocus );
+    _canvas->setFocusPolicy( TQWidget::WheelFocus );
     _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)) );
 }
 
 
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index f3fa68984..e124aabd0 100644
--- a/nsplugins/plugin_part.h
+++ b/nsplugins/plugin_part.h
@@ -61,7 +61,7 @@ private:
 
 class PluginFactory : public KParts::Factory
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   PluginFactory();
@@ -84,7 +84,7 @@ private:
 
 class PluginCanvasWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   PluginCanvasWidget(TQWidget *parent=0, const char *name=0)
@@ -100,7 +100,7 @@ signals:
 
 class PluginPart: public KParts::ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
              const char *name, const TQStringList &args = TQStringList());
@@ -137,7 +137,7 @@ private:
 
 class PluginLiveConnectExtension : public KParts::LiveConnectExtension
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     PluginLiveConnectExtension(PluginPart* part);
     virtual ~PluginLiveConnectExtension();
diff --git a/nsplugins/sdk/jni_md.h b/nsplugins/sdk/jni_md.h
index c0aa11159..58738bbd0 100644
--- a/nsplugins/sdk/jni_md.h
+++ b/nsplugins/sdk/jni_md.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/*
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
diff --git a/nsplugins/sdk/jri.h b/nsplugins/sdk/jri.h
index f29945b94..d80654f6b 100644
--- a/nsplugins/sdk/jri.h
+++ b/nsplugins/sdk/jri.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *
diff --git a/nsplugins/sdk/jri_md.h b/nsplugins/sdk/jri_md.h
index 5ae741ed3..8234addd4 100644
--- a/nsplugins/sdk/jri_md.h
+++ b/nsplugins/sdk/jri_md.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *
diff --git a/nsplugins/sdk/jritypes.h b/nsplugins/sdk/jritypes.h
index ddeb6331c..ed7769be7 100644
--- a/nsplugins/sdk/jritypes.h
+++ b/nsplugins/sdk/jritypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *
diff --git a/nsplugins/sdk/npapi.h b/nsplugins/sdk/npapi.h
index 16c71b97a..18992ae0d 100644
--- a/nsplugins/sdk/npapi.h
+++ b/nsplugins/sdk/npapi.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *
diff --git a/nsplugins/sdk/npruntime.h b/nsplugins/sdk/npruntime.h
index 45f3f0a9a..b5d656352 100644
--- a/nsplugins/sdk/npruntime.h
+++ b/nsplugins/sdk/npruntime.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * Copyright � 2004, Apple Computer, Inc. and The Mozilla Foundation. 
  * All rights reserved.
diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h
index dff545d9f..769897dc6 100644
--- a/nsplugins/sdk/npupp.h
+++ b/nsplugins/sdk/npupp.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
diff --git a/nsplugins/sdk/obsolete/protypes.h b/nsplugins/sdk/obsolete/protypes.h
index e96cfcf67..5d9190aa2 100644
--- a/nsplugins/sdk/obsolete/protypes.h
+++ b/nsplugins/sdk/obsolete/protypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
diff --git a/nsplugins/sdk/prcpucfg.h b/nsplugins/sdk/prcpucfg.h
index a8dd53fa1..71fd9f658 100644
--- a/nsplugins/sdk/prcpucfg.h
+++ b/nsplugins/sdk/prcpucfg.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -650,6 +649,98 @@
 #define PR_BYTES_PER_WORD_LOG2  3
 #define PR_BYTES_PER_DWORD_LOG2 3
 
+#elif defined(__riscv) && (__riscv_xlen == 32)
+
+#undef  IS_BIG_ENDIAN
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_64
+
+#define PR_BYTES_PER_BYTE   1
+#define PR_BYTES_PER_SHORT  2
+#define PR_BYTES_PER_INT    4
+#define PR_BYTES_PER_INT64  8
+#define PR_BYTES_PER_LONG   4
+#define PR_BYTES_PER_FLOAT  4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD   4
+#define PR_BYTES_PER_DWORD  8
+
+#define PR_BITS_PER_BYTE    8
+#define PR_BITS_PER_SHORT   16
+#define PR_BITS_PER_INT     32
+#define PR_BITS_PER_INT64   64
+#define PR_BITS_PER_LONG    32
+#define PR_BITS_PER_FLOAT   32
+#define PR_BITS_PER_DOUBLE  64
+#define PR_BITS_PER_WORD    32
+
+#define PR_BITS_PER_BYTE_LOG2   3
+#define PR_BITS_PER_SHORT_LOG2  4
+#define PR_BITS_PER_INT_LOG2    5
+#define PR_BITS_PER_INT64_LOG2  6
+#define PR_BITS_PER_LONG_LOG2   5
+#define PR_BITS_PER_FLOAT_LOG2  5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2   5
+
+#define PR_ALIGN_OF_SHORT   2
+#define PR_ALIGN_OF_INT     4
+#define PR_ALIGN_OF_LONG    4
+#define PR_ALIGN_OF_INT64   8
+#define PR_ALIGN_OF_FLOAT   4
+#define PR_ALIGN_OF_DOUBLE  8
+#define PR_ALIGN_OF_POINTER 4
+#define PR_ALIGN_OF_WORD    4
+
+#define PR_BYTES_PER_WORD_LOG2  2
+#define PR_BYTES_PER_DWORD_LOG2 3
+
+#elif defined(__riscv) && (__riscv_xlen == 64)
+
+#undef  IS_BIG_ENDIAN
+#define IS_LITTLE_ENDIAN 1
+#define IS_64
+
+#define PR_BYTES_PER_BYTE   1
+#define PR_BYTES_PER_SHORT  2
+#define PR_BYTES_PER_INT    4
+#define PR_BYTES_PER_INT64  8
+#define PR_BYTES_PER_LONG   8
+#define PR_BYTES_PER_FLOAT  4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD   8
+#define PR_BYTES_PER_DWORD  8
+
+#define PR_BITS_PER_BYTE    8
+#define PR_BITS_PER_SHORT   16
+#define PR_BITS_PER_INT     32
+#define PR_BITS_PER_INT64   64
+#define PR_BITS_PER_LONG    64
+#define PR_BITS_PER_FLOAT   32
+#define PR_BITS_PER_DOUBLE  64
+#define PR_BITS_PER_WORD    64
+
+#define PR_BITS_PER_BYTE_LOG2   3
+#define PR_BITS_PER_SHORT_LOG2  4
+#define PR_BITS_PER_INT_LOG2    5
+#define PR_BITS_PER_INT64_LOG2  6
+#define PR_BITS_PER_LONG_LOG2   6
+#define PR_BITS_PER_FLOAT_LOG2  5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2   6
+
+#define PR_ALIGN_OF_SHORT   2
+#define PR_ALIGN_OF_INT     4
+#define PR_ALIGN_OF_LONG    8
+#define PR_ALIGN_OF_INT64   8
+#define PR_ALIGN_OF_FLOAT   4
+#define PR_ALIGN_OF_DOUBLE  8
+#define PR_ALIGN_OF_POINTER 8
+#define PR_ALIGN_OF_WORD    8
+
+#define PR_BYTES_PER_WORD_LOG2  3
+#define PR_BYTES_PER_DWORD_LOG2 3
+
 #else
 
 #error "Unknown CPU architecture"
diff --git a/nsplugins/sdk/prtypes.h b/nsplugins/sdk/prtypes.h
index b68361082..842013ee8 100644
--- a/nsplugins/sdk/prtypes.h
+++ b/nsplugins/sdk/prtypes.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 
  * The contents of this file are subject to the Mozilla Public
  * License Version 1.1 (the "License"); you may not use this file
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index daccd1bcf..7ac24ee2c 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( kapp, 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/test/testnsplugin.h b/nsplugins/test/testnsplugin.h
index 252cea2c8..3c1b2bdc3 100644
--- a/nsplugins/test/testnsplugin.h
+++ b/nsplugins/test/testnsplugin.h
@@ -34,7 +34,7 @@ class NSPluginInstance;
 
 class TestNSPlugin : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TestNSPlugin();
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/glibevents.h b/nsplugins/viewer/glibevents.h
index 396273a85..379fc4722 100644
--- a/nsplugins/viewer/glibevents.h
+++ b/nsplugins/viewer/glibevents.h
@@ -26,9 +26,9 @@
 #include <glib.h>
 
 class GlibEvents
-    : public QWidget
+    : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         GlibEvents();
         virtual ~GlibEvents();
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 4f3cb3094..2495556e4 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -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();
@@ -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&)));
 }
 
 
@@ -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) {
@@ -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;
@@ -1999,4 +1999,3 @@ void NSPluginStream::result(TDEIO::Job *job)
 }
 
 #include "nsplugin.moc"
-// vim: ts=4 sw=4 et
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 96bb1da15..ead4a07e3 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -65,7 +65,7 @@ class TQTimer;
 
 class NSPluginStreamBase : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 friend class NSPluginInstance;
 public:
   NSPluginStreamBase( class NSPluginInstance *instance );
@@ -115,7 +115,7 @@ private:
 
 class NSPluginStream : public NSPluginStreamBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   NSPluginStream( class NSPluginInstance *instance );
@@ -140,7 +140,7 @@ protected:
 
 class NSPluginBufStream : public NSPluginStreamBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   NSPluginBufStream( class NSPluginInstance *instance );
@@ -159,7 +159,7 @@ protected:
 
 class NSPluginInstance : public TQObject, public virtual NSPluginInstanceIface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -275,7 +275,7 @@ private:
 
 class NSPluginClass : public TQObject, virtual public NSPluginClassIface
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   NSPluginClass( const TQString &library, TQObject *parent, const char *name=0 );
@@ -325,7 +325,7 @@ private:
 
 class NSPluginViewer : public TQObject, virtual public NSPluginViewerIface
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
    NSPluginViewer( TQCString dcopId, TQObject *parent, const char *name=0 );
    virtual ~NSPluginViewer();
diff --git a/nsplugins/viewer/qxteventloop.h b/nsplugins/viewer/qxteventloop.h
index 230c8a32c..55c5b8698 100644
--- a/nsplugins/viewer/qxteventloop.h
+++ b/nsplugins/viewer/qxteventloop.h
@@ -49,7 +49,7 @@ class QXtEventLoopPrivate;
 
 class QXtEventLoop : public TQEventLoop
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/r14-xdg-update b/r14-xdg-update
index 69f599fad..f51a81df6 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -3,7 +3,7 @@
 # A script to perform R14.0.0 XDG compliance updates.
 
 SCRIPT_NAME="$(basename -- "$0")"
-SCRIPT_VERSION=202004080
+SCRIPT_VERSION=202307100
 
 # This script should be needed to run only once, but corner cases
 # and file/directory permissions could cause incomplete updates.
@@ -731,7 +731,7 @@ if [ "$R14_VERSION" -lt "201310190" ]; then
     mv $PROFILE_DIR/share/config/kwinrulesrc $PROFILE_DIR/share/config/twinrulesrc 2>/dev/null
     mv $PROFILE_DIR/share/config/kwin_rules_dialogrc $PROFILE_DIR/share/config/twin_rules_dialogrc 2>/dev/null
     sed -i 's|PluginLib=kwin_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc
-    sed -i 's|PluginLib=kwin3_|PluginLib=twin3_|' $PROFILE_DIR/share/config/twinrc
+    sed -i 's|PluginLib=kwin3_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc
   fi
 fi
 if [ "$R14_VERSION" -lt "201309150" ]; then
@@ -824,15 +824,14 @@ if [ "$R14_VERSION" -lt "201401070" ]; then
     mv $PROFILE_DIR/share/apps/kstyle $PROFILE_DIR/share/apps/tdestyle 2>/dev/null
   fi
 fi
-if [ "$R14_VERSION" -lt "201309150" ]; then
-  # Copy the following two rc files rather than move because the older versions are needed for HAL systems.
+if [ "$R14_VERSION" -lt "202202130" ]; then
   if [ ! -f $PROFILE_DIR/share/config/tdenetworkmanagerrc ] && [ -f $PROFILE_DIR/share/config/knetworkmanagerrc ]; then
     Log "  knetworkmanager->tdenetworkmanager"
-    cp -a $PROFILE_DIR/share/config/knetworkmanagerrc $PROFILE_DIR/share/config/tdenetworkmanagerrc 2>/dev/null
+    mv $PROFILE_DIR/share/config/knetworkmanagerrc $PROFILE_DIR/share/config/tdenetworkmanagerrc 2>/dev/null
   fi
   if [ ! -f $PROFILE_DIR/share/config/tdepowersaverc ] && [ -f $PROFILE_DIR/share/config/kpowersaverc ]; then
     Log "  kpowersave->tdepowersave"
-    cp -a $PROFILE_DIR/share/config/kpowersaverc $PROFILE_DIR/share/config/tdepowersaverc 2>/dev/null
+    mv $PROFILE_DIR/share/config/kpowersaverc $PROFILE_DIR/share/config/tdepowersaverc 2>/dev/null
   fi
 fi
 if [ "$R14_VERSION" -lt "201401050" ]; then
@@ -1009,6 +1008,24 @@ if [ "$R14_VERSION" -lt "201811010" ]; then
 	fi
 fi
 
+# Remove Konqueror's icon cache entry for / (issue TDE/tdebase#1)
+if [ "$R14_VERSION" -lt "202103280" ]; then
+  if [ "`grep \"\([=,]\)/,[^,\n]*[,]*\" ${PROFILE_DIR}/share/config/konq_history`" ]; then
+    sed -i "s|\([=,]\)/,[^,\n]*[,]*|\1|" ${PROFILE_DIR}/share/config/konq_history
+    Log "  Removed icon cache entry for root directory (Gitea issue TDE/tdebase#1)"
+  fi
+fi
+
+# Rename twin3_ to twin_ in theme config files
+if [ "$R14_VERSION" -lt "202307100" ]; then
+  find "${PROFILE_DIR}/share/apps/tdestyle/themes/" -type f -iname "*.xml" -print0 2>/dev/null | \
+    xargs -r0 sed -ri "s|twin3_|twin_|g"
+  if [ -f $PROFILE_DIR/share/config/twinrc ]; then
+    sed -i 's|PluginLib=twin3_|PluginLib=twin_|' $PROFILE_DIR/share/config/twinrc
+  fi
+  Log "  Renamed twin3_ to twin_ in theme files"
+fi
+
 # Perform some nominal update validations.
 # First clean house from any previous failures.
 if [ "$CACHE_DIR" = "" ]; then
diff --git a/starttde b/starttde
index 899bdfa9c..66360e228 100755
--- a/starttde
+++ b/starttde
@@ -364,6 +364,12 @@ if [ -d "$tdehome" ]; then
   fi
 fi
 
+# Get current font DPI configuration
+CUR_ForceFontDPI="`$TDEDIR/bin/kreadconfig --file kcmfonts --group General --key forceFontDPI --default 0`"
+CUR_ForceFontDPIEnable=false
+[ $CUR_ForceFontDPI -gt 0 ] && CUR_ForceFontDPIEnable=true
+unset CUR_ForceFontDPI
+
 # Please see tdestartupconfig source for usage.
 mkdir -m 700 -p "$tdehome/share"
 mkdir -m 700 -p "$tdehome/share/config"
@@ -377,9 +383,11 @@ kcmrandrrc [Screen0]
 kcmrandrrc [Screen1]
 kcmrandrrc [Screen2]
 kcmrandrrc [Screen3]
+kcmfonts General forceFontDPIEnable ${CUR_ForceFontDPIEnable}
 kcmfonts General forceFontDPI 0
 EOF
 $TDEDIR/bin/tdestartupconfig
+unset CUR_ForceFontDPIEnable
 if test $? -ne 0; then
   xmessage -center -geometry 500x100 "Could not start tdestartupconfig. Check your installation."
 fi
@@ -474,14 +482,12 @@ if test -z "$dl" && test "$kpersonalizerrc_general_firstlogin" != "true"; then
   esac
 fi
 
-if test "$kcmfonts_general_forcefontdpi" -eq 120; then
-  xrdb -quiet -merge -nocpp <<EOF
-Xft.dpi: 120
-EOF
-elif test "$kcmfonts_general_forcefontdpi" -eq 96; then
-  xrdb -quiet -merge -nocpp <<EOF
-Xft.dpi: 96
-EOF
+if test "$kcmfonts_general_forcefontdpienable" = "true"; then
+  echo "[starttde] Setting font DPI to $kcmfonts_general_forcefontdpi" 1>&2
+  tmpfile=$(mktemp /tmp/xft_dpi_settings.XXXXXX)
+  echo "Xft.dpi: $kcmfonts_general_forcefontdpi" > $tmpfile
+  xrdb -quiet -merge -nocpp $tmpfile
+  rm $tmpfile
 fi
 
 # Configuration of the gtk_qt_engine if not already set.
@@ -833,8 +839,7 @@ for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
   done
 done
 
-unset TDE_FULL_SESSION
 xprop -root -remove TDE_FULL_SESSION
-unset TDE_SESSION_UID
+unset TDE_FULL_SESSION TDE_SESSION_UID
 
 echo "[starttde] Trinity shutdown complete." 1>&2
diff --git a/tde_release_notes b/tde_release_notes
index bd4e27e0d..b1cb54f5d 100644
--- a/tde_release_notes
+++ b/tde_release_notes
@@ -19,17 +19,18 @@ fi
 
 RELEASE_VERSION="$( ${TDEDIR}/bin/tde-config --version | sed -n 's|^TDE: ||p' )"
 RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )"
+RELEASE_SERIES="$( ${TDEDIR}/bin/tde-config --version | sed -n 's|^TDE: \([^\.]*\.[^\.]*\).*|\l\1.x|p' )"
 
 if [ "$RELEASE_NOTES" = "" ] || [ "$RELEASE_NOTES" != "true" ]; then
   echo "[release_notes] Release version: $RELEASE_VERSION"
   echo "[release_notes] Release notes: $RELEASE_NOTES"
-  if ${TDEDIR}/bin/khelpcenter help:/khelpcenter/releasenotes ; then
+  if ${TDEDIR}/bin/khelpcenter help:/khelpcenter/releasenotes/${RELEASE_SERIES} ; then
     ${TDEDIR}/bin/kwriteconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" --type bool "true"
   fi
   RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )"
   echo "[release_notes] Release notes: $RELEASE_NOTES"
 fi
 
-unset RELEASE_NOTES RELEASE_VERSION
+unset RELEASE_NOTES RELEASE_VERSION RELEASE_SERIES
 exit 0
 
diff --git a/tde_show_license_info b/tde_show_license_info
new file mode 100644
index 000000000..212845f53
--- /dev/null
+++ b/tde_show_license_info
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# A script to open/autostart the dialog showing the licenses
+# under which TDE components are provided.
+# The dialog will be shown once for each TDE minor releases (R14.x.0)
+
+# As this script is run as a global TDE autostart app, all
+# environment variables should already be set.
+
+if [ "$TDEDIR" = "" ] || [ "$TDEHOME" = "" ]; then
+  exit 1
+fi
+
+RELEASE_MINOR_VERSION="$( ${TDEDIR}/bin/tde-config --version | sed -n  's|^TDE: \(R[0-9]\+\.[0-9]\+\)\.[0-9]\+[^0-9]*|\1|p' )"
+LICENSE_INFO="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "License Info" --key "${RELEASE_MINOR_VERSION}" )"
+
+if [ "$LICENSE_INFO" = "" ] || [ "$LICENSE_INFO" != "true" ]; then
+  echo "[tde_license_info] Release minor version: $RELEASE_MINOR_VERSION"
+  echo "[tde_license_info] License info: $LICENSE_INFO"
+  ${TDEDIR}/bin/tde_license_info
+  ${TDEDIR}/bin/kwriteconfig --file ${TDEHOME}/share/config/kdeglobals --group "License Info" --key "$RELEASE_MINOR_VERSION" --type bool "true"
+  LICENSE_INFO="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "License Info" --key "$RELEASE_MINOR_VERSION" )"
+  echo "[tde_license_info] License info: $LICENSE_INFO"
+fi
+
+unset LICENSE_INFO RELEASE_MINOR_VERSION
+exit 0
+
diff --git a/tdedebugdialog/kabstractdebugdialog.cpp b/tdedebugdialog/kabstractdebugdialog.cpp
index 10c0c2a00..d7c84a499 100644
--- a/tdedebugdialog/kabstractdebugdialog.cpp
+++ b/tdedebugdialog/kabstractdebugdialog.cpp
@@ -64,10 +64,10 @@ 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()
diff --git a/tdedebugdialog/kabstractdebugdialog.h b/tdedebugdialog/kabstractdebugdialog.h
index 6e3655973..fea7da42c 100644
--- a/tdedebugdialog/kabstractdebugdialog.h
+++ b/tdedebugdialog/kabstractdebugdialog.h
@@ -28,7 +28,7 @@ class KPushButton;
 
 class KAbstractDebugDialog : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KAbstractDebugDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
 
diff --git a/tdedebugdialog/tdedebugdialog.cpp b/tdedebugdialog/tdedebugdialog.cpp
index d63fac78b..6a1043345 100644
--- a/tdedebugdialog/tdedebugdialog.cpp
+++ b/tdedebugdialog/tdedebugdialog.cpp
@@ -60,7 +60,7 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c
 
   TQGridLayout *gbox = new TQGridLayout( 2, 2, KDialog::marginHint() );
   if( gbox == 0 ) { return; }
-  topLayout->addLayout( TQT_TQLAYOUT(gbox) );
+  topLayout->addLayout( gbox );
 
   TQStringList destList;
   destList.append( i18n("File") );
@@ -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" );
diff --git a/tdedebugdialog/tdedebugdialog.h b/tdedebugdialog/tdedebugdialog.h
index dec300018..d970b4a5d 100644
--- a/tdedebugdialog/tdedebugdialog.h
+++ b/tdedebugdialog/tdedebugdialog.h
@@ -39,7 +39,7 @@ class TDEConfig;
  */
 class TDEDebugDialog : public KAbstractDebugDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDEDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
diff --git a/tdedebugdialog/tdelistdebugdialog.cpp b/tdedebugdialog/tdelistdebugdialog.cpp
index d447b3747..4c3bb9f0e 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 );
diff --git a/tdedebugdialog/tdelistdebugdialog.h b/tdedebugdialog/tdelistdebugdialog.h
index 92e68d2be..51059f7e6 100644
--- a/tdedebugdialog/tdelistdebugdialog.h
+++ b/tdedebugdialog/tdelistdebugdialog.h
@@ -37,7 +37,7 @@ class KLineEdit;
  */
 class TDEListDebugDialog : public KAbstractDebugDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDEListDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp
index 054df8838..0a421d8af 100644
--- a/tdeinit/phase1.cpp
+++ b/tdeinit/phase1.cpp
@@ -61,8 +61,8 @@ int main(int argc, char **argv)
 	TQString wmToLaunch = config.readEntry("WMExecutable", "");
 	TQString wmArguments = config.readEntry("WMAdditionalArguments", "");
 
-	// Check for TWIN override environment variable
-	const char * twin_env = getenv("TWIN");
+	// Check for TDEWM override environment variable
+	const char * twin_env = getenv("TDEWM");
 	if (twin_env) {
 		wmToLaunch = twin_env;
 	}
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/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
index a4297969e..456c9d45f 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -48,7 +48,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name)
 
   TQVBoxLayout *topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
-  TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Paths to Local CGI Programs"), this );
+  TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Paths to Local CGI Programs"), this );
   topLayout->addWidget( topBox );
 
   mListBox = new TQListBox( topBox );
@@ -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/cgi/kcmcgi/kcmcgi.h b/tdeioslave/cgi/kcmcgi/kcmcgi.h
index ccd2f2f3d..0522fa24a 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.h
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.h
@@ -27,7 +27,7 @@ class TDEConfig;
 
 class KCMCgi : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     KCMCgi( TQWidget *parent = 0, const char *name = 0 );
     ~KCMCgi();
diff --git a/tdeioslave/filter/CMakeLists.txt b/tdeioslave/filter/CMakeLists.txt
index 446393d74..4387ab0f5 100644
--- a/tdeioslave/filter/CMakeLists.txt
+++ b/tdeioslave/filter/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 set( target tdeio_filter )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES filter.cc
+  SOURCES filter.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/filter/Makefile.am b/tdeioslave/filter/Makefile.am
index fcf2a9e9f..10a83993d 100644
--- a/tdeioslave/filter/Makefile.am
+++ b/tdeioslave/filter/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_filter.la
 
-tdeio_filter_la_SOURCES = filter.cc
+tdeio_filter_la_SOURCES = filter.cpp
 tdeio_filter_la_LIBADD = $(LIB_TDESYCOCA)
 tdeio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = filter.h
diff --git a/tdeioslave/filter/filter.cc b/tdeioslave/filter/filter.cpp
index a429103e1..a429103e1 100644
--- a/tdeioslave/filter/filter.cc
+++ b/tdeioslave/filter/filter.cpp
diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp
index 643a699f0..621d33301 100644
--- a/tdeioslave/finger/tdeio_finger.cpp
+++ b/tdeioslave/finger/tdeio_finger.cpp
@@ -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 3d083d2ed..079c82305 100644
--- a/tdeioslave/finger/tdeio_finger.h
+++ b/tdeioslave/finger/tdeio_finger.h
@@ -30,7 +30,7 @@
 
 class FingerProtocol : public TQObject, public TDEIO::SlaveBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -46,12 +46,12 @@ private slots:
 private:
   KURL                  *myURL;
 
-  QString	        *myPerlPath;
+  TQString	        *myPerlPath;
   TQString               *myFingerPath;
   TQString               *myFingerPerlScript;
   TQString               *myFingerCSSFile;
 
-  QString		*myStdStream;
+  TQString		*myStdStream;
 
 
   TDEProcess	        *myTDEProcess;
diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp
index 98c11a712..6f6cd93c6 100644
--- a/tdeioslave/fish/fish.cpp
+++ b/tdeioslave/fish/fish.cpp
@@ -570,7 +570,9 @@ int fishProtocol::establishConnection(char *buffer, TDEIO::fileoffset_t len) {
             infoMessage(i18n("Initiating protocol..."));
             if (!connectionAuth.password.isEmpty()) {
                 connectionAuth.password = connectionAuth.password.left(connectionAuth.password.length()-1);
-                cacheAuthentication(connectionAuth);
+                if (connectionAuth.keepPassword) {
+                    cacheAuthentication(connectionAuth);
+                }
             }
             isLoggedIn = true;
             return 0;
@@ -774,7 +776,7 @@ int fishProtocol::handleResponse(const TQString &str){
 
 int fishProtocol::makeTimeFromLs(const TQString &monthStr, const TQString &dayStr, const TQString &timeyearStr)
 {
-    TQDateTime dt(TQDate::currentDate(Qt::UTC));
+    TQDateTime dt(TQDate::currentDate(TQt::UTC));
     int year = dt.date().year();
     int month = dt.date().month();
     int currentMonth = month;
diff --git a/tdeioslave/floppy/tdeio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp
index c67af0b39..50303f1b7 100644
--- a/tdeioslave/floppy/tdeio_floppy.cpp
+++ b/tdeioslave/floppy/tdeio_floppy.cpp
@@ -1105,7 +1105,7 @@ void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool )
    int bytesRead(0);
    TQByteArray array;
 
-   //from file.cc
+   //from file.cpp
    // Loop until we got 0 (end of data)
    do
    {
diff --git a/tdeioslave/home/Makefile.am b/tdeioslave/home/Makefile.am
index 3bd078852..4176a196a 100644
--- a/tdeioslave/home/Makefile.am
+++ b/tdeioslave/home/Makefile.am
@@ -28,5 +28,5 @@ check: testhome
 	./testhome
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_home.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_home.pot
 
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/homeimpl.h b/tdeioslave/home/homeimpl.h
index 5884d8ab7..abc106bcb 100644
--- a/tdeioslave/home/homeimpl.h
+++ b/tdeioslave/home/homeimpl.h
@@ -27,9 +27,9 @@
 
 #include <tqstring.h>
 
-class HomeImpl : public QObject
+class HomeImpl : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	HomeImpl();
diff --git a/tdeioslave/info/CMakeLists.txt b/tdeioslave/info/CMakeLists.txt
index 6f243ba3f..85937d486 100644
--- a/tdeioslave/info/CMakeLists.txt
+++ b/tdeioslave/info/CMakeLists.txt
@@ -37,7 +37,7 @@ install( PROGRAMS kde-info2html DESTINATION ${DATA_INSTALL_DIR}/tdeio_info )
 set( target tdeio_info )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES info.cc
+  SOURCES info.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/info/Makefile.am b/tdeioslave/info/Makefile.am
index a682f4a77..8f0541c0f 100644
--- a/tdeioslave/info/Makefile.am
+++ b/tdeioslave/info/Makefile.am
@@ -8,7 +8,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = tdeio_info.la
 
-tdeio_info_la_SOURCES = info.cc
+tdeio_info_la_SOURCES = info.cpp
 tdeio_info_la_LIBADD = $(LIB_TDEIO)
 tdeio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = info.h
diff --git a/tdeioslave/info/info.cc b/tdeioslave/info/info.cpp
index 83b41dae8..83b41dae8 100644
--- a/tdeioslave/info/info.cc
+++ b/tdeioslave/info/info.cpp
diff --git a/tdeioslave/mac/TODO b/tdeioslave/mac/TODO
index 69fcb0d2e..469a616be 100644
--- a/tdeioslave/mac/TODO
+++ b/tdeioslave/mac/TODO
@@ -5,7 +5,7 @@ grep TODO tdeio_mac.cpp
         //TODO this means dev=foo must be the last argument in the query
         //TODO this error interrupts the user when typing ?dev=foo on each letter of foo
         //TODO are there any more characters to escape?
-        QString theSize(fileRE.group(4)); //TODO: this is data size, what about  resource size?
+        TQString theSize(fileRE.group(4)); //TODO: this is data size, what about  resource size?
 
 Future things:
 	- maybe make it work with plain old hfs partitions
diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp
index caef50784..d116ef909 100644
--- a/tdeioslave/mac/tdeio_mac.cpp
+++ b/tdeioslave/mac/tdeio_mac.cpp
@@ -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 e497e9918..ca4f8b95a 100644
--- a/tdeioslave/mac/tdeio_mac.h
+++ b/tdeioslave/mac/tdeio_mac.h
@@ -28,7 +28,7 @@
 
 class MacProtocol : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MacProtocol(const TQCString &pool, const TQCString &app);
     ~MacProtocol();
diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp
index 556b287e4..703ec2202 100644
--- a/tdeioslave/man/kmanpart.cpp
+++ b/tdeioslave/man/kmanpart.cpp
@@ -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/kmanpart.h b/tdeioslave/man/kmanpart.h
index 908cca538..4fdb45733 100644
--- a/tdeioslave/man/kmanpart.h
+++ b/tdeioslave/man/kmanpart.h
@@ -39,7 +39,7 @@ class TDEAboutData;
  */
 class KManPartFactory: public KParts::Factory
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KManPartFactory( TQObject * parent = 0, const char * name = 0 );
       virtual ~KManPartFactory();
@@ -58,7 +58,7 @@ class KManPartFactory: public KParts::Factory
 
 class KManPart : public TDEHTMLPart
 {
-   Q_OBJECT
+   TQ_OBJECT
    public:
       KManPart( TQWidget * parent, const char * name = 0L );
       KParts::BrowserExtension * extension() {return m_extension;}
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index 8dd23dc6a..3f27feb68 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -18,8 +18,6 @@
 
 // End of verbatim comment
 
-// kate: space-indent on; indent-width 4; replace-tabs on;
-
 /*
  * man2html-linux-1.0/1.1
  * This version modified for Redhat/Caldera linux - March 1996.
@@ -332,7 +330,7 @@ static void InitNumberDefinitions( void )
 {
     // As the date number registers are more for end-users, better choose local time.
     // Groff seems to support Gregorian dates only
-    TQDate today( TQDate::currentDate( Qt::LocalTime ) );
+    TQDate today( TQDate::currentDate( TQt::LocalTime ) );
     s_numberDefinitionMap.insert( "year", today.year() ); // Y2K-correct year
     s_numberDefinitionMap.insert( "yr", today.year() - 1900 ); // Y2K-incorrect year
     s_numberDefinitionMap.insert( "mo", today.month() );
@@ -4192,13 +4190,13 @@ static char *scan_request(char *c)
                         if (mode)
                         {
                             // .rm ReMove
-                            s_stringDefinitionMap.remove(name); // ### QT4: removeAll
+                            s_stringDefinitionMap.remove(name);
                         }
                         else
                         {
                             // .rn ReName
                             StringDefinition def=(*it);
-                            s_stringDefinitionMap.remove(name); // ### QT4: removeAll
+                            s_stringDefinitionMap.remove(name);
                             s_stringDefinitionMap.insert(name2,def);
                         }
                     }
@@ -5154,7 +5152,7 @@ static char *scan_request(char *c)
                     else
                     {
                         NumberDefinition def=(*it);
-                        s_numberDefinitionMap.remove(name); // ### QT4: removeAll
+                        s_numberDefinitionMap.remove(name);
                         s_numberDefinitionMap.insert(name2,def);
                     }
                     kdDebug(7107) << "end .rnn" << endl;
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index 92530facb..cd04f702e 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -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();
@@ -963,6 +963,7 @@ void MANProtocol::constructPath(TQStringList& constr_path, TQStringList constr_c
         "/usr/sunpc/man",
         "/usr/ncd/man",
         "/usr/newsprint/man",
+				TDE_MANDIR,
         NULL };
 
 
diff --git a/tdeioslave/man/tdeio_man.h b/tdeioslave/man/tdeio_man.h
index e621a7fbf..89c1d29c4 100644
--- a/tdeioslave/man/tdeio_man.h
+++ b/tdeioslave/man/tdeio_man.h
@@ -34,7 +34,7 @@
 
 class MANProtocol : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeioslave/man/tdeio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp
index 131e03541..898a18eaa 100644
--- a/tdeioslave/man/tdeio_man_test.cpp
+++ b/tdeioslave/man/tdeio_man_test.cpp
@@ -11,7 +11,7 @@
 
 class tdeio_man_test : public  MANProtocol
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   tdeio_man_test(const TQCString &pool_socket, const TQCString &app_socket);
diff --git a/tdeioslave/media/Makefile.am b/tdeioslave/media/Makefile.am
index a5551fb2e..2ce7900b4 100644
--- a/tdeioslave/media/Makefile.am
+++ b/tdeioslave/media/Makefile.am
@@ -1,7 +1,3 @@
-if include_media_halbackend
-PROPSDLGPLUGINDIR = propsdlgplugin
-endif
-
 SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \
           tdefile-plugin tdecmodule mimetypes services $(PROPSDLGPLUGINDIR)
 
diff --git a/tdeioslave/media/configure.in.in b/tdeioslave/media/configure.in.in
index 413848b64..a6718eb16 100644
--- a/tdeioslave/media/configure.in.in
+++ b/tdeioslave/media/configure.in.in
@@ -6,179 +6,3 @@ AC_CHECK_HEADER(linux/cdrom.h,
   LINUXCDPOLLING=yes
   AC_SUBST(LINUXCDPOLLING)
 ])
-
-
-AC_ARG_WITH(hal,AC_HELP_STRING([--with-hal],[Enable HAL support  [default=check]]),[hal_test="$withval"],[hal_test="yes"])
-
-if test "x$hal_test" = "xyes" ; then
-
-########### Check for the HAL
-  AC_MSG_CHECKING(for the HAL)
-
-  hal_inc=NOTFOUND
-  hal_lib=NOTFOUND
-  hal=NOTFOUND
-
-  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/hal /usr/local/include /usr/local/include/hal"
-  AC_FIND_FILE(libhal.h libhal-storage.h, $search_incs, hal_incdir)
-
-  if test -r $hal_incdir/libhal.h && test -r $hal_incdir/libhal-storage.h && grep LibHalVolume $hal_incdir/libhal-storage.h > /dev/null 2>&1; then
-    HAL_INCS="-I$hal_incdir"
-    hal_inc=FOUND
-  fi
-
-  search_libs="$kde_libraries $kde_extra_libs /usr/lib$tdelibsuff /usr/local/lib$tdelibsuff"
-  AC_FIND_FILE(libhal.so libhal-storage.so, $search_libs, hal_libdir)
-
-  if test -r $hal_libdir/libhal.so && test -r $hal_libdir/libhal-storage.so ; then
-    HAL_LIBS="-L$hal_libdir -lhal -lhal-storage"
-    hal_lib=FOUND
-  fi
-
-  if test "$hal_inc" != FOUND || test "$hal_lib" != FOUND; then 
-    KDE_PKG_CHECK_MODULES( HAL, hal > 0.5, [ HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND; ] , AC_MSG_RESULT(Nothing found on PKG_CONFIG_PATH) )
-  fi
-
-  if test "$hal_inc" = FOUND && test "$hal_lib" = FOUND ; then
-      AC_MSG_RESULT(headers $HAL_INCS  libraries $HAL_LIBS)
-      hal=FOUND
-  else
-      AC_MSG_RESULT(searched but not found)
-  fi
-
-
-  AC_SUBST(HAL_INCS)
-  AC_SUBST(HAL_LIBS)
-
-
-########### Check for DBus
-
-  AC_MSG_CHECKING(for DBus)
-
-  dbus_inc=NOTFOUND
-  dbus_lib=NOTFOUND
-  dbus=NOTFOUND
-
-  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-  AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
-
-  search_incs_arch_deps="$kde_includes $kde_extra_includes /usr/lib$tdelibsuff/dbus-1.0/include /usr/local/lib$tdelibsuff/dbus-1.0/include"
-  AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
-
-  if test -r $dbus_incdir/dbus/dbus.h && test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h ; then
-    DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
-    dbus_inc=FOUND
-  fi
-
-  search_libs="$kde_libraries $kde_extra_libs /usr/lib$tdelibsuff /usr/local/lib$tdelibsuff"
-  AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
-
-  if test -r $dbus_libdir/libdbus-1.so ; then
-    DBUS_LIBS="-L$dbus_libdir -ldbus-1"
-    dbus_lib=FOUND
-  fi
-
-  if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then 
-    KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
-  fi
-
-  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
-  if test -z "$dbus_bus_var"; then
-        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
-  fi
-  AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
-
-  if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
-    AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
-    dbus=FOUND
-  else
-    AC_MSG_RESULT(searched but not found)
-  fi
-
-  AC_SUBST(DBUS_INCS)
-  AC_SUBST(DBUS_LIBS)
-
-########### Check for DBus-Qt3 bindings
-
-  AC_MSG_CHECKING(for DBus-Qt3 bindings)
-
-  dbusqt_inc=NOTFOUND
-  dbusqt_lib=NOTFOUND
-  dbusqt=NOTFOUND
-
-  search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-  AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
-
-  if test -r $dbusqt_incdir/dbus/connection.h ; then
-    have_qt_patch=0
-    grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-    > /dev/null 2>&1 && have_qt_patch=1
-    if test $have_qt_patch = 1 ; then
-      DBUSTQT_INCS="-I$dbusqt_incdir"
-      dbusqt_inc=FOUND
-    fi
-  fi
-
-  search_libs="$kde_libraries $kde_extra_libs /usr/lib$tdelibsuff /usr/local/lib$tdelibsuff"
-  AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
-
-  if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-    DBUSTQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-    dbusqt_lib=FOUND
-  fi
-
-  if test $dbusqt_inc != FOUND  || test $dbusqt_lib != FOUND ; then 
-
-    search_incs="`pkg-config --cflags dbus-1  |sed 's/-I//g'`"
-    AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir)
-    if test -r $dbusqt_incdir/dbus/connection.h ; then
-      have_qt_patch=0
-      grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \
-      > /dev/null 2>&1 && have_qt_patch=1
-      if test $have_qt_patch = 1 ; then
-        DBUSTQT_INCS="-I$dbusqt_incdir"
-        dbusqt_inc=FOUND
-      fi
-    fi
-
-    search_libs="`pkg-config --libs dbus-1 --libs-only-L | sed 's/-L//g'`"
-    AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir)
-
-    if test -r $dbusqt_libdir/libdbus-qt-1.so ; then
-      DBUSTQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1"
-      dbusqt_lib=FOUND
-    fi
-
-  fi
-
-
-  if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
-    AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir)
-    dbusqt=FOUND
-  else
-    AC_MSG_RESULT(searched but not found)
-  fi
-
-  AC_SUBST(DBUSTQT_INCS)
-  AC_SUBST(DBUSTQT_LIBS)
-fi
-
-########### Check if media HAL backend sould be compiled
-
-AC_MSG_CHECKING(if the HAL backend for media:/ should be compiled)
-
-HALBACKEND=no
-if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
-  AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation])
-  HALBACKEND=yes
-  AC_SUBST(HALBACKEND)
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AM_CONDITIONAL(include_media_linuxcdpolling, test "$LINUXCDPOLLING" = "yes")
-AM_CONDITIONAL(include_media_halbackend, test "$HALBACKEND" = yes)
-
-AC_CHECK_FUNCS(statvfs)
-
diff --git a/tdeioslave/media/contrib/README b/tdeioslave/media/contrib/README
index 8f6041578..4e330e073 100644
--- a/tdeioslave/media/contrib/README
+++ b/tdeioslave/media/contrib/README
@@ -1,11 +1,5 @@
 Those scripts are an example on how to allow media:/ to use
-hotplugging events if you don't use HAL. They're targeting
-"Linux 2.6 + hotplug + udev" platforms, but we can surely make
-something equivalent for Linux 2.4, FreeBSD...
-
-They are just examples, the packagers will surely develop their
-own version (I'm currently using them on Debian Sid, Linux 2.6.9
-though).
+hotplugging events.
 
 1) mediamanager_usbstorage.dev
 This file only needs to be copied to /etc/dev.d/default
diff --git a/tdeioslave/media/libmediacommon/mediamanagersettings.kcfg b/tdeioslave/media/libmediacommon/mediamanagersettings.kcfg
index 32725c1bb..8136ecd79 100644
--- a/tdeioslave/media/libmediacommon/mediamanagersettings.kcfg
+++ b/tdeioslave/media/libmediacommon/mediamanagersettings.kcfg
@@ -4,11 +4,6 @@
 <kcfg>
   <kcfgfile name="mediamanagerrc"/>
   <group name="Global">
-    <entry name="HalBackendEnabled" type="Bool">
-      <label>Enable HAL backend</label>
-      <whatsthis>When HAL (Hardware Abstraction Layer) support is enabled, TDE will use it to gather information on the storage media available in your system.</whatsthis>
-      <default>true</default>
-    </entry>
     <entry name="TdeHardwareBackendEnabled" type="Bool">
       <label>Enable TDE hardware library backend</label>
       <whatsthis>When TDE hardware library support is enabled, TDE will use it to gather information on the storage media available in your system.</whatsthis>
@@ -25,8 +20,13 @@
       <default>true</default>
     </entry>
     <entry name="NotificationPopupsEnabled" type="Bool">
-      <label>Enable notification popups</label>
-      <whatsthis>Deselect this if you do not want action request popups to be generated when devices are plugged in.</whatsthis>
+      <label>Enable notification dialogs popups</label>
+      <whatsthis>Deselect this if you do not want action request dialog popups to be generated when devices are plugged in.</whatsthis>
+      <default>true</default>
+    </entry>
+    <entry name="DeviceMonitorPopupsEnabled" type="Bool">
+      <label>Enable device monitor notification popups</label>
+      <whatsthis>Deselect this if you do not want device monitoring popups to be generated when devices are added, modified or removed.</whatsthis>
       <default>true</default>
     </entry>
   </group>
diff --git a/tdeioslave/media/libmediacommon/medium.cpp b/tdeioslave/media/libmediacommon/medium.cpp
index 77e32ba0f..797c409b4 100644
--- a/tdeioslave/media/libmediacommon/medium.cpp
+++ b/tdeioslave/media/libmediacommon/medium.cpp
@@ -23,68 +23,58 @@
 
 const TQString Medium::SEPARATOR = "---";
 
+void Medium::initMedium()
+{
+	m_properties.clear();
+	m_properties += TQString::null; // ID
+	m_properties += TQString::null; // UUID
+	m_properties += TQString::null; // NAME
+	m_properties += TQString::null; // LABEL
+	m_properties += TQString::null; // USER_LABEL
+	m_properties += "false";        // MOUNTABLE
+	m_properties += TQString::null; // DEVICE_NODE
+	m_properties += TQString::null; // MOUNT_POINT
+	m_properties += TQString::null; // FS_TYPE
+	m_properties += "false";        // MOUNTED
+	m_properties += TQString::null; // BASE_URL
+	m_properties += TQString::null; // MIME_TYPE
+	m_properties += TQString::null; // ICON_NAME
+	m_properties += "false";        // ENCRYPTED
+	m_properties += TQString::null; // CLEAR_DEVICE_UDI
+	m_properties += "false";        // HIDDEN
+	m_properties += "false";        // SOFT_HIDDEN
+	m_properties += "false";        // LOCKED
+}
+
 Medium::Medium(const TQString id, TQString uuid, const TQString name)
 {
-	m_properties+= id; /* ID */
-	m_properties+= uuid; /* UUID */
-	m_properties+= name; /* NAME */
-	m_properties+= name; /* LABEL */
-	m_properties+= TQString::null; /* USER_LABEL */
-
-	m_properties+= "false"; /* MOUNTABLE */
-	m_properties+= TQString::null; /* DEVICE_NODE */
-	m_properties+= TQString::null; /* MOUNT_POINT */
-	m_properties+= TQString::null; /* FS_TYPE */
-	m_properties+= "false"; /* MOUNTED */
-	m_properties+= TQString::null; /* BASE_URL */
-	m_properties+= TQString::null; /* MIME_TYPE */
-	m_properties+= TQString::null; /* ICON_NAME */
-	m_properties+= "false"; /* ENCRYPTED */
-	m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */
-	m_properties+= "false"; /* HIDDEN */
-	m_properties+= "false"; /* SOFT_HIDDEN */
-
-	loadUserLabel();
-
-	m_halmounted = false;
+	initMedium();
+	if (!id.isEmpty() && !uuid.isEmpty())
+	{
+		m_properties[ID]    = id;
+		m_properties[UUID]  = uuid;
+		m_properties[NAME]  = name;
+		m_properties[LABEL] = name;
+		loadUserLabel();
+	}
 }
 
 Medium::Medium()
 {
-	m_properties+= TQString::null; /* ID */
-	m_properties+= TQString::null; /* UUID */
-	m_properties+= TQString::null; /* NAME */
-	m_properties+= TQString::null; /* LABEL */
-	m_properties+= TQString::null; /* USER_LABEL */
-
-	m_properties+= TQString::null; /* MOUNTABLE */
-	m_properties+= TQString::null; /* DEVICE_NODE */
-	m_properties+= TQString::null; /* MOUNT_POINT */
-	m_properties+= TQString::null; /* FS_TYPE */
-	m_properties+= TQString::null; /* MOUNTED */
-	m_properties+= TQString::null; /* BASE_URL */
-	m_properties+= TQString::null; /* MIME_TYPE */
-	m_properties+= TQString::null; /* ICON_NAME */
-	m_properties+= TQString::null; /* ENCRYPTED */
-	m_properties+= TQString::null; /* CLEAR_DEVICE_UDI */
-	m_properties+= "false";        /* HIDDEN */
-	m_properties+= "false";        /* SOFT_HIDDEN */
-	
-	m_halmounted = false;
+	initMedium();
 }
 
 const Medium Medium::create(const TQStringList &properties)
 {
 	Medium m;
 
-	if ( properties.size() >= PROPERTIES_COUNT )
+	if (properties.size() >= PROPERTIES_COUNT)
 	{
 		m.m_properties[ID] = properties[ID];
 		m.m_properties[UUID] = properties[UUID];
 		m.m_properties[NAME] = properties[NAME];
 		m.m_properties[LABEL] = properties[LABEL];
 		m.m_properties[USER_LABEL] = properties[USER_LABEL];
-
 		m.m_properties[MOUNTABLE] = properties[MOUNTABLE];
 		m.m_properties[DEVICE_NODE] = properties[DEVICE_NODE];
 		m.m_properties[MOUNT_POINT] = properties[MOUNT_POINT];
@@ -97,6 +87,7 @@ const Medium Medium::create(const TQStringList &properties)
 		m.m_properties[CLEAR_DEVICE_UDI] = properties[CLEAR_DEVICE_UDI];
 		m.m_properties[HIDDEN] = properties[HIDDEN];
 		m.m_properties[SOFT_HIDDEN] = properties[SOFT_HIDDEN];
+		m.m_properties[LOCKED] = properties[LOCKED];
 	}
 
 	return m;
@@ -106,13 +97,12 @@ Medium::MList Medium::createList(const TQStringList &properties)
 {
 	MList l;
 
-	if ( properties.size() % (PROPERTIES_COUNT+1) == 0)
+	if (properties.size() % (PROPERTIES_COUNT+1) == 0)
 	{
-		int media_count = properties.size()/(PROPERTIES_COUNT+1);
-
+		int media_count = properties.size() / (PROPERTIES_COUNT + 1);
 		TQStringList props = properties;
 
-		for(int i=0; i<media_count; i++)
+		for (int i=0; i < media_count; i++)
 		{
 			const Medium m = create(props);
 			l.append(m);
@@ -127,7 +117,6 @@ Medium::MList Medium::createList(const TQStringList &properties)
 	return l;
 }
 
-
 void Medium::setName(const TQString &name)
 {
 	m_properties[NAME] = name;
@@ -138,35 +127,22 @@ void Medium::setLabel(const TQString &label)
 	m_properties[LABEL] = label;
 }
 
-void Medium::setEncrypted(bool state)
-{
-	m_properties[ENCRYPTED] = ( state ? "true" : "false" );
-}
-
-void Medium::setHidden(bool state)
-{
-	m_properties[HIDDEN] = ( state ? "true" : "false" );
-}
-
-void Medium::setSoftHidden(bool state)
-{
-	m_properties[SOFT_HIDDEN] = ( state ? "true" : "false" );
-}
-
 void Medium::setUserLabel(const TQString &label)
 {
 	TDEConfig cfg("mediamanagerrc");
 	cfg.setGroup("UserLabels");
 
 	TQString entry_name = m_properties[UUID];
-
-	if ( label.isNull() )
-	{
-		cfg.deleteEntry(entry_name);
-	}
-	else
+	if (!entry_name.isEmpty())
 	{
-		cfg.writeEntry(entry_name, label);
+		if (label.isEmpty())
+		{
+			cfg.deleteEntry(entry_name);
+		}
+		else
+		{
+			cfg.writeEntry(entry_name, label);
+		}
 	}
 
 	m_properties[USER_LABEL] = label;
@@ -178,10 +154,9 @@ void Medium::loadUserLabel()
 	cfg.setGroup("UserLabels");
 
 	TQString entry_name = m_properties[UUID];
-
-	if ( cfg.hasKey(entry_name) )
+	if (!entry_name.isEmpty())
 	{
-		m_properties[USER_LABEL] = cfg.readEntry(entry_name);
+		m_properties[USER_LABEL] = cfg.readEntry(entry_name, TQString::null);
 	}
 	else
 	{
@@ -189,48 +164,52 @@ void Medium::loadUserLabel()
 	}
 }
 
-
-bool Medium::mountableState(bool mounted)
+void Medium::setMountable(bool mountable)
 {
-	if ( m_properties[DEVICE_NODE].isEmpty()
-	  || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) )
+	m_properties[MOUNTABLE] = mountable ? "true" : "false";
+	if (!mountable)
 	{
-		return false;
+		setMountPoint(TQString::null);
+		setMounted(false);
 	}
+}
 
-	m_properties[MOUNTABLE] = "true";
-	m_properties[MOUNTED] = ( mounted ? "true" : "false" );
+void Medium::setDeviceNode(const TQString &deviceNode)
+{
+	m_properties[DEVICE_NODE] = deviceNode;
+}
 
-	return true;
+void Medium::setMountPoint(const TQString &mountPoint)
+{
+	if (isMountable())
+	{
+		m_properties[MOUNT_POINT] = mountPoint;
+	}
+	else
+	{
+		m_properties[MOUNT_POINT] = TQString::null;
+	}
 }
 
-void Medium::mountableState(const TQString &deviceNode,
-                            const TQString &mountPoint,
-                            const TQString &fsType, bool mounted)
+void Medium::setFsType(const TQString &fsType)
 {
-	m_properties[MOUNTABLE] = "true";
-	m_properties[DEVICE_NODE] = deviceNode;
-	m_properties[MOUNT_POINT] = mountPoint;
 	m_properties[FS_TYPE] = fsType;
-	m_properties[MOUNTED] = ( mounted ? "true" : "false" );
 }
 
-void Medium::mountableState(const TQString &deviceNode,
-	                    const TQString &clearDeviceUdi,
-                            const TQString &mountPoint,
-                            const TQString &fsType, bool mounted)
+void Medium::setMounted(bool mounted)
 {
-	m_properties[MOUNTABLE] = "true";
-	m_properties[DEVICE_NODE] = deviceNode;
-	m_properties[CLEAR_DEVICE_UDI] = clearDeviceUdi;
-	m_properties[MOUNT_POINT] = mountPoint;
-	m_properties[FS_TYPE] = fsType;
-	m_properties[MOUNTED] = ( mounted ? "true" : "false" );
+	if (isMountable())
+	{
+		m_properties[MOUNTED] = mounted ? "true" : "false";
+	}
+	else
+	{
+		m_properties[MOUNTED] = "false";
+	}
 }
 
-void Medium::unmountableState(const TQString &baseURL)
+void Medium::setBaseURL(const TQString &baseURL)
 {
-	m_properties[MOUNTABLE] = "false";
 	m_properties[BASE_URL] = baseURL;
 }
 
@@ -244,33 +223,51 @@ void Medium::setIconName(const TQString &iconName)
 	m_properties[ICON_NAME] = iconName;
 }
 
-bool Medium::needMounting() const
+void Medium::setEncrypted(bool encrypted)
+{
+	m_properties[ENCRYPTED] = encrypted ? "true" : "false";
+	if (!encrypted)
+	{
+		setLocked(false);
+	}
+}
+
+void Medium::setClearDeviceUdi(const TQString &clearDeviceUdi)
 {
-	return isMountable() && !isMounted();
+	m_properties[CLEAR_DEVICE_UDI] = clearDeviceUdi;
 }
 
-bool Medium::needDecryption() const
+void Medium::setHidden(bool state)
 {
-	return isEncrypted() && clearDeviceUdi().isEmpty();
+	m_properties[HIDDEN] = state ? "true" : "false";
+}
+
+void Medium::setSoftHidden(bool state)
+{
+	m_properties[SOFT_HIDDEN] = state ? "true" : "false";
+}
+
+void Medium::setLocked(bool locked)
+{
+	m_properties[LOCKED] = locked ? "true" : "false";
 }
 
 KURL Medium::prettyBaseURL() const
 {
-        if ( !baseURL().isEmpty() )
-            return baseURL();
+	if (!baseURL().isEmpty())
+	{
+		return baseURL();
+	}
 
-		return KURL( mountPoint() );
+	return KURL(mountPoint());
 }
 
 TQString Medium::prettyLabel() const
 {
-	if ( !userLabel().isEmpty() )
+	if (!userLabel().isEmpty())
 	{
 		return userLabel();
 	}
-	else
-	{
-		return label();
-	}
-}
 
+	return label();
+}
diff --git a/tdeioslave/media/libmediacommon/medium.h b/tdeioslave/media/libmediacommon/medium.h
index bf465fd09..3c9677c21 100644
--- a/tdeioslave/media/libmediacommon/medium.h
+++ b/tdeioslave/media/libmediacommon/medium.h
@@ -29,24 +29,25 @@ class Medium
 public:
 	typedef TQValueList<Medium> MList;
 
-	static const uint ID =			0;
-	static const uint UUID =		1;
-	static const uint NAME =		2;
-	static const uint LABEL =		3;
-	static const uint USER_LABEL =		4;
-	static const uint MOUNTABLE =		5;
-	static const uint DEVICE_NODE = 	6;
-	static const uint MOUNT_POINT = 	7;
-	static const uint FS_TYPE = 		8;
-	static const uint MOUNTED = 		9;
-	static const uint BASE_URL = 		10;
-	static const uint MIME_TYPE = 		11;
-	static const uint ICON_NAME = 		12;
-	static const uint ENCRYPTED = 		13;
-	static const uint CLEAR_DEVICE_UDI = 	14;
-	static const uint HIDDEN = 		15;
-	static const uint SOFT_HIDDEN = 	16;
-	static const uint PROPERTIES_COUNT = 	17;
+	static const uint ID               =  0;
+	static const uint UUID             =  1;
+	static const uint NAME             =  2;
+	static const uint LABEL            =  3;
+	static const uint USER_LABEL       =  4;
+	static const uint MOUNTABLE        =  5;
+	static const uint DEVICE_NODE      =  6;
+	static const uint MOUNT_POINT      =  7;
+	static const uint FS_TYPE          =  8;
+	static const uint MOUNTED          =  9;
+	static const uint BASE_URL         = 10;
+	static const uint MIME_TYPE        = 11;
+	static const uint ICON_NAME        = 12;
+	static const uint ENCRYPTED        = 13;
+	static const uint CLEAR_DEVICE_UDI = 14;
+	static const uint HIDDEN           = 15;
+	static const uint SOFT_HIDDEN      = 16;
+	static const uint LOCKED           = 17;
+	static const uint PROPERTIES_COUNT = 18;
 	static const TQString SEPARATOR;
 
 	Medium(const TQString id, TQString uuid, const TQString name);
@@ -60,71 +61,67 @@ public:
 	TQString name() const { return m_properties[NAME]; }
 	TQString label() const { return m_properties[LABEL]; }
 	TQString userLabel() const { return m_properties[USER_LABEL]; }
-	bool isMountable() const { return m_properties[MOUNTABLE]=="true"; }
+	bool     isMountable() const { return m_properties[MOUNTABLE] == "true"; }
 	TQString deviceNode() const { return m_properties[DEVICE_NODE]; }
 	TQString mountPoint() const { return m_properties[MOUNT_POINT]; }
 	TQString fsType() const { return m_properties[FS_TYPE]; }
-	bool isMounted() const { return m_properties[MOUNTED]=="true"; }
+	bool     isMounted() const { return m_properties[MOUNTED] == "true"; }
 	TQString baseURL() const { return m_properties[BASE_URL]; }
 	TQString mimeType() const { return m_properties[MIME_TYPE]; }
 	TQString iconName() const { return m_properties[ICON_NAME]; }
-	bool isEncrypted() const { return m_properties[ENCRYPTED]=="true"; };
+	bool     isEncrypted() const { return m_properties[ENCRYPTED] == "true"; };
 	TQString clearDeviceUdi() const { return m_properties[CLEAR_DEVICE_UDI]; };
-	bool hidden() const { return m_properties[HIDDEN]=="true"; };
-	bool softHidden() const { return m_properties[SOFT_HIDDEN]=="true"; };
+	bool     hidden() const { return m_properties[HIDDEN] == "true"; };
+	bool     softHidden() const { return m_properties[SOFT_HIDDEN] == "true"; };
+	bool     isLocked() const { return m_properties[LOCKED] == "true"; };
 
-	bool needMounting() const;
-	bool needDecryption() const;
+	bool needMounting() const { return isMountable() && !isMounted(); };
+	bool needUnlocking() const { return isEncrypted() && isLocked(); }
 	KURL prettyBaseURL() const;
 	TQString prettyLabel() const;
 
 	void setName(const TQString &name);
 	void setLabel(const TQString &label);
 	void setUserLabel(const TQString &label);
-	void setEncrypted(bool state);
-	void setHidden(bool state);
-	void setSoftHidden(bool state);
-
-	bool mountableState(bool mounted);
-	void mountableState(const TQString &deviceNode,
-	                    const TQString &mountPoint,
-	                    const TQString &fsType, bool mounted);
-	void mountableState(const TQString &deviceNode,
-				const TQString &clearDeviceUdi,
-				const TQString &mountPoint,
-				const TQString &fsType, bool mounted);
-	void unmountableState(const TQString &baseURL = TQString::null);
-
+	void setMountable(bool mountable);
+	void setDeviceNode(const TQString &deviceNode);
+	void setMountPoint(const TQString &mountPoint);
+	void setFsType(const TQString &fsType);
+	void setMounted(bool mounted);
+	void setBaseURL(const TQString &baseURL);
 	void setMimeType(const TQString &mimeType);
 	void setIconName(const TQString &iconName);
-	void setHalMounted(bool flag) const { m_halmounted = flag; }
-	bool halMounted() const { return m_halmounted; }
+	void setEncrypted(bool encrypted);
+	void setClearDeviceUdi(const TQString &clearDeviceUdi);
+	void setHidden(bool state);
+	void setSoftHidden(bool state);
+	void setLocked(bool locked);
 
-//private:
 	Medium();
 
 private:
+	void initMedium();
 	void loadUserLabel();
 
 	TQStringList m_properties;
-	mutable bool m_halmounted;
 	
-friend class TQValueListNode<const Medium>;
+	friend class TQValueListNode<const Medium>;
 };
 
 namespace MediaManagerUtils {
-  static inline TQMap<TQString,TQString> splitOptions(const TQStringList & options) 
-    {
-      TQMap<TQString,TQString> valids;
-
-      for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+	static inline TQMap<TQString,TQString> splitOptions(const TQStringList &options)
 	{
-	  TQString key = (*it).left((*it).find('='));
-	  TQString value = (*it).mid((*it).find('=') + 1);
-	  valids[key] = value;
+		TQMap<TQString,TQString> valids;
+
+		for (TQStringList::ConstIterator it = options.begin(); it != options.end(); ++it)
+		{
+			int pos = (*it).find('=');
+			TQString key = (*it).left(pos);
+			TQString value = (*it).mid(pos + 1);
+			valids[key] = value;
+		}
+		return valids;
 	}
-      return valids;
-    }
 }
 
 #endif
diff --git a/tdeioslave/media/libmediacommon/notifieraction.cpp b/tdeioslave/media/libmediacommon/notifieraction.cpp
index 5222b9e65..8eaafcd81 100644
--- a/tdeioslave/media/libmediacommon/notifieraction.cpp
+++ b/tdeioslave/media/libmediacommon/notifieraction.cpp
@@ -57,8 +57,7 @@ TQPixmap NotifierAction::pixmap() const
 	}
 	else
 	{
-		TQString path = TDEGlobal::iconLoader()->iconPath( m_iconName, -32 );
-		return TQPixmap( path );
+	  return TDEGlobal::iconLoader()->loadIcon(m_iconName, TDEIcon::NoGroup, TDEIcon::SizeSmall);
 	}
 }
 
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
index b92757f90..510437072 100644
--- a/tdeioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -127,7 +127,6 @@ bool MediaImpl::statMediumByLabel(const TQString &label, TDEIO::UDSEntry &entry)
 	return statMedium(name, entry);
 }
 
-
 bool MediaImpl::listMedia(TQValueList<TDEIO::UDSEntry> &list)
 {
 	kdDebug(1219) << "MediaImpl::listMedia" << endl;
@@ -149,7 +148,7 @@ bool MediaImpl::listMedia(TQValueList<TDEIO::UDSEntry> &list)
 	Medium::MList::const_iterator it = media.begin();
 	Medium::MList::const_iterator end = media.end();
 
-	for(; it!=end; ++it)
+	for(; it != end; ++it)
 	{
 		if (!(*it).hidden()) {
 			entry.clear();
@@ -231,15 +230,6 @@ bool MediaImpl::ensureMediumMounted(Medium &medium)
 		return false;
 	}
 
-#ifdef COMPILE_HALBACKEND
-	if ( medium.isEncrypted() && medium.clearDeviceUdi().isEmpty() )
-	{
-		m_lastErrorCode = TDEIO::ERR_COULD_NOT_MOUNT;
-		m_lastErrorMessage = i18n("The drive is encrypted.");
-		return false;
-	}
-#endif // COMPILE_HALBACKEND
-
 	if ( medium.needMounting() )
 	{
 		m_lastErrorCode = 0;
@@ -252,10 +242,10 @@ 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()
 		->connectDCOPSignal("kded", "mediamanager",
@@ -366,14 +356,19 @@ void MediaImpl::slotStatResult(TDEIO::Job *job)
 
 TDEIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url)
 {
+	if (url.isEmpty())
+	{
+		return TDEIO::UDSEntry();
+	}
+
 	m_entryBuffer.clear();
 
 	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();
@@ -449,7 +444,7 @@ void MediaImpl::createMediumEntry(TDEIO::UDSEntry& entry,
 	else
 	{
 		KURL url = medium.prettyBaseURL();
-		entry+= extractUrlInfos(url);
+		entry += extractUrlInfos(url);
 	}
 }
 
diff --git a/tdeioslave/media/mediaimpl.h b/tdeioslave/media/mediaimpl.h
index 1080d6783..a7416f0e5 100644
--- a/tdeioslave/media/mediaimpl.h
+++ b/tdeioslave/media/mediaimpl.h
@@ -32,7 +32,7 @@
 
 class MediaImpl : public TQObject, public DCOPObject
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 public:
 	MediaImpl();
diff --git a/tdeioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt
index fd0c0f09b..b052bff87 100644
--- a/tdeioslave/media/mediamanager/CMakeLists.txt
+++ b/tdeioslave/media/mediamanager/CMakeLists.txt
@@ -16,13 +16,10 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${HAL_INCLUDE_DIRS}
-  ${DBUS_TQT_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
@@ -45,11 +42,6 @@ tde_create_translated_desktop(
 
 set( target kded_mediamanager )
 
-if( WITH_HAL )
-  set( HAL_MEDIA_BACKEND halbackend.cpp linuxcdpolling.cpp )
-  set( HAL_MEDIA_LIBRARIES ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} )
-endif( )
-
 if( WITH_TDEHWLIB )
   set( TDEHWBACKEND tdehardwarebackend.cpp )
 endif( WITH_TDEHWLIB )
@@ -60,7 +52,7 @@ tde_add_kpart( ${target} AUTOMOC
     backendbase.cpp fstabbackend.cpp removablebackend.cpp
     unlockdialog.ui dialog.cpp
     mediadirnotify.cpp mediadirnotify.skel
-    ${HAL_MEDIA_BACKEND} ${TDEHWBACKEND}
-  LINK mediacommon-static tdeinit_kded-shared ${HAL_MEDIA_LIBRARIES}
+    ${TDEHWBACKEND}
+  LINK mediacommon-static tdeinit_kded-shared ${TDEHW_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/media/mediamanager/Makefile.am b/tdeioslave/media/mediamanager/Makefile.am
index 489226e8e..87a20cb89 100644
--- a/tdeioslave/media/mediamanager/Makefile.am
+++ b/tdeioslave/media/mediamanager/Makefile.am
@@ -1,18 +1,7 @@
 kde_module_LTLIBRARIES = kded_mediamanager.la
 
-if include_media_halbackend
-HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSTQT_INCS)
-endif
-
 METASOURCES = AUTO
-INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(HALBACKEND_INCS) $(all_includes)
-
-if include_media_halbackend
-HALBACKEND_LIB = libhalbackend.la
-libhalbackend_la_SOURCES = halbackend.cpp
-libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
-libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSTQT_LIBS)
-endif
+INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes)
 
 if include_media_linuxcdpolling
 LINUXCDPOLLING_LIB = liblinuxcdpolling.la
@@ -20,11 +9,11 @@ liblinuxcdpolling_la_SOURCES = linuxcdpolling.cpp
 liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
 endif
 
-noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
+noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB)
 
 kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
 kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_mediamanager_la_LIBADD = $(LIB_TDESYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB)
+kded_mediamanager_la_LIBADD = $(LIB_TDESYCOCA) ../libmediacommon/libmediacommon.la $(LINUXCDPOLLING_LIB)
 
 
 servicesdir = $(kde_servicesdir)/kded
diff --git a/tdeioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp
index 5f655ccce..ddfd041a0 100644
--- a/tdeioslave/media/mediamanager/dialog.cpp
+++ b/tdeioslave/media/mediamanager/dialog.cpp
@@ -23,7 +23,7 @@
 #include "dialog.h"
 
 Dialog::Dialog(TQString url, TQString iconName) :
-	KDialogBase(NULL, "Unlock", true, "Unlock Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
+	KDialogBase(NULL, "Unlock", true, i18n("Unlock Storage Device"), (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
 {
 	unlockDialog = new UnlockDialog(this);
 
@@ -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/dialog.h b/tdeioslave/media/mediamanager/dialog.h
index 8444ec7dd..1e3dd145c 100644
--- a/tdeioslave/media/mediamanager/dialog.h
+++ b/tdeioslave/media/mediamanager/dialog.h
@@ -41,7 +41,7 @@ class KryptoMedia;
 class Dialog : public KDialogBase
 {
 
-Q_OBJECT	
+TQ_OBJECT	
 
 public:
 	Dialog(TQString url, TQString iconName);
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 8eca21771..2bd528c19 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -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
 }
@@ -160,7 +160,6 @@ bool inExclusionPattern(KMountPoint *mount, bool networkSharesOnly)
 	  || mount->mountPoint().find("/sys") == 0
 
 	  // We might want to display only network shares
-	  // since HAL doesn't handle them
 	  || ( networkSharesOnly
 	    && mount->mountType().find( "smb" ) == -1
 	    && mount->mountType().find( "cifs" ) == -1
@@ -220,7 +219,11 @@ void FstabBackend::handleMtabChange(bool allowNotification)
 
 			Medium *m = new Medium(id, name);
 
-			m->mountableState(dev, mp, fs, true);
+			m->setMountable(true);
+			m->setDeviceNode(dev);
+			m->setMountPoint(mp);
+			m->setFsType(fs);
+			m->setMounted(true);
 
 			TQString mime, icon, label;
 			guess(dev, mp, fs, true, mime, icon, label);
@@ -293,7 +296,11 @@ void FstabBackend::handleFstabChange(bool allowNotification)
 
 			Medium *m = new Medium(id, id, name);
 
-			m->mountableState(dev, mp, fs, false);
+			m->setMountable(true);
+			m->setDeviceNode(dev);
+			m->setMountPoint(mp);
+			m->setFsType(fs);
+			m->setMounted(false);
 
 			TQString mime, icon, label;
 			guess(dev, mp, fs, false, mime, icon, label);
diff --git a/tdeioslave/media/mediamanager/fstabbackend.h b/tdeioslave/media/mediamanager/fstabbackend.h
index 0aed11333..0f4b3b85e 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.h
+++ b/tdeioslave/media/mediamanager/fstabbackend.h
@@ -31,7 +31,7 @@
 
 class FstabBackend : public TQObject, public BackendBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	FstabBackend(MediaList &list, bool networkSharesOnly = false);
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
deleted file mode 100644
index 157f89212..000000000
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ /dev/null
@@ -1,1961 +0,0 @@
-/* This file is part of the KDE Project
-   Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
-   Copyright (c) 2006 Valentine Sinitsyn <e_val@inbox.ru>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   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 "halbackend.h"
-#include "linuxcdpolling.h"
-
-#include <stdlib.h>
-#include <locale.h>
-
-#include <tdeapplication.h>
-#include <tdemessagebox.h>
-#include <tqeventloop.h>
-#include <tqfile.h>
-#include <tdelocale.h>
-#include <kurl.h>
-#include <kdebug.h>
-#include <kprocess.h>
-#include <tdeconfig.h>
-#include <tqstylesheet.h>
-#include <kmountpoint.h>
-#include <tdemessagebox.h>
-#include <tdeio/job.h>
-#include <kprotocolinfo.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
-
-#define MOUNT_MEDIA_SUFFIX (medium->isEncrypted() ? \
-	    (TQString("_encrypted") + (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "_unlocked" : "_locked")) : \
-      (medium->isMounted() ? TQString("_mounted") : TQString("_unmounted")))
-
-#define MOUNTED_ICON_SUFFIX (medium->isEncrypted() ? \
-	    (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "-unlocked" : "-locked") : \
-      (medium->isMounted() ? TQString("-mounted") : TQString("-unmounted")))
-
-/* Static instance of this class, for static HAL callbacks */
-static HALBackend* s_HALBackend;
-
-/* A macro function to convert HAL string properties to TQString */
-TQString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key)
-{
-    char*   _ppt_string;
-    TQString _ppt_QString;
-    _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL);
-    if ( _ppt_string )
-        _ppt_QString = _ppt_string;
-    libhal_free_string(_ppt_string);
-    return _ppt_QString;
-}
-
-/* Constructor */
-HALBackend::HALBackend(MediaList &list, TQObject* parent)
-    : TQObject()
-    , BackendBase(list)
-    , m_halContext(NULL)
-    , m_halStoragePolicy(NULL)
-    , m_parent(parent)
-{
-    s_HALBackend = this;
-}
-
-/* Destructor */
-HALBackend::~HALBackend()
-{
-    /* Close HAL connection */
-    if (m_halContext)
-    {
-        const TQPtrList<Medium> medlist = m_mediaList.list();
-        TQPtrListIterator<Medium> it (medlist);
-        for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
-        {
-            if( !current_medium->id().startsWith( "/org/kde" ))
-                unmount(current_medium->id());
-        }
-
-
-        /* Remove all the registered media first */
-        int numDevices;
-        char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL );
-
-        if ( halDeviceList )
-        {
-            for ( int i = 0; i < numDevices; i++ )
-            {
-                m_mediaList.removeMedium( halDeviceList[i], false );
-            }
-        }
-
-        libhal_free_string_array( halDeviceList );
-
-        DBusError error;
-        dbus_error_init(&error);
-        libhal_ctx_shutdown(m_halContext, &error);
-        libhal_ctx_free(m_halContext);
-    }
-
-    if (m_halStoragePolicy)
-        libhal_storage_policy_free(m_halStoragePolicy);
-}
-
-/* Connect to the HAL */
-bool HALBackend::InitHal()
-{
-    kdDebug(1219) << "Context new" << endl;
-    m_halContext = libhal_ctx_new();
-    if (!m_halContext)
-    {
-        kdDebug(1219) << "Failed to initialize HAL!" << endl;
-        return false;
-    }
-
-    // Main loop integration
-    kdDebug(1219) << "Main loop integration" << endl;
-    DBusError error;
-    dbus_error_init(&error);
-    dbus_connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
-
-    if (!dbus_connection || dbus_error_is_set(&error)) {
-        dbus_error_free(&error);
-        libhal_ctx_free(m_halContext);
-        m_halContext = NULL;
-        return false;
-    }
-
-    dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
-
-    MainLoopIntegration(dbus_connection);
-    libhal_ctx_set_dbus_connection(m_halContext, dbus_connection);
-
-    // HAL callback functions
-    kdDebug(1219) << "Callback functions" << endl;
-    libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added);
-    libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed);
-    libhal_ctx_set_device_new_capability (m_halContext, NULL);
-    libhal_ctx_set_device_lost_capability (m_halContext, NULL);
-    libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified);
-    libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition);
-
-    kdDebug(1219) << "Context Init" << endl;
-    if (!libhal_ctx_init(m_halContext, &error))
-    {
-        if (dbus_error_is_set(&error))
-            dbus_error_free(&error);
-        libhal_ctx_free(m_halContext);
-        m_halContext = NULL;
-        kdDebug(1219) << "Failed to init HAL context!" << endl;
-        return false;
-    }
-
-    /** @todo customize watch policy */
-    kdDebug(1219) << "Watch properties" << endl;
-    if (!libhal_device_property_watch_all(m_halContext, &error))
-    {
-        kdDebug(1219) << "Failed to watch HAL properties!" << endl;
-        return false;
-    }
-
-    /* libhal-storage initialization */
-    kdDebug(1219) << "Storage Policy" << endl;
-    m_halStoragePolicy = libhal_storage_policy_new();
-    /** @todo define libhal-storage icon policy */
-
-    /* List devices at startup */
-    return ListDevices();
-}
-
-/* List devices (at startup)*/
-bool HALBackend::ListDevices()
-{
-    kdDebug(1219) << "ListDevices" << endl;
-
-    int numDevices;
-    char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL);
-
-    if (!halDeviceList)
-        return false;
-
-    kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl;
-    for (int i = 0; i < numDevices; i++)
-        AddDevice(halDeviceList[i], false);
-
-    libhal_free_string_array( halDeviceList );
-
-    return true;
-}
-
-/* Create a media instance for the HAL device "udi".
-   This functions checks whether the device is worth listing */
-void HALBackend::AddDevice(const char *udi, bool allowNotification)
-{
-    /* We don't deal with devices that do not expose their capabilities.
-       If we don't check this, we will get a lot of warning messages from libhal */
-    if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL))
-        return;
-
-    /* If the device is already listed, do not process.
-       This should not happen, but who knows... */
-    /** @todo : refresh properties instead ? */
-    if (m_mediaList.findById(udi))
-        return;
-
-    if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL))
-        allowNotification=false;
-
-    /* Add volume block devices */
-    if (libhal_device_query_capability(m_halContext, udi, "volume", NULL))
-    {
-        /* We only list volumes that...
-         *  - are encrypted with LUKS or
-         *  - have a filesystem or
-         *  - have an audio track
-         */
-        if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "crypto" ||
-               libhal_device_get_property_QString(m_halContext, udi, "volume.fstype") != "crypto_LUKS"
-             ) &&
-             libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" &&
-             !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) &&
-             !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) )
-            return;
-
-        /* Query drive udi */
-        TQString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
-        if ( driveUdi.isNull() ) // no storage - no fun
-            return;
-
-        // if the device is locked do not act upon it
-        if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL))
-            allowNotification=false;
-
-        // if the device is locked do not act upon it
-        if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL))
-            allowNotification=false;
-
-        /** @todo check exclusion list **/
-
-        /* Special handling for clear crypto volumes */
-        LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi);
-        if (!halVolume)
-            return;
-        const char* backingVolumeUdi = libhal_volume_crypto_get_backing_volume_udi(halVolume);
-        if ( backingVolumeUdi != NULL )
-        {
-            /* The crypto drive was unlocked and may now be mounted... */
-            kdDebug(1219) << "HALBackend::AddDevice : ClearVolume appeared for " << backingVolumeUdi << endl;
-            ResetProperties(backingVolumeUdi, allowNotification);
-            libhal_volume_free(halVolume);
-            return;
-        }
-        libhal_volume_free(halVolume);
-
-        /* Create medium */
-        Medium* medium = new Medium(udi, udi, "");
-        setVolumeProperties(medium);
-
-        if ( isInFstab( medium ).isNull() )
-        {
-            // if it's not mountable by user and not by HAL, don't show it at all
-            if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
-                   !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
-                 ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
-            {
-                delete medium;
-                return;
-            }
-        }
-        
-	// instert medium into list
-	m_mediaList.addMedium(medium, allowNotification);
-
-	// finally check for automount
-        TQMap<TQString,TQString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
-        kdDebug() << "automount " << options["automount"] << endl;
-        if (options["automount"] == "true" && allowNotification ) {
-            TQString error = mount(medium);
-            if (!error.isEmpty())
-                kdDebug() << "error " << error << endl;
-        }
-
-        return;
-    }
-
-    /* Floppy & zip drives */
-    if (libhal_device_query_capability(m_halContext, udi, "storage", NULL))
-        if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") ||
-            (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") ||
-            (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz"))
-        {
-            if (! libhal_device_get_property_bool(m_halContext, udi, "storage.removable.media_available", NULL) )
-                allowNotification = false;
-            /* Create medium */
-            Medium* medium = new Medium(udi, udi, "");
-            // if the storage has a volume, we ignore it
-            if ( setFloppyProperties(medium) )
-                m_mediaList.addMedium(medium, allowNotification);
-            else
-                delete medium;
-            return;
-        }
-
-    /* Camera handled by gphoto2*/
-    if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) &&
-        ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") ||
-
-         (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) &&
-          libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL)))
-        )
-    {
-        /* Create medium */
-        Medium* medium = new Medium(udi, udi, "");
-        setCameraProperties(medium);
-        m_mediaList.addMedium(medium, allowNotification);
-        return;
-    }
-}
-
-void HALBackend::RemoveDevice(const char *udi)
-{
-    const Medium *medium = m_mediaList.findByClearUdi(udi);
-    if (medium) {
-        ResetProperties(medium->id().ascii());
-    } else {
-        m_mediaList.removeMedium(udi, true);
-    }
-}
-
-void HALBackend::ModifyDevice(const char *udi, const char* key)
-{
-    kdDebug(1219) << "HALBackend::ModifyDevice for '" << udi << "' on '" << key << "'\n";
-
-    const char* mediumUdi = findMediumUdiFromUdi(udi);
-    if (!mediumUdi)
-        return;
-    bool allowNotification = false;
-    if (strcmp(key, "storage.removable.media_available") == 0)
-        allowNotification = libhal_device_get_property_bool(m_halContext, udi, key, NULL);
-    ResetProperties(mediumUdi, allowNotification);
-}
-
-void HALBackend::DeviceCondition(const char* udi, const char* condition)
-{
-    TQString conditionName = TQString(condition);
-    kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl;
-
-    if (conditionName == "EjectPressed") {
-        const Medium* medium = m_mediaList.findById(udi);
-        if (!medium) {
-	    /* the ejectpressed appears on the drive and we need to find the volume */
-	    const TQPtrList<Medium> medlist = m_mediaList.list();
-	    TQPtrListIterator<Medium> it (medlist);
-	    for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
-            {
-                if( current_medium->id().startsWith( "/org/kde" ))
-                    continue;
-		TQString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device");
-		if (driveUdi == udi)
-                {
-		    medium = current_medium;
-		    break;
-                }
-            }
-        }
-        if (medium) {
-	    TDEProcess p;
-	    p << "tdeio_media_mounthelper" << "-e" << medium->name();
-	    p.start(TDEProcess::DontCare);
-        }
-    }
-
-    const char* mediumUdi = findMediumUdiFromUdi(udi);
-    kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl;
-    if (!mediumUdi)
-        return;
-
-    /* TODO: Warn the user that (s)he should unmount devices before unplugging */
-    if (conditionName == "VolumeUnmountForced")
-        ResetProperties(mediumUdi);
-
-    /* Reset properties after mounting */
-    if (conditionName == "VolumeMount")
-        ResetProperties(mediumUdi);
-
-    /* Reset properties after unmounting */
-    if (conditionName == "VolumeUnmount")
-        ResetProperties(mediumUdi);
-
-}
-
-void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection)
-{
-    m_dBusQtConnection = new DBusQt::Connection(m_parent);
-    m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection);
-}
-
-/******************************************
- ** Properties attribution                **
- ******************************************/
-
-/* Return the medium udi that should be updated when recieving a call for
-   device udi */
-const char* HALBackend::findMediumUdiFromUdi(const char* udi)
-{
-    /* Easy part : this Udi is already registered as a device */
-    const Medium* medium = m_mediaList.findById(udi);
-    if (medium)
-        return medium->id().ascii();
-
-    /* Hard part : this is a volume whose drive is registered */
-    if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL))
-        if (libhal_device_query_capability(m_halContext, udi, "volume", NULL))
-        {
-            /* check if this belongs to an encrypted volume */
-            LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi);
-            if (!halVolume) return NULL;
-            const char* backingUdi = libhal_volume_crypto_get_backing_volume_udi(halVolume);
-            if (backingUdi != NULL) {
-                const char* result = findMediumUdiFromUdi(backingUdi);
-                libhal_volume_free(halVolume);
-                return result;
-            }
-            libhal_volume_free(halVolume);
-
-            /* this is a volume whose drive is registered */
-            TQString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
-            return findMediumUdiFromUdi(driveUdi.ascii());
-        }
-
-    return NULL;
-}
-
-void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification)
-{
-    kdDebug(1219) << "HALBackend::setProperties" << endl;
-    if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
-    {
-        const Medium *cmedium = m_mediaList.findById(mediumUdi);
-        if ( cmedium )
-        {
-            Medium m( *cmedium );
-            if ( setFstabProperties( &m ) ) {
-                kdDebug() << "setFstabProperties worked" << endl;
-                m_mediaList.changeMediumState(m, allowNotification);
-            }
-            return;
-       }
-    }
-
-    Medium* m = new Medium(mediumUdi, mediumUdi, "");
-
-    if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL))
-        setVolumeProperties(m);
-    if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL))
-        setFloppyProperties(m);
-    if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL))
-        setCameraProperties(m);
-
-    m_mediaList.changeMediumState(*m, allowNotification);
-
-    delete m;
-}
-
-void HALBackend::setVolumeProperties(Medium* medium)
-{
-    kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl;
-
-    const char* udi = medium->id().ascii();
-    /* Check if the device still exists */
-    if (!libhal_device_exists(m_halContext, udi, NULL))
-        return;
-
-    /* Get device information from libhal-storage */
-    LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi);
-    if (!halVolume)
-        return;
-    TQString driveUdi = libhal_volume_get_storage_device_udi(halVolume);
-    LibHalDrive*  halDrive  = 0;
-    if ( !driveUdi.isNull() )
-        halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii());
-    if (!halDrive) {
-        // at times HAL sends an UnmountForced event before the device is removed
-        libhal_volume_free(halVolume);
-        return;
-    }
-
-    medium->setName(
-        generateName(libhal_volume_get_device_file(halVolume)) );
-
-    LibHalVolume* halClearVolume = NULL;
-    if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "crypto" )
-    {
-        kdDebug(1219) << "HALBackend::setVolumeProperties : crypto volume" << endl;
-
-        medium->setEncrypted(true);
-        char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
-	TQString clearUdiString;
-        if (clearUdi != NULL) {
-            kdDebug(1219) << "HALBackend::setVolumeProperties : crypto clear volume avail - " << clearUdi << endl;
-            halClearVolume = libhal_volume_from_udi(m_halContext, clearUdi);
-            // ignore if halClearVolume is NULL -> just not unlocked in this case
-	    clearUdiString = clearUdi;
-	    libhal_free_string(clearUdi);
-        }
-
-        if (halClearVolume)
-            medium->mountableState(
-                libhal_volume_get_device_file(halVolume),		/* Device node */
-                clearUdiString,
-                libhal_volume_get_mount_point(halClearVolume),		/* Mount point */
-                libhal_volume_get_fstype(halClearVolume),		/* Filesystem type */
-                libhal_volume_is_mounted(halClearVolume) );		/* Mounted ? */
-        else
-            medium->mountableState(
-                libhal_volume_get_device_file(halVolume),		/* Device node */
-                TQString::null,
-                TQString::null,		/* Mount point */
-                TQString::null,		/* Filesystem type */
-                false );		/* Mounted ? */
-    }
-    else
-    {
-        kdDebug(1219) << "HALBackend::setVolumeProperties : normal volume" << endl;
-        medium->mountableState(
-            libhal_volume_get_device_file(halVolume),		/* Device node */
-            TQString::fromUtf8(libhal_volume_get_mount_point(halVolume)),	/* Mount point */
-            libhal_volume_get_fstype(halVolume),		/* Filesystem type */
-            libhal_volume_is_mounted(halVolume) );		/* Mounted ? */
-    }
-
-
-    char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
-    TQString volume_name = TQString::fromUtf8(name);
-    TQString media_name = volume_name;
-    /* media_name contains something like "501M Removable Media" or "Blank CD-R"
-       The former needs special handling for correct translation
-    */
-    if (media_name.find(TQRegExp("^[0-9]+\\.?[0-9]*[KMGT] (Removable )?Media$")) > -1) {
-        TQString pattern = media_name.section(" ", 1);
-        media_name.replace(pattern, i18n(pattern.utf8()));
-        medium->setLabel(media_name);
-    } else {
-        medium->setLabel(i18n(media_name.utf8()));
-    }
-
-    free(name);
-
-    TQString mimeType;
-    if (libhal_volume_is_disc(halVolume))
-    {
-        mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
-
-        LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume);
-        if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) ||
-            (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) ||
-            (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW))
-        {
-            if (libhal_volume_disc_is_blank(halVolume))
-            {
-                mimeType = "media/blankcd";
-                medium->unmountableState("");
-            }
-            else
-            {
-                mimeType = "media/cdwriter" + MOUNT_MEDIA_SUFFIX;
-            }
-        }
-        else if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) ||
-            (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) ||
-            (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) )
-        {
-            if (libhal_volume_disc_is_blank(halVolume))
-            {
-                mimeType = "media/blankdvd";
-                medium->unmountableState("");
-            }
-            else
-            {
-                mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
-            }
-        }
-        else if ((discType == LIBHAL_VOLUME_DISC_TYPE_BDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_BDR) ||
-            (discType == LIBHAL_VOLUME_DISC_TYPE_BDRE) || (discType == LIBHAL_VOLUME_DISC_TYPE_HDDVDROM) ||
-            (discType == LIBHAL_VOLUME_DISC_TYPE_HDDVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_HDDVDRW) )
-        {
-            if (libhal_volume_disc_is_blank(halVolume))
-            {
-                mimeType = "media/blankbluray";
-                medium->unmountableState("");
-            }
-            else
-            {
-                mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
-            }
-        }
-
-        if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume))
-        {
-            mimeType = "media/audiocd";
-            medium->unmountableState( "audiocd:/?device=" + TQString(libhal_volume_get_device_file(halVolume)) );
-        }
-
-        medium->setIconName(TQString::null);
-
-        /* check if the disc id a vcd or a video dvd */
-        if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL))
-        {
-            mimeType = "media/vcd";
-        }
-        else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL))
-        {
-            mimeType = "media/svcd";
-        }
-        else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL))
-        {
-            mimeType = "media/dvdvideo";
-        }
-
-    }
-    else
-    {
-        mimeType = "media/hdd" + MOUNT_MEDIA_SUFFIX;
-        medium->setIconName(TQString::null); // reset icon
-        if (libhal_drive_is_hotpluggable(halDrive))
-        {
-            mimeType = "media/removable" + MOUNT_MEDIA_SUFFIX;
-            medium->needMounting();
-            switch (libhal_drive_get_type(halDrive)) {
-            case LIBHAL_DRIVE_TYPE_COMPACT_FLASH:
-                medium->setIconName("media-flash-compact_flash" + MOUNTED_ICON_SUFFIX);
-                break;
-            case LIBHAL_DRIVE_TYPE_MEMORY_STICK:
-                medium->setIconName("media-flash-memory_stick" + MOUNTED_ICON_SUFFIX);
-                break;
-            case LIBHAL_DRIVE_TYPE_SMART_MEDIA:
-                medium->setIconName("media-flash-smart_media" + MOUNTED_ICON_SUFFIX);
-                break;
-            case LIBHAL_DRIVE_TYPE_SD_MMC:
-                medium->setIconName("media-flash-sd_mmc" + MOUNTED_ICON_SUFFIX);
-                break;
-            case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
-            {
-                medium->setIconName("ipod" + MOUNTED_ICON_SUFFIX);
-
-                if (libhal_device_get_property_QString(m_halContext, driveUdi.latin1(), "info.product") == "iPod" &&
-		         KProtocolInfo::isKnownProtocol( TQString("ipod") ) )
-                {
-                    medium->unmountableState( "ipod:/" );
-                    medium->mountableState(  libhal_volume_is_mounted(halVolume) );
-                }
-                break;
-            }
-            case LIBHAL_DRIVE_TYPE_CAMERA:
-            {
-                mimeType = "media/camera" + MOUNT_MEDIA_SUFFIX;
-                const char *physdev = libhal_drive_get_physical_device_udi(halDrive);
-                // get model from camera
-                if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL))
-                {
-                    if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL))
-                        medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product"));
-                    else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL))
-                        medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product"));
-                }
-                break;
-            }
-            case LIBHAL_DRIVE_TYPE_TAPE:
-                medium->setIconName("media-tape" + MOUNTED_ICON_SUFFIX);
-                break;
-            default:
-                medium->setIconName(TQString::null);
-            }
-
-            if (medium->isMounted() && TQFile::exists(medium->mountPoint() + "/dcim"))
-            {
-                mimeType = "media/camera" + MOUNT_MEDIA_SUFFIX;
-            }
-        }
-    }
-    medium->setMimeType(mimeType);
-
-    libhal_drive_free(halDrive);
-    libhal_volume_free(halVolume);
-}
-
-bool HALBackend::setFstabProperties( Medium *medium )
-{
-    TQString mp = isInFstab(medium);
-
-    if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) )
-    {
-        // now that we know it's in fstab, we have to find out if it's mounted
-        KMountPoint::List mtab = KMountPoint::currentMountPoints();
-
-        KMountPoint::List::iterator it = mtab.begin();
-        KMountPoint::List::iterator end = mtab.end();
-
-        bool mounted = false;
-
-        for (; it!=end; ++it)
-        {
-            if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp )
-            {
-                mounted = true;
-                break;
-            }
-        }
-
-        kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " <<  endl;
-        TQString fstype = medium->fsType();
-        if ( fstype.isNull() )
-            fstype = "auto";
-
-        medium->mountableState(
-            medium->deviceNode(),
-            mp,							/* Mount point */
-            fstype,						/* Filesystem type */
-            mounted );						/* Mounted ? */
-
-        return true;
-    }
-
-    return false;
-
-}
-
-// Handle floppies and zip drives
-bool HALBackend::setFloppyProperties(Medium* medium)
-{
-    kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl;
-
-    const char* udi = medium->id().ascii();
-    /* Check if the device still exists */
-    if (!libhal_device_exists(m_halContext, udi, NULL))
-        return false;
-
-    LibHalDrive*  halDrive  = libhal_drive_from_udi(m_halContext, udi);
-    if (!halDrive)
-        return false;
-
-    TQString drive_type = libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type");
-
-    if (drive_type == "zip") {
-        int numVolumes;
-        char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes);
-        libhal_free_string_array(volumes);
-        kdDebug(1219) << " found " << numVolumes << " volumes" << endl;
-        if (numVolumes)
-        {
-            libhal_drive_free(halDrive);
-            return false;
-        }
-    }
-
-    medium->setName( generateName(libhal_drive_get_device_file(halDrive)) );
-    medium->setLabel(i18n("Unknown Drive"));
-
-    // HAL hates floppies - so we have to do it twice ;(
-    medium->mountableState(libhal_drive_get_device_file(halDrive), TQString::null, TQString::null, false);
-    setFloppyMountState(medium);
-
-    if (drive_type == "floppy")
-    {
-        if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume
-            medium->setMimeType("media/floppy_mounted" );
-        else
-            medium->setMimeType("media/floppy_unmounted");
-        medium->setLabel(i18n("Floppy Drive"));
-    }
-    else if (drive_type == "zip") 
-    {
-        if (medium->isMounted())
-            medium->setMimeType("media/zip_mounted" );
-        else
-            medium->setMimeType("media/zip_unmounted");
-        medium->setLabel(i18n("Zip Drive"));
-    }
-
-    /** @todo And mimtype for JAZ drives ? */
-
-    medium->setIconName(TQString::null);
-
-    libhal_drive_free(halDrive);
-
-    return true;
-}
-
-void HALBackend::setFloppyMountState( Medium *medium )
-{
-    if ( !medium->id().startsWith( "/org/kde" ) )
-    {
-        KMountPoint::List mtab = KMountPoint::currentMountPoints();
-        KMountPoint::List::iterator it = mtab.begin();
-        KMountPoint::List::iterator end = mtab.end();
-
-        TQString fstype;
-        TQString mountpoint;
-        for (; it!=end; ++it)
-        {
-            if ((*it)->mountedFrom() == medium->deviceNode() )
-            {
-                fstype = (*it)->mountType().isNull() ? (*it)->mountType() : "auto";
-                mountpoint = (*it)->mountPoint();
-                medium->mountableState( medium->deviceNode(), mountpoint, fstype, true );
-                return;
-            }
-        }
-    }
-}
-
-void HALBackend::setCameraProperties(Medium* medium)
-{
-    kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl;
-
-    const char* udi = medium->id().ascii();
-    /* Check if the device still exists */
-    if (!libhal_device_exists(m_halContext, udi, NULL))
-        return;
-
-    /** @todo find name */
-    medium->setName("camera");
-
-    TQString device = "camera:/";
-
-    char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL);
-    DBusError error;
-    dbus_error_init(&error);
-    if (cam &&
-        libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) &&
-        libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL))
-        device.sprintf("camera://%s@[usb:%03d,%03d]/", cam,
-                       libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error),
-                       libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error));
-
-    libhal_free_string(cam);
-
-    /** @todo find the rest of this URL */
-    medium->unmountableState(device);
-    medium->setMimeType("media/gphoto2camera");
-    medium->setIconName(TQString::null);
-    if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL))
-        medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product"));
-    else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL))
-        medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product"));
-    else
-        medium->setLabel(i18n("Camera"));
-}
-
-TQString HALBackend::generateName(const TQString &devNode)
-{
-    return KURL(devNode).fileName();
-}
-
-/******************************************
- ** HAL CALL-BACKS                        **
- ******************************************/
-
-void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi)
-{
-    kdDebug(1219) << "HALBackend::hal_device_added " << udi <<  endl;
-    Q_UNUSED(ctx);
-    s_HALBackend->AddDevice(udi);
-}
-
-void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi)
-{
-    kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl;
-    Q_UNUSED(ctx);
-    s_HALBackend->RemoveDevice(udi);
-}
-
-void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi,
-                                              const char *key, dbus_bool_t is_removed, dbus_bool_t is_added)
-{
-    kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl;
-    Q_UNUSED(ctx);
-    Q_UNUSED(is_removed);
-    Q_UNUSED(is_added);
-    s_HALBackend->ModifyDevice(udi, key);
-}
-
-void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi,
-                                      const char *condition_name,
-                                      const char* message
-    )
-{
-    kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl;
-    Q_UNUSED(ctx);
-    Q_UNUSED(message);
-    s_HALBackend->DeviceCondition(udi, condition_name);
-}
-
-TQStringList HALBackend::getHALmountoptions(TQString udi)
-{
-    const char*   _ppt_string;
-    LibHalVolume* volume;
-    LibHalDrive* drive;
-
-    TQString _ppt_TQString;
-
-    volume = libhal_volume_from_udi( m_halContext, udi.latin1() );
-    if( volume )
-        drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) );
-    else
-        drive = libhal_drive_from_udi( m_halContext, udi.latin1() );
-
-    if( !drive )
-           return TQString::null;
-
-    if( volume )
-       _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL );
-    else
-       _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL );
-
-    _ppt_TQString = TQString(_ppt_string ? _ppt_string : "");
-
-   return TQStringList::split(",",_ppt_TQString);
-}
-
-TQStringList HALBackend::mountoptions(const TQString &name)
-{
-    const Medium* medium = m_mediaList.findById(name);
-    if (!medium)
-    	return TQStringList(); // we don't know about that one
-    if (!isInFstab(medium).isNull())
-        return TQStringList(); // not handled by HAL - fstab entry
-
-    TQString volume_udi = name;
-    if (medium->isEncrypted()) {
-        // see if we have a clear volume
-        LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, medium->id().latin1());
-        if (halVolume) {
-            char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
-            if (clearUdi != NULL) {
-	        volume_udi = clearUdi;
-		libhal_free_string(clearUdi);
-	    } else {
-	        // if not unlocked yet then no mountoptions
-		return TQStringList();
-	    }
-            libhal_volume_free(halVolume);
-        } else {
-	    // strange...
-	    return TQStringList();
-	}
-    }
-
-    TDEConfig config("mediamanagerrc");
-    
-    bool use_defaults = true;    
-    if (config.hasGroup(name)) 
-    {
-	config.setGroup(name);
-	use_defaults = config.readBoolEntry("use_defaults", false);
-    }
-    
-    if (use_defaults)
-	config.setGroup("DefaultOptions");    
-
-    char ** array = libhal_device_get_property_strlist(m_halContext, volume_udi.latin1(), "volume.mount.valid_options", NULL);
-    TQMap<TQString,bool> valids;
-
-    for (int index = 0; array && array[index]; ++index) {
-        TQString t = array[index];
-        if (t.endsWith("="))
-            t = t.left(t.length() - 1);
-        valids[t] = true;
-        kdDebug() << "valid " << t << endl;
-    }
-    libhal_free_string_array(array);
-    TQStringList result;
-    TQString tmp;
-    
-    result << TQString("use_defaults=%1").arg(use_defaults ? "true" : "false");    
-
-    TQString fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.fstype");
-    if (fstype.isNull())
-        fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.policy.mount_filesystem");
-
-    TQString drive_udi = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "block.storage_device");
-
-    bool removable = false;
-    if ( !drive_udi.isNull() )
-        removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL)
-                     || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);
-
-    bool value;
-    if (use_defaults)
-    {
-	value = config.readBoolEntry("automount", false);
-    }
-    else
-    {
-	QString current_group = config.group();
-	config.setGroup(drive_udi);
-	value = config.readBoolEntry("automount", false);
-	config.setGroup(current_group);
-    }
-
-    if (libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_blank", NULL)
-        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_vcd", NULL)
-        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_svcd", NULL)
-        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_videodvd", NULL)
-        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.has_audio", NULL))
-        value = false;
-
-    result << TQString("automount=%1").arg(value ? "true" : "false");
-
-    if (valids.contains("ro"))
-    {
-        value = config.readBoolEntry("ro", false);
-        tmp = TQString("ro=%1").arg(value ? "true" : "false");
-        if (fstype != "iso9660") // makes no sense
-            result << tmp;
-    }
-
-    if (valids.contains("quiet"))
-    {
-        value = config.readBoolEntry("quiet", false);
-        tmp = TQString("quiet=%1").arg(value ? "true" : "false");
-        if (fstype != "iso9660") // makes no sense
-            result << tmp;
-    }
-
-    if (valids.contains("flush"))
-    {
-        value = config.readBoolEntry("flush", fstype.endsWith("fat"));
-        tmp = TQString("flush=%1").arg(value ? "true" : "false");
-        result << tmp;
-    }
-
-    if (valids.contains("uid"))
-    {
-        value = config.readBoolEntry("uid", true);
-        tmp = TQString("uid=%1").arg(value ? "true" : "false");
-        result << tmp;
-    }
-
-    if (valids.contains("utf8"))
-    {
-        value = config.readBoolEntry("utf8", true);
-        tmp = TQString("utf8=%1").arg(value ? "true" : "false");
-        result << tmp;
-    }
-
-    if (valids.contains("shortname"))
-    {
-        TQString svalue = config.readEntry("shortname", "lower").lower();
-        if (svalue == "windows nt")
-            result << "shortname=winnt";
-        else if (svalue == "windows 95")
-            result << "shortname=win95";
-        else if (svalue == "mixed")
-            result << "shortname=mixed";
-        else
-            result << "shortname=lower";
-    }
-
-    // pass our locale to the ntfs-3g driver so it can translate local characters
-    if (valids.contains("locale") && fstype == "ntfs-3g")
-    {
-        // have to obtain LC_CTYPE as returned by the `locale` command
-        // check in the same order as `locale` does
-        char *cType;
-        if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) {
-            result << TQString("locale=%1").arg(cType);
-        }
-    }
-
-    if (valids.contains("sync"))
-    {
-        value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
-        tmp = TQString("sync=%1").arg(value ? "true" : "false");
-        if (fstype != "iso9660") // makes no sense
-            result << tmp;
-    }
-
-    if (valids.contains("noatime"))
-    {
-        value = config.readBoolEntry("atime", !fstype.endsWith("fat"));
-        tmp = TQString("atime=%1").arg(value ? "true" : "false");
-        if (fstype != "iso9660") // makes no sense
-            result << tmp;
-    }
-
-    TQString mount_point = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.mount_point");
-    if (mount_point.isEmpty())
-        mount_point = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.policy.desired_mount_point");
-
-    mount_point = config.readEntry("mountpoint", mount_point);
-
-    if (!mount_point.startsWith("/"))
-        mount_point = "/media/" + mount_point;
-
-    result << TQString("mountpoint=%1").arg(mount_point);
-    result << TQString("filesystem=%1").arg(fstype);
-
-    if (valids.contains("data"))
-    {
-        TQString svalue = config.readEntry("journaling").lower();
-        if (svalue == "ordered")
-            result << "journaling=ordered";
-        else if (svalue == "writeback")
-            result << "journaling=writeback";
-        else if (svalue == "data")
-            result << "journaling=data";
-        else
-            result << "journaling=ordered";
-    }
-
-    return result;
-}
-
-bool HALBackend::setMountoptions(const TQString &name, const TQStringList &options )
-{
-    kdDebug() << "setMountoptions " << name << " " << options << endl;
-
-    TDEConfig config("mediamanagerrc");
-    config.setGroup(name);
-
-    TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);
-
-    const char *names[] = { "use_defaults", "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
-    for (int index = 0; names[index]; ++index)
-        if (valids.contains(names[index]))
-            config.writeEntry(names[index], valids[names[index]] == "true");
-
-    if (valids.contains("shortname"))
-        config.writeEntry("shortname", valids["shortname"]);
-
-    if (valids.contains("journaling"))
-        config.writeEntry("journaling", valids["journaling"]);
-
-    if (!mountoptions(name).contains(TQString("mountpoint=%1").arg(valids["mountpoint"])))
-        config.writeEntry("mountpoint", valids["mountpoint"]);
-
-    if (valids.contains("automount")) {
-        TQString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device");
-        config.setGroup(drive_udi);
-        config.writeEntry("automount", valids["automount"]);
-    }
-
-    return true;
-}
-
-TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command,
-        const TQString& dialogCaption, const TQString& dialogComment)
-{
-    TDEProcess tdesudoProcess;
-
-    tdesudoProcess << tdesudoPath
-		<< "-d"
-		<< "--noignorebutton"
-		<< "--caption" << dialogCaption
-		<< "--comment" << dialogComment
-		<< "-c" << command;
-
-    // @todo handle tdesudo output
-    tdesudoProcess.start(TDEProcess::Block);
-
-    return TQString();
-}
-
-TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command,
-        const TQString& dialogCaption)
-{
-    TDEProcess tdesuProcess;
-
-    tdesuProcess << tdesuPath
-		<< "-d"
-		<< "--noignorebutton"
-		<< "--caption" << dialogCaption
-		<< "-c" << command;
-
-    // @todo handle tdesu output
-    tdesuProcess.start(TDEProcess::Block);
-
-    return TQString();
-}
-
-TQString startPrivilegedProcess(const TQString& command, const TQString& dialogCaption, const TQString& dialogComment)
-{
-    TQString error;
-
-    TQString tdesudoPath = TDEStandardDirs::findExe("tdesudo");
-
-    if (!tdesudoPath.isEmpty())
-        error = startKdeSudoProcess(tdesudoPath, command, dialogCaption, dialogComment);
-    else {
-        TQString tdesuPath = TDEStandardDirs::findExe("tdesu");
-
-        if (!tdesuPath.isEmpty())
-            error = startKdeSuProcess(tdesuPath, command, dialogCaption);
-    }
-
-    return error;
-}
-
-TQString privilegedMount(const char* udi, const char* mountPoint, const char** options, int numberOfOptions)
-{
-    TQString error;
- 
-    kdDebug() << "run privileged mount for " << udi << endl;
-
-    TQString dbusSendPath = TDEStandardDirs::findExe("dbus-send");
-
-    // @todo return error message
-    if (dbusSendPath.isEmpty())
-        return TQString();
-
-    TQString mountOptions;
-    TQTextOStream optionsStream(&mountOptions);
-    for (int optionIndex = 0; optionIndex < numberOfOptions; optionIndex++) {
-        optionsStream << options[optionIndex];
-        if (optionIndex < numberOfOptions - 1)
-            optionsStream << ",";
-    }
-
-    TQString command;
-    TQTextOStream(&command) << dbusSendPath
-            << " --system --print-reply --dest=org.freedesktop.Hal " << udi
-            << " org.freedesktop.Hal.Device.Volume.Mount string:" << mountPoint
-            << " string: array:string:" << mountOptions;
-
-    kdDebug() << "command: " << command << endl;
-
-    error = startPrivilegedProcess(command,
-            i18n("Authenticate"),
-            i18n("<big><b>System policy prevents mounting internal media</b></big><br/>Authentication is required to perform this action. Please enter your password to verify."));
-
-    return error;
-}
-
-TQString privilegedUnmount(const char* udi)
-{
-    TQString error;
- 
-    kdDebug() << "run privileged unmount for " << udi << endl;
-
-    TQString dbusSendPath = TDEStandardDirs::findExe("dbus-send");
-
-    // @todo return error message
-    if (dbusSendPath.isEmpty())
-        return TQString();
-
-    TQString command;
-    TQTextOStream(&command) << dbusSendPath
-            << " --system --print-reply --dest=org.freedesktop.Hal " << udi
-            << " org.freedesktop.Hal.Device.Volume.Unmount array:string:force";
-
-    kdDebug() << "command: " << command << endl;
-
-    error = startPrivilegedProcess(command,
-            i18n("Authenticate"),
-            i18n("<big><b>System policy prevents unmounting media mounted by other users</b></big><br/>Authentication is required to perform this action. Please enter your password to verify."));
-
-    return error;
-}
-
-static TQString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions,
-			  DBusConnection *dbus_connection)
-{
-    DBusMessage *dmesg, *reply;
-    DBusError error;
-
-    const char *fstype = "";
-    if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
-                                                "org.freedesktop.Hal.Device.Volume",
-                                                "Mount"))) {
-        kdDebug() << "mount failed for " << udi << ": could not create dbus message\n";
-        return i18n("Internal Error");
-    }
-
-    if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype,
-                                   DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions,
-                                   DBUS_TYPE_INVALID))
-    {
-        kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n";
-        dbus_message_unref (dmesg);
-        return i18n("Internal Error");
-    }
-
-    TQString qerror;
-
-    dbus_error_init (&error);
-    if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error)))
-    {
-        TQString qerror = error.message;
-        kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl;
-        if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType"))
-            qerror = i18n("Invalid filesystem type");
-        else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied"))
-            qerror = i18n("Permission denied<p>Please ensure that:<br>1. You have permission to access this device.<br>2. This device node is not listed in /etc/fstab.</p>");
-        else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.PermissionDeniedByPolicy"))
-            qerror = privilegedMount(udi, mount_point, poptions, noptions);
-        else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted"))
-            qerror = i18n("Device is already mounted.");
-        else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) {
-            dbus_message_unref (dmesg);
-            dbus_error_free (&error);
-            return mount_priv(udi, "", poptions, noptions, dbus_connection);
-        }
-        dbus_message_unref (dmesg);
-        dbus_error_free (&error);
-        return qerror;
-    }
-
-    kdDebug() << "mount queued for " << udi << endl;
-
-    dbus_message_unref (dmesg);
-    dbus_message_unref (reply);
-
-    return qerror;
-
-}
-
-TQString HALBackend::listUsingProcesses(const Medium* medium)
-{
-    TQString proclist, fullmsg;
-    TQString fuserpath = TDEStandardDirs::findExe("fuser", TQString("/sbin:/usr/sbin:") + getenv( "PATH" ));
-    FILE *fuser = NULL;
-
-    uint counter = 0;
-    if (!fuserpath.isEmpty()) {
-        TQString cmdline = TQString("/usr/bin/env %1 -vm %2 2>&1").arg(fuserpath, TDEProcess::quote(medium->mountPoint()));
-        fuser = popen(cmdline.latin1(), "r");
-    }
-    if (fuser) {
-        proclist += "<pre>";
-        TQTextIStream is(fuser);
-        TQString tmp;
-        while (!is.atEnd()) {
-            tmp = is.readLine();
-            tmp = TQStyleSheet::escape(tmp) + "\n";
-
-            proclist += tmp;
-            if (counter++ > 10)
-            {
-                proclist += "...";
-                break;
-            }
-        }
-        proclist += "</pre>";
-        (void)pclose( fuser );
-    }
-    if (counter) {
-        fullmsg = i18n("Moreover, programs still using the device "
-            "have been detected. They are listed below. You have to "
-            "close them or change their working directory before "
-            "attempting to unmount the device again.");
-        fullmsg += "<br>" + proclist;
-        return fullmsg;
-    } else {
-        return TQString::null;
-    }
-}
-
-TQString HALBackend::killUsingProcesses(const Medium* medium)
-{
-    TQString proclist, fullmsg;
-    TQString fuserpath = TDEStandardDirs::findExe("fuser", TQString("/sbin:/usr/sbin:") + getenv( "PATH" ));
-    FILE *fuser = NULL;
-
-    uint counter = 0;
-    if (!fuserpath.isEmpty()) {
-        TQString cmdline = TQString("/usr/bin/env %1 -vmk %2 2>&1").arg(fuserpath, TDEProcess::quote(medium->mountPoint()));
-        fuser = popen(cmdline.latin1(), "r");
-    }
-    if (fuser) {
-        proclist += "<pre>";
-        TQTextIStream is(fuser);
-        TQString tmp;
-        while (!is.atEnd()) {
-            tmp = is.readLine();
-            tmp = TQStyleSheet::escape(tmp) + "\n";
-
-            proclist += tmp;
-            if (counter++ > 10)
-            {
-                proclist += "...";
-                break;
-            }
-        }
-        proclist += "</pre>";
-        (void)pclose( fuser );
-    }
-    if (counter) {
-        fullmsg = i18n("Programs that were still using the device "
-            "have been forcibly terminated. They are listed below.");
-        fullmsg += "<br>" + proclist;
-        return fullmsg;
-    } else {
-        return TQString::null;
-    }
-}
-
-void HALBackend::slotResult(TDEIO::Job *job)
-{
-    kdDebug() << "slotResult " << mount_jobs[job] << endl;
-
-    struct mount_job_data *data = mount_jobs[job];
-    TQString& qerror = data->errorMessage;
-    const Medium* medium = data->medium;
-
-    if (job->error() == TDEIO::ERR_COULD_NOT_UNMOUNT) {
-        TQString proclist(listUsingProcesses(medium));
-
-        qerror = "<qt>";
-        qerror += "<p>" + i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and "
-                       "currently mounted at <b>%4</b> could not be unmounted. ").arg(
-                          "system:/media/" + medium->name(),
-                          medium->deviceNode(),
-                          medium->prettyLabel(),
-                          medium->prettyBaseURL().pathOrURL()) + "</p>";
-        qerror += "<p>" + i18n("The following error was returned by umount command:");
-        qerror += "</p><pre>" + job->errorText() + "</pre>";
-
-        if (!proclist.isEmpty()) {
-            qerror += proclist;
-        }
-        qerror += "</qt>";
-    } else if (job->error()) {
-        qerror = job->errorText();
-    }
-
-    ResetProperties( medium->id().latin1() );
-    mount_jobs.remove(job);
-
-    /* Job completed. Notify the caller */
-    data->error = job->error();
-    data->completed = true;
-    kapp->eventLoop()->exitLoop();
-}
-
-TQString HALBackend::isInFstab(const Medium *medium)
-{
-    KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName);
-
-    KMountPoint::List::iterator it = fstab.begin();
-    KMountPoint::List::iterator end = fstab.end();
-
-    for (; it!=end; ++it)
-    {
-        TQString reald = (*it)->realDeviceName();
-        if ( reald.endsWith( "/" ) )
-            reald = reald.left( reald.length() - 1 );
-        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
-        if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) )
-	{
-            TQStringList opts = (*it)->mountOptions();
-            if (opts.contains("user") || opts.contains("users"))
-                return (*it)->mountPoint();
-        }
-    }
-
-    return TQString::null;
-}
-
-TQStringVariantMap HALBackend::mount(const Medium *medium)
-{
-    TQStringVariantMap result;
-    if (medium->isMounted()) {
-        result["result"] = true;
-        return result;
-    }
-
-    TQString mountPoint = isInFstab(medium);
-    if (!mountPoint.isNull())
-    {
-        struct mount_job_data data;
-        data.completed = false;
-        data.medium = medium;
-
-        kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl;
-        TDEIO::Job *job = TDEIO::mount( false, 0, medium->deviceNode(), mountPoint );
-        connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_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();
-        }
-        if (!data.error) {
-            result["result"] = true;
-            return result;
-        }
-        else {
-            result["errStr"] = data.errorMessage; // Return the error message (if any) to the caller
-            result["result"] = false;
-            return result;
-        }
-    }
-
-    kdDebug() << "mounting " << medium->id() << "..." << endl;
-
-    TQStringList soptions;
-    TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id()));
-    if (valids["flush"] == "true")
-        soptions << "flush";
-
-    if ((valids["uid"] == "true") && (medium->fsType() != "ntfs"))
-    {
-        soptions << TQString("uid=%1").arg(getuid());
-    }
-
-    if (valids["ro"] == "true")
-        soptions << "ro";
-
-    if (valids["atime"] != "true")
-        soptions << "noatime";
-
-    if (valids["quiet"] == "true")
-        soptions << "quiet";
-
-    if (valids["utf8"] == "true")
-        soptions << "utf8";
-
-    if (valids["sync"] == "true")
-        soptions << "sync";
-
-    if (medium->fsType() == "ntfs") {
-        TQString fsLocale("locale=");
-        fsLocale += setlocale(LC_ALL, "");
-        soptions << fsLocale;
-    }
-
-    TQString mount_point = valids["mountpoint"];
-    if (mount_point.startsWith("/media/"))
-        mount_point = mount_point.mid(7);
-
-    if (valids.contains("shortname"))
-    {
-        soptions << TQString("shortname=%1").arg(valids["shortname"]);
-    }
-
-    if (valids.contains("locale"))
-    {
-        soptions << TQString("locale=%1").arg(valids["locale"]);
-    }
-
-    if (valids.contains("journaling"))
-    {
-        TQString option = valids["journaling"];
-        if (option == "data")
-            soptions << TQString("data=journal");
-        else if (option == "writeback")
-            soptions << TQString("data=writeback");
-        else
-            soptions << TQString("data=ordered");
-    }
-
-    TQStringList hal_mount_options = getHALmountoptions(medium->id());
-    for (TQValueListIterator<TQString> it=hal_mount_options.begin();it!=hal_mount_options.end();it++)
-    {
-       soptions << *it;
-       kdDebug()<<"HALOption: "<<*it<<endl;
-       if ((*it).startsWith("iocharset="))
-       {
-           soptions.remove("utf8");
-           kdDebug()<<"\"iocharset=\" found. Removing \"utf8\" from options."<<endl;
-       }
-    }
-
-    const char **options = new const char*[soptions.size() + 1];
-    uint noptions = 0;
-    for (TQStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions)
-    {
-        options[noptions] = (*it).latin1();
-        kdDebug()<<"Option: "<<*it<<endl;
-    }
-    options[noptions] = NULL;
-
-    TQString qerror;
-    if (!medium->isEncrypted()) {
-        // normal volume
-    	qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection);
-    } else {
-        // see if we have a clear volume
-        error = i18n("Cannot mount encrypted locked drives!");
-        LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, medium->id().latin1());
-        if (halVolume) {
-            char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
-            if (clearUdi != NULL) {
-                qerror = mount_priv(clearUdi, mount_point.utf8(), options, noptions, dbus_connection);
-                libhal_free_string(clearUdi);
-            }
-            libhal_volume_free(halVolume);
-        }
-    }
-
-    if (!qerror.isEmpty()) {
-        kdError() << "mounting " << medium->id() << " returned " << qerror << endl;
-        result["errStr"] = qerror;
-        result["result"] = false;
-        return result;
-    }
-
-    medium->setHalMounted(true);
-    ResetProperties(medium->id().latin1());
-
-    result["result"] = true;
-    return result;
-}
-
-TQStringVariantMap HALBackend::mount(const TQString &id)
-{
-	const Medium *medium = m_mediaList.findById(id);
-	if (!medium) {
-		TQStringVariantMap result;
-		result["errStr"] = i18n("No such medium: %1").arg(id);
-		result["result"] = false;
-		return result;
-	}
-	return mount(medium);
-}
-
-TQStringVariantMap HALBackend::unmount(const TQString &id)
-{
-    TQStringVariantMap result;
-
-    const Medium* medium = m_mediaList.findById(id);
-    if (!medium)
-    {
-        // now we get fancy: if the udi is no volume, it _might_ be a device with only one
-        // volume on it (think CDs) - so we're so nice to the caller to unmount that volume
-        LibHalDrive*  halDrive  = libhal_drive_from_udi(m_halContext, id.latin1());
-        if (halDrive)
-        {
-            int numVolumes;
-            char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes);
-            if (numVolumes == 1)
-                medium = m_mediaList.findById(volumes[0]);
-        }
-    }
-
-    if (!medium) {
-        result["errStr"] = i18n("No such medium: %1").arg(id);
-        result["result"] = false;
-        return result;
-    }
-
-    if (!medium->isMounted()) {
-        result["result"] = true;
-        return result;
-    }
-
-    TQString mountPoint = isInFstab(medium);
-    if (!mountPoint.isNull())
-    {
-        struct mount_job_data data;
-        data.completed = false;
-        data.medium = medium;
-
-        kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl;
-        TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false );
-        connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_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();
-        }
-        if (!data.error) {
-            result["result"] = true;
-            return result;
-        }
-        else {
-            result["errStr"] = data.errorMessage; // Return the error message (if any) to the caller
-            result["result"] = false;
-            return result;
-        }
-    }
-
-    DBusMessage *dmesg, *reply;
-    DBusError error;
-    const char *options[2];
-    TQString udi = TQString::null;
-
-    if (!medium->isEncrypted()) {
-        // normal volume
-        udi = medium->id();
-    } else {
-        // see if we have a clear volume
-        LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, medium->id().latin1());
-        if (halVolume) {
-            char *clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);
-	    udi = clearUdi;
-	    libhal_free_string(clearUdi);
-            libhal_volume_free(halVolume);
-        }
-    }
-    if (udi.isNull()) {
-        kdDebug() << "unmount failed: no udi" << endl;
-        result["errStr"] = i18n("Internal error");
-        result["result"] = false;
-        return result;
-    }
-
-    kdDebug() << "unmounting " << udi << "..." << endl;
-
-    dbus_error_init(&error);
-    DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
-    if (dbus_error_is_set(&error))
-    {
-        dbus_error_free(&error);
-        result["errStr"] = i18n("Unknown error");
-        result["result"] = false;
-        return result;
-    }
-
-    if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi.latin1(),
-                                                "org.freedesktop.Hal.Device.Volume",
-                                                "Unmount"))) {
-        kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n";
-        result["errStr"] = i18n("Internal error");
-        result["result"] = false;
-        return result;
-    }
-
-    options[0] = "force";
-    options[1] = 0;
-
-    if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0,
-                                   DBUS_TYPE_INVALID))
-    {
-        kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n";
-        dbus_message_unref (dmesg);
-        result["errStr"] = i18n("Internal error");
-        result["result"] = false;
-        return result;
-    }
-
-    char thisunmounthasfailed = 0;
-    dbus_error_init (&error);
-    if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error)))
-    {
-        thisunmounthasfailed = 1;
-        TQString qerror, reason, origqerror;
-
-        if (!strcmp(error.name, "org.freedesktop.Hal.Device.PermissionDeniedByPolicy")) {
-            qerror = privilegedUnmount(udi.latin1());
-
-            if (qerror.isEmpty()) {
-                dbus_message_unref(dmesg);
-                dbus_error_free(&error);
-                result["result"] = true;
-                return result;
-            }
-
-            // @todo handle unmount error message
-        }
-        
-        kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl;
-        qerror += "<p>" + i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and "
-                       "currently mounted at <b>%4</b> could not be unmounted. ").arg(
-                          "system:/media/" + medium->name(),
-                          medium->deviceNode(),
-                          medium->prettyLabel(),
-                          medium->prettyBaseURL().pathOrURL()) + "</p>";
-        qerror += "<p>" + i18n("Unmounting failed due to the following error:") + "</p>";
-        if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) {
-            reason = i18n("Device is Busy:");
-            thisunmounthasfailed = 2;
-        } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) {
-            // this is faking. The error is that the device wasn't mounted by hal (but by the system)
-            reason = i18n("Permission denied<p>Please ensure that:<br>1. You have permission to access this device.<br>2. This device was originally mounted using TDE.</p>");
-        } else {
-            reason = error.message;
-        }
-        qerror += "<p><b>" + reason + "</b></p>";
-        origqerror = qerror;
-
-        // Include list of processes (if any) using the device in the error message
-        reason = listUsingProcesses(medium);
-        if (!reason.isEmpty()) {
-            qerror += reason;
-            if (thisunmounthasfailed == 2) {	// Failed as BUSY
-                if (KMessageBox::warningYesNo(0, i18n("%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All unsaved data would be lost</i>").arg(qerror)) == KMessageBox::Yes) {
-                    qerror = origqerror;
-                    reason = killUsingProcesses(medium);
-                    qerror = HALBackend::unmount(udi);
-                    if (qerror.isNull()) {
-                        thisunmounthasfailed = 0;
-                    }
-                }
-            }
-        }
-
-        if (thisunmounthasfailed != 0) {
-            dbus_message_unref (dmesg);
-            dbus_error_free (&error);
-            result["errStr"] = qerror;
-            result["result"] = false;
-            return result;
-        }
-    }
-
-    kdDebug() << "unmount queued for " << udi << endl;
-
-    dbus_message_unref (dmesg);
-    if (reply) {
-      dbus_message_unref (reply);
-    }
-
-    medium->setHalMounted(false);
-    ResetProperties(medium->id().latin1());
-
-    while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
-
-    result["result"] = true;
-    return result;
-}
-
-TQStringVariantMap HALBackend::unlock(const TQString &id, const TQString &password)
-{
-    TQStringVariantMap result;
-
-    const Medium *medium = m_mediaList.findById(id);
-    if (!medium) {
-        result["errStr"] = i18n("No such medium: %1").arg(id);
-        result["result"] = false;
-        return result;
-    }
-
-    if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull()) {
-        result["result"] = true;
-        return result;
-    }
-
-    const char *udi = medium->id().latin1();
-    DBusMessage *msg = NULL;
-    DBusMessage *reply = NULL;
-    DBusError error;
-
-    kdDebug() << "Setting up " << udi << " for crypto\n" <<endl;
-
-    msg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
-                                        "org.freedesktop.Hal.Device.Volume.Crypto",
-                                        "Setup");
-    if (msg == NULL) {
-        kdDebug() << "unlock failed for " << udi << ": could not create dbus message\n";
-        result["errStr"] = i18n("Internal error");
-        result["result"] = false;
-        return result;
-    }
-
-    TQCString pwdUtf8 = password.utf8();
-    const char *pwd_utf8 = pwdUtf8;
-    if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &pwd_utf8, DBUS_TYPE_INVALID)) {
-        kdDebug() << "unlock failed for " << udi << ": could not append args to dbus message\n";
-        dbus_message_unref (msg);
-        result["errStr"] = i18n("Internal error");
-        result["result"] = false;
-        return result;
-    }
-
-    dbus_error_init (&error);
-    if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, msg, -1, &error)) || 
-        dbus_error_is_set (&error))
-    {
-        TQString qerror = i18n("Internal Error");
-        kdDebug() << "unlock failed for " << udi << ": " << error.name << " " << error.message << endl;
-        if (strcmp (error.name, "org.freedesktop.Hal.Device.Volume.Crypto.SetupPasswordError") == 0) {
-            qerror = i18n("Wrong password");
-        }
-        dbus_error_free (&error);
-        dbus_message_unref (msg);
-        while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
-        result["errStr"] = qerror;
-        result["result"] = false;
-        return result;
-    }
-
-    dbus_message_unref (msg);
-    dbus_message_unref (reply);
-
-    while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
-
-    result["result"] = true;
-    return result;
-}
-
-TQStringVariantMap HALBackend::lock(const TQString &id)
-{
-    TQStringVariantMap result;
-
-    const Medium *medium = m_mediaList.findById(id);
-    if (!medium) {
-        result["errStr"] = i18n("No such medium: %1").arg(id);
-        result["result"] = false;
-        return result;
-    }
-
-    if (!medium->isEncrypted() || !medium->clearDeviceUdi().isNull()) {
-        result["result"] = true;
-        return result;
-    }
-
-    const char *udi = medium->id().latin1();
-    DBusMessage *msg = NULL;
-    DBusMessage *reply = NULL;
-    DBusError error;
-
-    kdDebug() << "Tear down " << udi << "\n" <<endl;
-
-    msg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
-                                        "org.freedesktop.Hal.Device.Volume.Crypto",
-                                        "Teardown");
-    if (msg == NULL) {
-        kdDebug() << "lock failed for " << udi << ": could not create dbus message\n";
-        result["errStr"] = i18n("Internal error");
-        result["result"] = false;
-        return result;
-    }
-
-    if (!dbus_message_append_args (msg, DBUS_TYPE_INVALID)) {
-        kdDebug() << "lock failed for " << udi << ": could not append args to dbus message\n";
-        dbus_message_unref (msg);
-        result["errStr"] = i18n("Internal error");
-        result["result"] = false;
-        return result;
-    }
-
-    dbus_error_init (&error);
-    if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, msg, -1, &error)) || 
-        dbus_error_is_set (&error))
-    {
-        TQString qerror = i18n("Internal Error");
-        kdDebug() << "lock failed for " << udi << ": " << error.name << " " << error.message << endl;
-        dbus_error_free (&error);
-        dbus_message_unref (msg);
-        while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
-        result["errStr"] = qerror;
-        result["result"] = false;
-        return result;
-    }
-
-    dbus_message_unref (msg);
-    dbus_message_unref (reply);
-
-    ResetProperties(udi);
-
-    while (dbus_connection_dispatch(dbus_connection) == DBUS_DISPATCH_DATA_REMAINS) ;
-
-    result["result"] = true;
-    return result;
-}
-
-#include "halbackend.moc"
diff --git a/tdeioslave/media/mediamanager/halbackend.h b/tdeioslave/media/mediamanager/halbackend.h
deleted file mode 100644
index ed512fa7b..000000000
--- a/tdeioslave/media/mediamanager/halbackend.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* This file is part of the KDE Project
-   Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   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.
-*/
-
-/**
-* This is a media:/ backend for the freedesktop Hardware Abstraction Layer
-* Usage : create an instance of HALBackend, then call InitHal(). A false
-* result from the later function means that something went wrong and that
-* the backend shall not be used.
-*
-* @author Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
-* @short media:/ backend for the HAL
-*/
-
-#ifndef _HALBACKEND_H_
-#define _HALBACKEND_H_
-
-#include "backendbase.h"
-
-#include <tqobject.h>
-#include <tqstringlist.h>
-#include <tqstring.h>
-#include <tqregexp.h>
-
-#include <config.h>
-
-/* We acknowledge the the dbus API is unstable */
-#define DBUS_API_SUBJECT_TO_CHANGE
-/* DBus-Qt bindings */
-#include <dbus/connection.h>
-/* HAL libraries */
-#include <libhal.h>
-#include <libhal-storage.h>
-
-namespace TDEIO {
-  class Job;
-}
-
-class HALBackend : public TQObject, public BackendBase
-{
-Q_OBJECT
-
-public:
-	/**
-	* Constructor
-	*/
-	HALBackend(MediaList &list, TQObject* parent);
-
-	/**
-	* Destructor
-	*/
-	~HALBackend();
-
-	/**
-	* Perform HAL initialization.
-	*
-	* @return true if succeded. If not, rely on some other backend
-	*/
-	bool InitHal();
-
-	/**
-	* List all devices and append them to the media device list (called only once, at startup).
-	*
-	* @return true if succeded, false otherwise
-	*/
-	bool ListDevices();
-
-	TQStringList mountoptions(const TQString &id);
-
-	bool setMountoptions(const TQString &id, const TQStringList &options);
-
-	TQStringVariantMap mount(const TQString &id);
-	TQStringVariantMap mount(const Medium *medium);
-	TQStringVariantMap unmount(const TQString &id);
-	TQStringVariantMap unlock(const TQString &id, const TQString &password);
-	TQStringVariantMap lock(const TQString &id);
-
-private:
-	/**
-	* Append a device in the media list. This function will check if the device
-	* is worth listing.
-	*
-	*  @param udi                 Universal Device Id
-	*  @param allowNotification   Indicates if this event will be notified to the user
-	*/
-	void AddDevice(const char* udi, bool allowNotification=true);
-
-	/**
-	* Remove a device from the device list
-	*
-	*  @param udi                 Universal Device Id
-	*/
-	void RemoveDevice(const char* udi);
-
-	/**
-	* A device has changed, update it
-	*
-	*  @param udi                 Universal Device Id
-	*/
-	void ModifyDevice(const char *udi, const char* key);
-
-	/**
-	* HAL informed that a special action has occured
-	* (e.g. device unplugged without unmounting)
-	*
-	*  @param udi                 Universal Device Id
-	*/
-	void DeviceCondition(const char *udi, const char *condition);
-
-	/**
-	* Integrate the DBus connection within qt main loop
-	*/
-	void MainLoopIntegration(DBusConnection *dbusConnection);
-
-/* Set media properties */
-private:
-	/**
-	* Reset properties for the given medium
-	*/
-	void ResetProperties(const char* MediumUdi, bool allowNotification=false);
-
-	/**
-	* Find the medium that is concerned with device udi
-	*/
-	const char* findMediumUdiFromUdi(const char* udi);
-
-	void setVolumeProperties(Medium* medium);
-	bool setFloppyProperties(Medium* medium);
-	void setFloppyMountState( Medium* medium );
-	bool setFstabProperties(Medium* medium);
-	void setCameraProperties(Medium* medium);
-	TQString generateName(const TQString &devNode);
-	static TQString isInFstab(const Medium *medium);
-	static TQString listUsingProcesses(const Medium *medium);
-	static TQString killUsingProcesses(const Medium *medium);
-
-private slots:
-	void slotResult(TDEIO::Job *job);
-
-/* Hal call-backs -- from gvm*/
-public:
-	/** Invoked when a device is added to the Global Device List.
-	*
-	*  @param  ctx                 LibHal context
-	*  @param  udi                 Universal Device Id
-	*/
-	static void hal_device_added(LibHalContext *ctx, const char *udi);
-
-	/** Invoked when a device is removed from the Global Device List.
-	*
-	*  @param  ctx                 LibHal context
-	*  @param  udi                 Universal Device Id
-	*/
-	static void hal_device_removed(LibHalContext *ctx, const char *udi);
-
-	/** Invoked when a property of a device in the Global Device List is
-	*  changed, and we have we have subscribed to changes for that device.
-	*
-	*  @param  ctx                 LibHal context
-	*  @param  udi                 Univerisal Device Id
-	*  @param  key                 Key of property
-	*/
-	static void hal_device_property_modified(LibHalContext *ctx, const char *udi, const char *key,
-				dbus_bool_t is_removed, dbus_bool_t is_added);
-
-	/** Type for callback when a non-continuos condition occurs on a device
-	*
-	*  @param  udi                 Univerisal Device Id
-	*  @param  condition_name      Name of the condition
-	*  @param  message             D-BUS message with variable parameters depending on condition
-	*/
-	static void hal_device_condition(LibHalContext *ctx, const char *udi,
-				const char *condition_name,
-				const char* message
-				);
-
-	TQStringList getHALmountoptions(TQString udi);
-/* HAL and DBus structures */
-private:
-	/**
-	* The HAL context connecting the whole application to the HAL
-	*/
-	LibHalContext*		m_halContext;
-
-	/**
-	* libhal-storage HAL policy, e.g. for icon names
-	*/
-	LibHalStoragePolicy*	m_halStoragePolicy;
-
-	/**
-	* The DBus-Qt bindings connection for mainloop integration
-	*/
-	DBusQt::Connection*	m_dBusQtConnection;
-
-	/**
-	* Object for the kded module
-	*/
-	TQObject* m_parent;
-
-	DBusConnection *dbus_connection;
-
-	/**
-	* Data structure for fstab mount/unmount jobs
-	*/
-	struct mount_job_data {
-		// [in] Medium, which is being mounted/unmounted by the job
-		const Medium* medium;
-		// [in,out] Should be set to true when the job completes
-		bool completed;
-		// [out] TDEIO::Error if an error occured during operation. Otherwise, 0
-		int error;
-		// [out] Error message to be displayed to the user
-		TQString errorMessage;
-	};
-
-	TQMap<TDEIO::Job *, struct mount_job_data*> mount_jobs;
-};
-
-#endif /* _HALBACKEND_H_ */
diff --git a/tdeioslave/media/mediamanager/linuxcdpolling.cpp b/tdeioslave/media/mediamanager/linuxcdpolling.cpp
index eccdf1f34..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()
@@ -514,7 +514,7 @@ bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir
 		close(fd);
 		return false;
 	}
-	if (Q_BYTE_ORDER != Q_LITTLE_ENDIAN)
+	if (TQ_BYTE_ORDER != TQ_LITTLE_ENDIAN)
 		bs = ((bs << 8) & 0xFF00) | ((bs >> 8) & 0xFF);
 
 	// read in size of path table
@@ -524,7 +524,7 @@ bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir
 		close(fd);
 		return false;
 	}
-	if (Q_BYTE_ORDER != Q_LITTLE_ENDIAN)
+	if (TQ_BYTE_ORDER != TQ_LITTLE_ENDIAN)
 		ts = ((ts << 8) & 0xFF00) | ((ts >> 8) & 0xFF);
 
 	// read in which block path table is in
@@ -534,7 +534,7 @@ bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir
 		close(fd);
 		return false;
 	}
-	if (Q_BYTE_ORDER != Q_LITTLE_ENDIAN)
+	if (TQ_BYTE_ORDER != TQ_LITTLE_ENDIAN)
 		tl = ((tl << 24) & 0xFF000000) | ((tl << 8) & 0xFF0000) |
 		     ((tl >> 8) & 0xFF00) | ((tl >> 24) & 0xFF);
 
@@ -559,7 +559,7 @@ bool LinuxCDPolling::hasDirectory(const TQCString &devNode, const TQCString &dir
 			ret = false;
 			break;
 		}
-		if (Q_BYTE_ORDER != Q_LITTLE_ENDIAN)
+		if (TQ_BYTE_ORDER != TQ_LITTLE_ENDIAN)
 			parent = ((parent << 8) & 0xFF00) | ((parent >> 8) & 0xFF);
 
 		// read the name
diff --git a/tdeioslave/media/mediamanager/linuxcdpolling.h b/tdeioslave/media/mediamanager/linuxcdpolling.h
index fc4947470..070ad5eea 100644
--- a/tdeioslave/media/mediamanager/linuxcdpolling.h
+++ b/tdeioslave/media/mediamanager/linuxcdpolling.h
@@ -49,7 +49,7 @@ class PollingThread;
 
 class LinuxCDPolling : public TQObject, public BackendBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 
diff --git a/tdeioslave/media/mediamanager/medialist.cpp b/tdeioslave/media/mediamanager/medialist.cpp
index b06824d0c..8ea9aec50 100644
--- a/tdeioslave/media/mediamanager/medialist.cpp
+++ b/tdeioslave/media/mediamanager/medialist.cpp
@@ -128,42 +128,43 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification)
 {
 	kdDebug(1219) << "MediaList::changeMediumState(const Medium &) for id " << medium.id() << endl;
 
-	if ( !m_idMap.contains(medium.id()) ) return false;
+	if (!m_idMap.contains(medium.id())) return false;
 
 	Medium *m = m_idMap[medium.id()];
 
-	if ( medium.isMountable() )
+	m->setEncrypted(medium.isEncrypted());
+	m->setLocked(medium.isLocked());
+	m->setMountable(medium.isMountable());
+	if (medium.isMountable())
 	{
-		TQString device_node = medium.deviceNode();
-		TQString clear_device_udi = medium.clearDeviceUdi();
-		TQString mount_point = medium.mountPoint();
-		TQString fs_type = medium.fsType();
-		bool mounted = medium.isMounted();
-
-		m->mountableState( device_node, clear_device_udi, mount_point, fs_type, mounted );
+		m->setDeviceNode(medium.deviceNode());
+		m->setClearDeviceUdi(medium.clearDeviceUdi());
+		m->setMountPoint(medium.mountPoint());
+		m->setFsType(medium.fsType());
+		m->setMounted(medium.isMounted());
 	}
 	else
 	{
-		m->unmountableState( medium.baseURL() );
+		m->setBaseURL(medium.baseURL());
 	}
 
-
 	if (!medium.mimeType().isEmpty())
 	{
-		m->setMimeType( medium.mimeType() );
+		m->setMimeType(medium.mimeType());
 	}
 
 	if (!medium.iconName().isEmpty())
 	{
-		m->setIconName( medium.iconName() );
+		m->setIconName(medium.iconName());
 	}
 
 	if (!medium.label().isEmpty())
 	{
-		m->setLabel( medium.label() );
+		m->setLabel(medium.label());
 	}
 
 	m->setHidden(medium.hidden());
+	m->setSoftHidden(medium.softHidden());
 
 	emit mediumStateChanged(m->id(), m->name(), !m->needMounting(), allowNotification);
 	return true;
@@ -184,7 +185,8 @@ bool MediaList::changeMediumState(const TQString &id,
 
 	Medium *medium = m_idMap[id];
 
-	medium->unmountableState( baseURL );
+	medium->setMountable(false);
+	medium->setBaseURL(baseURL);
 
 	if (!mimeType.isEmpty())
 	{
@@ -225,7 +227,16 @@ bool MediaList::changeMediumState(const TQString &id,
 
 	Medium *medium = m_idMap[id];
 
-	medium->mountableState( deviceNode, mountPoint, fsType, mounted );
+	if (medium->deviceNode().isEmpty() || !medium->isMountable())
+	{
+		return false;
+	}
+
+	medium->setMountable(true);
+	medium->setDeviceNode(deviceNode);
+	medium->setMountPoint(mountPoint);
+	medium->setFsType(fsType);
+	medium->setMounted(mounted);
 
 	if (!mimeType.isEmpty())
 	{
@@ -262,7 +273,12 @@ bool MediaList::changeMediumState(const TQString &id, bool mounted,
 
 	Medium *medium = m_idMap[id];
 
-	if ( !medium->mountableState( mounted ) ) return false;
+	if (medium->deviceNode().isEmpty() || !medium->isMountable())
+	{
+		return false;
+	}
+
+	medium->setMounted(mounted);
 
 	if (!mimeType.isEmpty())
 	{
diff --git a/tdeioslave/media/mediamanager/medialist.h b/tdeioslave/media/mediamanager/medialist.h
index f4b088526..a92d1b6c0 100644
--- a/tdeioslave/media/mediamanager/medialist.h
+++ b/tdeioslave/media/mediamanager/medialist.h
@@ -23,9 +23,9 @@
 
 #include "medium.h"
 
-class MediaList : public QObject
+class MediaList : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	MediaList();
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index 7a8262eec..66c456a24 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -36,10 +36,6 @@
 #include "tdehardwarebackend.h"
 #endif // COMPILE_TDEHARDWAREBACKEND
 
-#ifdef COMPILE_HALBACKEND
-#include "halbackend.h"
-#endif //COMPILE_HALBACKEND
-
 #ifdef COMPILE_LINUXCDPOLLING
 #include "linuxcdpolling.h"
 #endif //COMPILE_LINUXCDPOLLING
@@ -47,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()
@@ -80,33 +76,9 @@ void MediaManager::loadBackends()
     }
 
     mp_removableBackend = 0L;
-    m_halbackend = 0L;
     m_tdebackend = 0L;
     m_fstabbackend = 0L;
 
-#ifdef COMPILE_HALBACKEND
-    if ( MediaManagerSettings::self()->halBackendEnabled() )
-    {
-        m_mediaList.blockSignals(false);
-        m_halbackend = new HALBackend(m_mediaList, this);
-        if (m_halbackend->InitHal())
-        {
-            m_backends.append( m_halbackend );
-            m_fstabbackend = new FstabBackend(m_mediaList, true);
-            m_backends.append( m_fstabbackend );
-            // No need to load something else...
-            m_mediaList.blockSignals(false);
-            return;
-        }
-        else
-        {
-            delete m_halbackend;
-            m_halbackend = 0;
-            m_mediaList.blockSignals(true);
-        }
-    }
-#endif // COMPILE_HALBACKEND
-
 #ifdef COMPILE_TDEHARDWAREBACKEND
     if ( MediaManagerSettings::self()->tdeHardwareBackendEnabled() )
     {
@@ -136,39 +108,22 @@ void MediaManager::loadBackends()
     m_mediaList.blockSignals(false);
 }
 
-
-TQStringList MediaManager::fullList()
-{
-    TQPtrList<Medium> list = m_mediaList.list();
-
-    TQStringList result;
-
-    TQPtrList<Medium>::const_iterator it = list.begin();
-    TQPtrList<Medium>::const_iterator end = list.end();
-    for (; it!=end; ++it)
-    {
-        result+= (*it)->properties();
-        result+= Medium::SEPARATOR;
-    }
-
-    return result;
-}
-
-TQStringList MediaManager::properties(const TQString &name)
+const Medium* MediaManager::getMediumByName(const TQString &name)
 {
     const Medium *m = m_mediaList.findByName(name);
-
     if (!m)
     {
         KURL u(name);
-        kdDebug() << "Media::prop " << name << " " << u.isValid() << endl;
+        kdDebug() << "Media::getMediumByName " << name << " " << u.isValid() << endl;
         if (u.isValid())
         {
             if (u.protocol() == "system")
             {
                 TQString path = u.path();
                 if (path.startsWith("/media/"))
+                {
                     path = path.mid(strlen("/media/"));
+                }
                 m = m_mediaList.findByName(path);
                 kdDebug() << "findByName " << path << m << endl;
             }
@@ -189,170 +144,162 @@ TQStringList MediaManager::properties(const TQString &name)
                 {
                     path = TDEStandardDirs::realFilePath(u.path());
                     kdDebug() << "comparing " << (*it)->mountPoint()  << " " << path << " " <<  (*it)->deviceNode() << endl;
-                    if ((*it)->mountPoint() == path || (*it)->deviceNode() == path) {
-			m = *it;
-			break;
+                    if ((*it)->mountPoint() == path || (*it)->deviceNode() == path)
+                    {
+                        m = *it;
+                        break;
                     }
                 }
             }
         }
     }
+    return m;
+}
+
+TQStringList MediaManager::fullList()
+{
+    TQPtrList<Medium> list = m_mediaList.list();
+
+    TQStringList result;
+
+    TQPtrList<Medium>::const_iterator it = list.begin();
+    TQPtrList<Medium>::const_iterator end = list.end();
+    for (; it!=end; ++it)
+    {
+        result+= (*it)->properties();
+        result+= Medium::SEPARATOR;
+    }
+
+    return result;
+}
 
-    if (m) {
+TQStringList MediaManager::properties(const TQString &name)
+{
+    const Medium *m = getMediumByName(name);
+    if (m)
+		{
         return m->properties();
     }
-    else {
+    else
+		{
         return TQStringList();
     }
 }
 
 TQStringList MediaManager::mountoptions(const TQString &name)
 {
-#ifdef COMPILE_HALBACKEND
-	if (!m_halbackend)
-		return TQStringList();
-	return m_halbackend->mountoptions(name);
-#else // COMPILE_HALBACKEND
-	#ifdef COMPILE_TDEHARDWAREBACKEND
-		if (!m_tdebackend)
-			return TQStringList();
+#ifdef COMPILE_TDEHARDWAREBACKEND
+	if (m_tdebackend)
+	{
 		return m_tdebackend->mountoptions(name);
-	#else // COMPILE_TDEHARDWAREBACKEND
-		return TQStringList();
-	#endif // COMPILE_TDEHARDWAREBACKEND
-#endif // COMPILE_HALBACKEND
+	}
+#endif
+	return TQStringList();
 }
 
 bool MediaManager::setMountoptions(const TQString &name, const TQStringList &options)
 {
-#ifdef COMPILE_HALBACKEND
-	if (!m_halbackend)
-		return false;
-	return m_halbackend->setMountoptions(name, options);
-#else // COMPILE_HALBACKEND
-	#ifdef COMPILE_TDEHARDWAREBACKEND
-		if (!m_tdebackend)
-			return false;
+#ifdef COMPILE_TDEHARDWAREBACKEND
+	if (m_tdebackend)
+	{
 		return m_tdebackend->setMountoptions(name, options);
-	#else // COMPILE_TDEHARDWAREBACKEND
-		return false;
-	#endif // COMPILE_TDEHARDWAREBACKEND
-#endif // COMPILE_HALBACKEND
+	}
+#endif
+	return false;
 }
 
 TQStringVariantMap MediaManager::mount(const TQString &uid)
 {
-	TQStringVariantMap result;
 #ifdef COMPILE_TDEHARDWAREBACKEND
-	if (!m_tdebackend) {
-		result["errStr"] = i18n("Feature only available with the TDE hardware backend");
-		result["result"] = false;
-		return result;
+	if (m_tdebackend)
+	{
+		return m_tdebackend->mount(uid);
 	}
-	return m_tdebackend->mount(uid);
-#elif defined COMPILE_HALBACKEND
-	if (!m_halbackend) {
-		result["errStr"] = i18n("Feature only available with HAL");
-		result["result"] = false;
-		return result;
-	}
-	return m_halbackend->mount(uid);
 #else
-	if (!m_fstabbackend) {
-		result["errStr"] = i18n("Feature only available with HAL or TDE hardware backend");
-		result["result"] = false;
-		return result;
+	if (m_fstabbackend)
+	{
+		return m_fstabbackend->mount(uid);
 	}
-	return m_fstabbackend->mount(uid);
 #endif
+	TQStringVariantMap result;
+	result["errStr"] = i18n("Feature only available with the TDE hardware or fstab backend");
+	result["result"] = false;
+	return result;
 }
 
 TQStringVariantMap MediaManager::unmount(const TQString &uid)
 {
-	TQStringVariantMap result;
 #ifdef COMPILE_TDEHARDWAREBACKEND
-	if (!m_tdebackend) {
-		result["errStr"] = i18n("Feature only available with the TDE hardware backend");
-		result["result"] = false;
-		return result;
+	if (m_tdebackend)
+	{
+		return m_tdebackend->unmount(uid);
 	}
-	return m_tdebackend->unmount(uid);
-#elif defined COMPILE_HALBACKEND
-	if (!m_halbackend) {
-		result["errStr"] = i18n("Feature only available with HAL");
-		result["result"] = false;
-		return result;
-	}
-	return m_halbackend->unmount(uid);
 #else
-	if (!m_fstabbackend) {
-		result["errStr"] = i18n("Feature only available with HAL or TDE hardware backend");
-		result["result"] = false;
-		return result;
+	if (m_fstabbackend)
+	{
+		return m_fstabbackend->unmount(uid);
 	}
-	return m_fstabbackend->unmount(uid);
 #endif
+	TQStringVariantMap result;
+	result["errStr"] = i18n("Feature only available with the TDE hardware or fstab backend");
+	result["result"] = false;
+	return result;
 }
 
 TQStringVariantMap MediaManager::unlock(const TQString &uid, const TQString &password)
 {
-	TQStringVariantMap result;
-/*
 #ifdef COMPILE_TDEHARDWAREBACKEND
-	if (!m_tdebackend) {
-		result["errStr"] = i18n("Feature only available with the TDE hardware backend");
-		result["result"] = false;
-		return result;
-	}
-	return m_tdebackend->unlock(uid, password);
-#elif defined COMPILE_HALBACKEND
-*/
-#if defined COMPILE_HALBACKEND
-	if (!m_halbackend) {
-		result["errStr"] = i18n("Feature only available with HAL");
-		result["result"] = false;
-		return result;
+	if (m_tdebackend)
+	{
+		return m_tdebackend->unlock(uid, password);
 	}
-	return m_halbackend->unlock(uid, password);
-
-#else
-//	if (!m_fstabbackend) {
-		result["errStr"] = i18n("Feature only available with HAL or TDE hardware backend");
-		result["result"] = false;
-		return result;
-//	}
-//	return m_fstabbackend->unlock(uid, password);
 #endif
+	TQStringVariantMap result;
+	result["errStr"] = i18n("Feature only available with the TDE hardware backend");
+	result["result"] = false;
+	return result;
 }
 
-TQStringVariantMap MediaManager::lock(const TQString &uid)
+TQStringVariantMap MediaManager::lock(const TQString &uid, bool releaseHolders)
 {
+#ifdef COMPILE_TDEHARDWAREBACKEND
+	if (m_tdebackend)
+	{
+		return m_tdebackend->lock(uid, releaseHolders);
+	}
+#endif
 	TQStringVariantMap result;
-/*
+	result["errStr"] = i18n("Feature only available with the TDE hardware backend");
+	result["result"] = false;
+	return result;
+}
+
+TQStringVariantMap MediaManager::eject(const TQString &uid)
+{
 #ifdef COMPILE_TDEHARDWAREBACKEND
-	if (!m_tdebackend) {
-		result["errStr"] = i18n("Feature only available with the TDE hardware backend");
-		result["result"] = false;
-		return result;
+	if (m_tdebackend)
+	{
+		return m_tdebackend->eject(uid);
 	}
-	return m_tdebackend->lock(uid);
-#elif defined COMPILE_HALBACKEND
-*/
-#if defined COMPILE_HALBACKEND
-	if (!m_halbackend) {
-		result["errStr"] = i18n("Feature only available with HAL");
-		result["result"] = false;
-		return result;
+#endif
+	TQStringVariantMap result;
+	result["errStr"] = i18n("Feature only available with the TDE hardware backend");
+	result["result"] = false;
+	return result;
+}
+
+TQStringVariantMap MediaManager::safeRemove(const TQString &uid)
+{
+#ifdef COMPILE_TDEHARDWAREBACKEND
+	if (m_tdebackend)
+	{
+		return m_tdebackend->safeRemove(uid);
 	}
-	return m_halbackend->lock(uid);
-#else
-//	if (!m_fstabbackend) {
-		result["errStr"] = i18n("Feature only available with HAL or TDE hardware backend");
-		result["result"] = false;
-		return result;
-//	}
-//	return m_fstabbackend->lock(uid);
 #endif
+	TQStringVariantMap result;
+	result["errStr"] = i18n("Feature only available with the TDE hardware backend");
+	result["result"] = false;
+	return result;
 }
 
 TQStringVariantMap MediaManager::mountByNode(const TQString &deviceNode)
@@ -391,7 +338,7 @@ TQStringVariantMap MediaManager::unlockByNode(const TQString &deviceNode, const
 	return unlock(medium->id(), password);
 }
 
-TQStringVariantMap MediaManager::lockByNode(const TQString &deviceNode)
+TQStringVariantMap MediaManager::lockByNode(const TQString &deviceNode, bool releaseHolders)
 {
 	const Medium *medium = m_mediaList.findByNode(deviceNode);
 	if (!medium) {
@@ -400,7 +347,44 @@ TQStringVariantMap MediaManager::lockByNode(const TQString &deviceNode)
 		result["result"] = false;
 		return result;
 	}
-	return lock(medium->id());
+	return lock(medium->id(), releaseHolders);
+}
+
+TQStringVariantMap MediaManager::ejectByNode(const TQString &deviceNode)
+{
+	const Medium *medium = m_mediaList.findByNode(deviceNode);
+	if (!medium) {
+		TQStringVariantMap result;
+		result["errStr"] = i18n("No such medium: %1").arg(deviceNode);
+		result["result"] = false;
+		return result;
+	}
+	return eject(medium->id());
+}
+
+TQStringVariantMap MediaManager::safeRemoveByNode(const TQString &deviceNode)
+{
+	const Medium *medium = m_mediaList.findByNode(deviceNode);
+	if (!medium) {
+		TQStringVariantMap result;
+		result["errStr"] = i18n("No such medium: %1").arg(deviceNode);
+		result["result"] = false;
+		return result;
+	}
+	return safeRemove(medium->id());
+}
+
+TQString MediaManager::mimeType(const TQString &name)
+{
+    const Medium *m = getMediumByName(name);
+    if (m)
+    {
+        return m->mimeType();
+    }
+    else
+    {
+        return TQString::null;
+    }
 }
 
 TQString MediaManager::nameForLabel(const TQString &label)
diff --git a/tdeioslave/media/mediamanager/mediamanager.h b/tdeioslave/media/mediamanager/mediamanager.h
index d8a31d8e1..1fe873f98 100644
--- a/tdeioslave/media/mediamanager/mediamanager.h
+++ b/tdeioslave/media/mediamanager/mediamanager.h
@@ -29,18 +29,19 @@
 #include "removablebackend.h"
 #include "mediadirnotify.h"
 
-class HALBackend;
 class TDEBackend;
 class FstabBackend;
 
 class MediaManager : public KDEDModule
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 public:
 	MediaManager(const TQCString &obj);
 	~MediaManager();
 
+	const Medium* getMediumByName(const TQString &name);
+
 k_dcop:
 	TQStringList fullList();
 	TQStringList properties(const TQString &name);
@@ -50,19 +51,23 @@ k_dcop:
 	TQStringVariantMap mount(const TQString &uid);
 	TQStringVariantMap unmount(const TQString &uid);
 	TQStringVariantMap unlock(const TQString &uid, const TQString &password);
-	TQStringVariantMap lock(const TQString &uid);
+	TQStringVariantMap lock(const TQString &uid, bool releaseHolders);
+	TQStringVariantMap eject(const TQString &uid);
+	TQStringVariantMap safeRemove(const TQString &uid);
 
 	TQStringVariantMap mountByNode(const TQString &deviceNode);
 	TQStringVariantMap unmountByNode(const TQString &deviceNode);
 	TQStringVariantMap unlockByNode(const TQString &deviceNode, const TQString &password);
-	TQStringVariantMap lockByNode(const TQString &deviceNode);
+	TQStringVariantMap lockByNode(const TQString &deviceNode, bool releaseHolders);
+	TQStringVariantMap ejectByNode(const TQString &deviceNode);
+	TQStringVariantMap safeRemoveByNode(const TQString &deviceNode);
 
+	TQString mimeType(const TQString &name);
 	TQString nameForLabel(const TQString &label);
 	ASYNC setUserLabel(const TQString &name, const TQString &label);
 
 	ASYNC reloadBackends();
 
-	// Removable media handling (for people not having HAL)
 	bool removablePlug(const TQString &devNode, const TQString &label);
 	bool removableUnplug(const TQString &devNode);
 	bool removableCamera(const TQString &devNode);
@@ -91,7 +96,6 @@ private:
 	MediaList m_mediaList;
 	TQValueList<BackendBase*> m_backends;
 	RemovableBackend *mp_removableBackend;
-	HALBackend *m_halbackend;
 	TDEBackend *m_tdebackend;
 	MediaDirNotify m_dirNotify;
 	FstabBackend *m_fstabbackend;
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index 54df3d6f1..a9207cd92 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -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();
 }
 
@@ -63,8 +63,11 @@ bool RemovableBackend::plug(const TQString &devNode, const TQString &label)
 	if (!m_removableIds.contains(id))
 	{
 		Medium *medium = new Medium(id, id, name);
-		medium->mountableState(devNode, TQString::null,
-		                       TQString::null, false);
+		medium->setMountable(true);
+		medium->setDeviceNode(devNode);
+		medium->setMountPoint(TQString::null);
+		medium->setFsType(TQString::null);
+		medium->setMounted(false);
 
 		TQStringList words = TQStringList::split(" ", label);
 		
diff --git a/tdeioslave/media/mediamanager/removablebackend.h b/tdeioslave/media/mediamanager/removablebackend.h
index fa16a391b..256497d9a 100644
--- a/tdeioslave/media/mediamanager/removablebackend.h
+++ b/tdeioslave/media/mediamanager/removablebackend.h
@@ -26,7 +26,7 @@
 
 class RemovableBackend : public TQObject, public BackendBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	RemovableBackend(MediaList &list);
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index c399d280d..a5900c883 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -49,16 +49,15 @@
 TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
     : TQObject()
     , BackendBase(list)
-    , m_unlockDialog(0)
     , m_parent(parent)
 {
 	// Initialize the TDE device manager
 	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();
@@ -139,29 +138,30 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
 	bool allowDialogNotification = allowNotification;
 	TDEConfig config("mediamanagerrc");
 	config.setGroup("Global");
-	if (!config.readBoolEntry("NotificationPopupsEnabled", false)) {
+	if (!config.readBoolEntry("NotificationPopupsEnabled", true)) {
 		allowDialogNotification = false;
 	}
 
 	// Add volume block devices
 	if (sdevice->isDiskOfType(TDEDiskDeviceType::HDD)) {
 		/* We only list volumes that...
-		*  - are encrypted with LUKS or
+		*  - are encrypted or
 		*  - have a filesystem or
 		*  - have an audio track
 		*/
-		if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
-			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
-			&& !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio))
-			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
+		if (!sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+		    !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) &&
+			  !sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) &&
+			  !sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) &&
+			  !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)
 			) {
 			//
 		}
-		/* We also don't display devices that underlie other devices;
-		*  e.g. the raw partition of a device mapper volume
-		*/
-		else if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)
-			 || (sdevice->fileSystemUsage().upper() == "RAID")) {
+		// We also don't display devices that underlie other devices, unless they are encrypted devices
+		else if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice) &&
+		         !sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+		         !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) ||
+			       sdevice->fileSystemUsage().upper() == "RAID") {
 			//
 		}
 		else {
@@ -169,16 +169,6 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
 			Medium* medium = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), "");
 			setVolumeProperties(medium);
 
-			// Do not list the LUKS backend device if it has been unlocked elsewhere
-			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
-				if (sdevice->holdingDevices().count() > 0) {
-					medium->setHidden(true);
-				}
-				else {
-					medium->setHidden(false);
-				}
-			}
-
 			// Hide udev hidden devices by default but allow the user to override if desired via Show Hidden Files
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hidden)) {
 				medium->setSoftHidden(true);
@@ -266,33 +256,29 @@ void TDEBackend::AddDevice(TDEStorageDevice * sdevice, bool allowNotification)
 		}
 
 		/* We only list volumes that...
-		*  - are encrypted with LUKS or
+		*  - are encrypted or
 		*  - have a filesystem or
-		*  - are a floppy disk
+		*  - have an audio track
 		*/
-		if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
-			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
-			&& !(sdevice->isDiskOfType(TDEDiskDeviceType::Floppy))
-			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
+		if (!sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+		    !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) &&
+			  !sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) &&
+			  !sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) &&
+			  !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)
 			) {
 			//
 		}
+		// We also don't display devices that underlie other devices, unless they are encrypted devices
+		else if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice) &&
+		         !sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+		         !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) ||
+			       sdevice->fileSystemUsage().upper() == "RAID") {
+			//
+		}
 		else {
 			// Create medium
 			Medium* medium = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), "");
-
 			setFloppyProperties(medium);
-
-			// Do not list the LUKS backend device if it has been unlocked elsewhere
-			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
-				if (sdevice->holdingDevices().count() > 0) {
-					medium->setHidden(true);
-				}
-				else {
-					medium->setHidden(false);
-				}
-			}
-
 			m_mediaList.addMedium(medium, allowDialogNotification);
 
 			kdDebug(1219) << "TDEBackend::AddDevice inserted floppy medium for " << sdevice->uniqueID() << endl;
@@ -334,8 +320,7 @@ void TDEBackend::ModifyDevice(TDEStorageDevice * sdevice)
 {
 	kdDebug(1219) << "TDEBackend::ModifyDevice for " << sdevice->uniqueID() << endl;
 
-	bool allowNotification = false;
-	ResetProperties(sdevice, allowNotification);
+	ResetProperties(sdevice, false);
 }
 
 void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotification, bool overrideIgnoreList)
@@ -359,24 +344,28 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
 	Medium* m = new Medium(sdevice->uniqueID(), driveUDIFromDeviceUID(sdevice->uniqueID()), "");
 
 	// Keep these conditions in sync with ::AddDevice above, OR ELSE!!!
-	// BEGIN
 	if (sdevice->isDiskOfType(TDEDiskDeviceType::HDD)) {
-		if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
-			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
-			&& !(sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio))
-			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
+		/* We only list volumes that...
+		*  - are encrypted or
+		*  - have a filesystem or
+		*  - have an audio track
+		*/
+		if (!sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+		    !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) &&
+			  !sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) &&
+			  !sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) &&
+			  !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)
 			) {
+			//
+		}
+		// We also don't display devices that underlie other devices, unless they are encrypted devices
+		else if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice) &&
+		         !sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+		         !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) ||
+			       sdevice->fileSystemUsage().upper() == "RAID") {
+			//
 		}
 		else {
-			// Do not list the LUKS backend device if it has been unlocked elsewhere
-			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
-				if (sdevice->holdingDevices().count() > 0) {
-					m->setHidden(true);
-				}
-				else {
-					m->setHidden(false);
-				}
-			}
 			setVolumeProperties(m);
 		}
 	}
@@ -416,25 +405,27 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
 		(sdevice->isDiskOfType(TDEDiskDeviceType::Zip)) ||
 		(sdevice->isDiskOfType(TDEDiskDeviceType::Jaz))
 		) {
-
-		if (!(sdevice->isDiskOfType(TDEDiskDeviceType::LUKS))
-			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem))
-			&& !(sdevice->isDiskOfType(TDEDiskDeviceType::Floppy))
-			&& !(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank))
+		/* We only list volumes that...
+		*  - are encrypted or
+		*  - have a filesystem or
+		*  - have an audio track
+		*/
+		if (!sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+		    !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) &&
+			  !sdevice->checkDiskStatus(TDEDiskDeviceStatus::ContainsFilesystem) &&
+			  !sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio) &&
+			  !sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)
 			) {
 			//
 		}
+		// We also don't display devices that underlie other devices, unless they are encrypted devices
+		else if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice) &&
+		         !sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) &&
+		         !sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) ||
+			       sdevice->fileSystemUsage().upper() == "RAID") {
+			//
+		}
 		else {
-			// Do not list the LUKS backend device if it has been unlocked elsewhere
-			if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
-				if (sdevice->holdingDevices().count() > 0) {
-					m->setHidden(true);
-				}
-				else {
-					m->setHidden(false);
-				}
-			}
-
 			setFloppyProperties(m);
 		}
 	}
@@ -443,8 +434,6 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat
 		setCameraProperties(m);
 	}
 
-	// END
-
 	if ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) && (!(sdevice->checkDiskStatus(TDEDiskDeviceStatus::Inserted)))) {
 		kdDebug(1219) << "TDEBackend::ResetProperties for " << sdevice->uniqueID() << " device was removed from system" << endl;
 		RemoveDevice(sdevice);
@@ -462,27 +451,40 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 
-	TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
+	TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
 	if (!sdevice) {
 		return;
 	}
 
 	medium->setName(generateName(sdevice->deviceNode()));
-	if ((sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) || (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt))) {
+	if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) {
 		medium->setEncrypted(true);
+		medium->setLocked(!sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
 	}
 	else {
 		medium->setEncrypted(false);
 	}
 
-	// USAGE: mountableState(Device node, Mount point, Filesystem type, Mounted ?)
-	medium->mountableState(sdevice->deviceNode(), sdevice->mountPath(), sdevice->fileSystemName(), !sdevice->mountPath().isNull());
+	if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) ||
+			sdevice->fileSystemUsage().upper() == "RAID") {
+		// Encrypted disks or device underlying other devices are not mountable
+		medium->setMountable(false);
+	}
+	else {
+		medium->setMountable(true);
+	}
+
+	medium->setDeviceNode(sdevice->deviceNode());
+	medium->setMountPoint(sdevice->mountPath());
+	medium->setFsType(sdevice->fileSystemName());
+	medium->setMounted(!sdevice->mountPath().isEmpty());
 
 	TQString diskLabel = sdevice->diskLabel();
 	bool useDefaultLabel = diskLabel.isNull();
 	if (useDefaultLabel) {
 		diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
 	}
+	diskLabel += " (" + sdevice->deviceNode() + ")";
 
 	TQString mimeType;
 
@@ -518,14 +520,15 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		// Default
 		mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
 		if (useDefaultLabel) {
-			diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
+			diskLabel = i18n("%1 Removable Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDROM)) {
 			mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank CD-ROM");
 			}
 		}
@@ -534,7 +537,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/cd-r" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank CD-R");
 			}
 		}
@@ -543,7 +547,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank CD-RW");
 			}
 		}
@@ -552,7 +557,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank Magneto-Optical CD");
 			}
 		}
@@ -561,7 +567,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank Mount Ranier CD-RW");
 			}
 		}
@@ -570,7 +577,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankcd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank Mount Ranier CD-RW-W");
 			}
 		}
@@ -579,7 +587,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank DVD-ROM");
 			}
 		}
@@ -588,7 +597,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank DVD-RAM");
 			}
 		}
@@ -597,7 +607,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank DVD-R");
 			}
 		}
@@ -606,7 +617,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank DVD-RW");
 			}
 		}
@@ -615,7 +627,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank Dual Layer DVD-R");
 			}
 		}
@@ -624,7 +637,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank Dual Layer DVD-RW");
 			}
 		}
@@ -633,7 +647,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank DVD+R");
 			}
 		}
@@ -642,7 +657,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank DVD+RW");
 			}
 		}
@@ -651,7 +667,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank Dual Layer DVD+R");
 			}
 		}
@@ -660,7 +677,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankdvd";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank Dual Layer DVD+RW");
 			}
 		}
@@ -669,7 +687,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankbluray";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank BLURAY-ROM");
 			}
 		}
@@ -678,7 +697,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankbluray";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank BLURAY-R");
 			}
 		}
@@ -687,7 +707,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankbluray";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank BLURAY-RW");
 			}
 		}
@@ -696,7 +717,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankbluray";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank HDDVD-ROM");
 			}
 		}
@@ -705,7 +727,8 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankbluray";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank HDDVD-R");
 			}
 		}
@@ -714,14 +737,16 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
 			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
 				mimeType = "media/blankbluray";
-				medium->unmountableState("");
+				medium->setMountable(false);
+				medium->setBaseURL(TQString::null);
 				diskLabel = i18n("Blank HDDVD-RW");
 			}
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDAudio)) {
 			mimeType = "media/audiocd";
-			medium->unmountableState("audiocd:/?device=" + sdevice->deviceNode());
+			medium->setMountable(false);
+			medium->setBaseURL("audiocd:/?device=" + sdevice->deviceNode());
 			diskLabel = i18n("Audio CD");
 		}
 
@@ -746,12 +771,11 @@ 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 Device").arg(sdevice->deviceFriendlySize());
+				diskLabel = i18n("%1 Removable Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 			}
 		}
 
@@ -769,9 +793,10 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		}
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::MediaDevice)) {
 			medium->setIconName("ipod" + MOUNTED_ICON_SUFFIX);
-			if (sdevice->vendorModel().upper().contains("IPOD") && KProtocolInfo::isKnownProtocol( TQString("ipod") ) ) {
-				medium->unmountableState( "ipod:/" );
-				medium->mountableState(!sdevice->mountPath().isNull());
+			if (sdevice->vendorModel().upper().contains("IPOD") && KProtocolInfo::isKnownProtocol(TQString("ipod"))) {
+				medium->setBaseURL("ipod:/");
+				medium->setMountable(true);
+				medium->setMounted(!sdevice->mountPath().isEmpty());
 			}
 		}
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::Tape)) {
@@ -782,15 +807,6 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		}
 	}
 
-	if (!medium->needMounting()) {
-		if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) {
-			if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::UsedByDevice)) {
-				// Encrypted base devices must be set to this mimetype or they won't open when the base device node is passed to the tdeioslave
-				mimeType = "media/removable_mounted";
-			}
-		}
-	}
-
 	medium->setLabel(diskLabel);
 	medium->setMimeType(mimeType);
 }
@@ -813,22 +829,38 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
 	// Any more?
 	if ((sdevice->isDiskOfType(TDEDiskDeviceType::Zip)) || (sdevice->isDiskOfType(TDEDiskDeviceType::Jaz))) {
 		medium->setName(generateName(sdevice->deviceNode()));
-		if ((sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) || (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt))) {
+		if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted)) {
 			medium->setEncrypted(true);
+			medium->setLocked(!sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt));
 		}
 		else {
 			medium->setEncrypted(false);
 		}
 
-		// USAGE: mountableState(Device node, Mount point, Filesystem type, Mounted ?)
-		medium->mountableState(sdevice->deviceNode(), sdevice->mountPath(), sdevice->fileSystemName(), !sdevice->mountPath().isNull());
+		if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS) || sdevice->isDiskOfType(TDEDiskDeviceType::OtherCrypted) ||
+				sdevice->fileSystemUsage().upper() == "RAID") {
+			// Encrypted disks or device underlying other devices are not mountable
+			medium->setMountable(false);
+		}
+		else {
+			medium->setMountable(true);
+		}
+
+		medium->setDeviceNode(sdevice->deviceNode());
+		medium->setMountPoint(sdevice->mountPath());
+		medium->setFsType(sdevice->fileSystemName());
+		medium->setMounted(!sdevice->mountPath().isEmpty());
 	}
 
 	if (sdevice->isDiskOfType(TDEDiskDeviceType::Floppy)) {
 		setFloppyMountState(medium);
 
 		// We don't use the routine above as floppy disks are extremely slow (we don't want them accessed at all during media listing)
-		medium->mountableState(sdevice->deviceNode(), sdevice->mountPath(), sdevice->fileSystemName(), !sdevice->mountPath().isNull());
+		medium->setMountable(true);
+		medium->setDeviceNode(sdevice->deviceNode());
+		medium->setMountPoint(sdevice->mountPath());
+		medium->setFsType(sdevice->fileSystemName());
+		medium->setMounted(!sdevice->mountPath().isEmpty());
 
 		if (sdevice->mountPath().isNull()) {
 			medium->setMimeType("media/floppy_unmounted");
@@ -850,7 +882,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
 		// Set label
 		TQString diskLabel = sdevice->diskLabel();
 		if (diskLabel.isNull()) {
-			diskLabel = i18n("%1 Zip Disk").arg(sdevice->deviceFriendlySize());
+			diskLabel = i18n("%1 Zip Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 		medium->setLabel(diskLabel);
 	}
@@ -885,7 +917,8 @@ void TDEBackend::setCameraProperties(Medium* medium)
 		device.sprintf("camera://@[usb:%s,%s]/", devNode0.ascii(), devNode1.ascii());
 	}
 
-	medium->unmountableState(device);
+	medium->setMountable(false);
+	medium->setBaseURL(device);
 	medium->setMimeType("media/gphoto2camera");
 	medium->setIconName(TQString::null);
 
@@ -909,7 +942,11 @@ void TDEBackend::setFloppyMountState( Medium *medium )
 		if ((*it)->mountedFrom() == medium->deviceNode() ) {
 			fstype = (*it)->mountType().isNull() ? (*it)->mountType() : "auto";
 			mountpoint = (*it)->mountPoint();
-			medium->mountableState( medium->deviceNode(), mountpoint, fstype, true );
+			medium->setMountable(true);
+			medium->setDeviceNode(medium->deviceNode());
+			medium->setMountPoint(mountpoint);
+			medium->setFsType(fstype);
+			medium->setMounted(true);
 			return;
 		}
 	}
@@ -997,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;
@@ -1173,23 +1210,19 @@ bool TDEBackend::setMountoptions(const TQString &name, const TQStringList &optio
 	return true;
 }
 
-void TDEBackend::slotPasswordReady() {
-	m_decryptionPassword = m_unlockDialog->getPassword();
-	m_decryptPasswordValid = true;
-}
-
-void TDEBackend::slotPasswordCancel() {
-	m_decryptionPassword = TQString::null;
-	m_decryptPasswordValid = true;
-}
-
 TQStringVariantMap TDEBackend::mount(const Medium *medium)
 {
 	kdDebug(1219) << "TDEBackend::mount for medium " << medium->name() << endl;
 
 	TQStringVariantMap result;
-	if (medium->isMounted()) {
-		result["result"] = true;
+	if (!medium->isMountable()) {
+		result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
+		result["result"] = false;
+		return result;
+	}
+	else if (medium->isMounted()) {
+		result["errStr"] = i18n("%1 is already mounted to %2.").arg(medium->deviceNode()).arg(medium->mountPoint());
+		result["result"] = false;
 		return result;
 	}
 
@@ -1201,7 +1234,7 @@ 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.
@@ -1222,7 +1255,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
 	if (!sdevice) {
-		result["errStr"] = i18n("Internal error. Couldn't find medium.");
+		result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
 		result["result"] = false;
 		return result;
 	}
@@ -1242,99 +1275,13 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
 	}
 
 	TQString qerror;
-	if (!medium->isEncrypted()) {
-		// normal volume
-		TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, valids);
-		TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
-		if (mountedPath.isEmpty()) {
-			qerror = i18n("Unable to mount this device.");
-			TQString errStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : TQString::null;
-			if (!errStr.isEmpty()) {
-				qerror.append(i18n("<p>Technical details:<br>").append(errStr));
-			}
-		}
-	}
-	else {
-		TQString iconName = medium->iconName();
-		if (iconName.isEmpty())
-		{
-			TQString mime =  medium->mimeType();
-			iconName = KMimeType::mimeType(mime)->icon(mime, false);
-		}
-
-		bool continue_trying_to_decrypt = true;
-		while (continue_trying_to_decrypt == true) {
-			m_decryptPasswordValid = false;
-
-			m_unlockDialog = new Dialog(sdevice->deviceNode(), iconName);
-			m_unlockDialog->show();
-
-			connect(m_unlockDialog, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotPasswordReady()));
-			connect(m_unlockDialog, TQT_SIGNAL (cancelClicked()), this, TQT_SLOT (slotPasswordCancel()));
-			connect(this, TQT_SIGNAL (signalDecryptionPasswordError(TQString)), m_unlockDialog, TQT_SLOT (slotDialogError(TQString)));
-
-			while (m_decryptPasswordValid == false) {
-				tqApp->processEvents();
-			}
-
-			m_unlockDialog->setEnabled(false);
-			tqApp->processEvents();
-
-			if (m_decryptionPassword.isNull()) {
-				delete m_unlockDialog;
-				result["errStr"] = i18n("Decryption aborted");
-				result["result"] = false;
-				return result;
-			}
-			else {
-				// Just for some added fun, if udev emits a medium change event, which I then forward, with mounted==0, it stops the MediaProtocol::listDir method dead in its tracks,
-				// and therefore the media:/ tdeioslave won't refresh after the encrypted device mount
-				// Therefore, I need to ignore all change events on this device during the mount process and hope nothing bad happens as a result!
-				if (!m_ignoreDeviceChangeEvents.contains(sdevice->uniqueID())) {
-					m_ignoreDeviceChangeEvents.append(sdevice->uniqueID());
-				}
-
-				// mount encrypted volume with password
-				TQStringVariantMap mountResult = sdevice->mountEncryptedDevice(m_decryptionPassword, diskLabel, valids);
-				TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
-				if (mountedPath.isEmpty()) {
-					if (mountResult.contains("retCode") && mountResult["retCode"].toInt() == 0) {
-						// Mounting was successful
-						// Because the TDE hardware backend is event driven it might take a little while for the new enlock mapped device to show up
-						// Wait up to 30 seconds for it to appear...
-						for (int i=0;i<300;i++) {
-							mountedPath = sdevice->mountPath();
-							if (!mountedPath.isEmpty()) {
-								break;
-							}
-							tqApp->processEvents(50);
-							usleep(50000);
-						}
-					}
-				}
-				if (mountedPath.isEmpty()) {
-					if (mountResult.contains("retCode") && mountResult["retCode"].toInt() == 25600) {
-						// Probable LUKS failure
-						// Retry
-						m_unlockDialog->setEnabled(true);
-						continue_trying_to_decrypt = true;
-					}
-					else {
-						qerror = i18n("Cannot mount encrypted locked drives!");
-						qerror = i18n("Unable to mount this device.");
-						TQString errStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : TQString::null;
-						if (!errStr.isEmpty()) {
-							qerror.append(i18n("<p>Technical details:<br>").append(errStr));
-						}
-						continue_trying_to_decrypt = false;
-					}
-				}
-				else {
-					continue_trying_to_decrypt = false;
-				}
-
-				delete m_unlockDialog;
-			}
+	TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, valids);
+	TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
+	if (mountedPath.isEmpty()) {
+		qerror = i18n("<b>Unable to mount this device.</b>");
+		TQString errStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : TQString::null;
+		if (!errStr.isEmpty()) {
+			qerror.append(i18n("<p>Technical details:<br>").append(errStr));
 		}
 	}
 
@@ -1373,16 +1320,20 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 	kdDebug(1219) << "TDEBackend::unmount for id " << id << endl;
 
 	TQStringVariantMap result;
-
-	const Medium* medium = m_mediaList.findById(id);
+	const Medium *medium = m_mediaList.findById(id);
 	if (!medium) {
 		result["errStr"] = i18n("No such medium: %1").arg(id);
 		result["result"] = false;
 		return result;
 	}
-
-	if (!medium->isMounted()) {
-		result["result"] = true;
+	else if (!medium->isMountable()) {
+		result["errStr"] = i18n("%1 is not a mountable media.").arg(medium->deviceNode());
+		result["result"] = false;
+		return result;
+	}
+	else if (!medium->isMounted()) {
+		result["errStr"] = i18n("%1 is already unmounted.").arg(medium->deviceNode());
+		result["result"] = false;
 		return result;
 	}
 
@@ -1394,7 +1345,7 @@ 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.
@@ -1415,7 +1366,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
 	if (!sdevice) {
-		result["errStr"] = i18n("Internal error. Couldn't find medium.");
+		result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
 		result["result"] = false;
 		return result;
 	}
@@ -1428,7 +1379,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 	TQStringVariantMap unmountResult = sdevice->unmountDevice();
 	if (unmountResult["result"].toBool() == false) {
 		// Unmount failed!
-		qerror = i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at "
+		qerror = i18n("The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at "
 		    "<b>%4</b> could not be unmounted. ").arg("system:/media/" + medium->name(), medium->deviceNode(),
 		    medium->prettyLabel(), medium->prettyBaseURL().pathOrURL());
 		TQString errStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : TQString::null;
@@ -1441,7 +1392,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 		// Failed as BUSY
 		TQString processesUsingDev = listUsingProcesses(medium);
 		if (!processesUsingDev.isNull()) {
-			if (KMessageBox::warningYesNo(0, i18n("<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently "
+			if (KMessageBox::warningYesNo(0, i18n("The device <b>%1</b> (%2) named <b>'%3'</b> and currently "
 			    "mounted at <b>%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to forcibly "
 			    "terminate these processes?</b><br><i>All unsaved data would be lost</i>").arg("system:/media/" +
 			    medium->name()).arg(medium->deviceNode()).arg(medium->prettyLabel()).arg(medium->prettyBaseURL().pathOrURL())
@@ -1450,7 +1401,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 				unmountResult = sdevice->unmountDevice();
 				if (unmountResult["result"].toBool() == false) {
 					// Unmount failed!
-					qerror = i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at "
+					qerror = i18n("The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at "
 					    "<b>%4</b> could not be unmounted. ").arg("system:/media/" + medium->name(), medium->deviceNode(),
 					    medium->prettyLabel(), medium->prettyBaseURL().pathOrURL());
 					TQString errStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : TQString::null;
@@ -1476,10 +1427,225 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 		m_mediaList.removeMedium(uid, true);
 	}
 
+	ResetProperties(sdevice, false, true);
+	result["result"] = true;
+	return result;
+}
+
+TQStringVariantMap TDEBackend::unlock(const TQString &id, const TQString &password)
+{
+	kdDebug(1219) << "TDEBackend::unlock for id " << id << endl;
+
+	TQStringVariantMap result;
+	const Medium *medium = m_mediaList.findById(id);
+	if (!medium) {
+		result["errStr"] = i18n("No such medium: %1").arg(id);
+		result["result"] = false;
+		return result;
+	}
+	else if (!medium->isEncrypted()) {
+		result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
+		result["result"] = false;
+		return result;
+	}
+	else if (!medium->needUnlocking()) {
+		result["errStr"] = i18n("%1 is already unlocked.").arg(medium->deviceNode());
+		result["result"] = false;
+		return result;
+	}
+
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+	TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
+	if (!sdevice) {
+		result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
+		result["result"] = false;
+		return result;
+	}
+
+	TQStringVariantMap unlockResult = sdevice->unlockDevice(password);
+	if (unlockResult["result"].toBool() == false) {
+		TQString qerror = i18n("<b>Unable to unlock the device.</b>");
+		TQString errStr = unlockResult.contains("errStr") ? unlockResult["errStr"].toString() : TQString::null;
+		if (!errStr.isEmpty()) {
+			qerror.append(i18n("<p>Technical details:<br>").append(errStr));
+		result["errStr"] = qerror;
+		result["result"] = false;
+		return result;
+		}
+	}
+
+	ResetProperties(sdevice, false, true);
+	result["result"] = true;
+	return result;
+}
+
+TQStringVariantMap TDEBackend::lock(const TQString &id, bool releaseHolders)
+{
+	kdDebug(1219) << "TDEBackend::lock for id " << id << ", release holders "
+		            << releaseHolders << endl;
+
+	TQStringVariantMap result;
+
+	const Medium *medium = m_mediaList.findById(id);
+	if (!medium) {
+		result["errStr"] = i18n("No such medium: %1").arg(id);
+		result["result"] = false;
+		return result;
+	}
+	else if (!medium->isEncrypted()) {
+		result["errStr"] = i18n("%1 is not an encrypted media.").arg(medium->deviceNode());
+		result["result"] = false;
+		return result;
+	}
+	else if (medium->needUnlocking()) {
+		result["errStr"] = i18n("%1 is already locked.").arg(medium->deviceNode());
+		result["result"] = false;
+		return result;
+	}
+
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+	TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
+	if (!sdevice) {
+		result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
+		result["result"] = false;
+		return result;
+	}
+
+	// Release device holders if requested
+	if (releaseHolders)
+	{
+		releaseHolderDevices(medium->deviceNode(), false);
+	}
+
+	TQStringVariantMap lockResult = sdevice->lockDevice();
+	if (lockResult["result"].toBool() == false) {
+		TQString qerror = i18n("<b>Unable to lock the device.</b>");
+		TQString errStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : TQString::null;
+		if (!errStr.isEmpty()) {
+			qerror.append(i18n("<p>Technical details:<br>").append(errStr));
+		result["errStr"] = qerror;
+		result["result"] = false;
+		return result;
+		}
+	}
+
+	ResetProperties(sdevice, false, true);
 	result["result"] = true;
 	return result;
 }
 
+TQStringVariantMap TDEBackend::eject(const TQString &id)
+{
+	kdDebug(1219) << "TDEBackend::eject for id " << id << endl;
+
+	TQStringVariantMap result;
+
+	const Medium *medium = m_mediaList.findById(id);
+	if (!medium)
+	{
+		result["errStr"] = i18n("No such medium: %1").arg(id);
+		result["result"] = false;
+		return result;
+	}
+
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+	TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
+	if (!sdevice)
+	{
+		result["errStr"] = i18n("Internal error. Couldn't find medium id %1.").arg(medium->id());
+		result["result"] = false;
+		return result;
+	}
+
+	TQStringVariantMap ejectResult = sdevice->ejectDrive();
+	if (ejectResult["result"].toBool() == false)
+	{
+		TQString qerror = i18n("<b>Unable to eject the device.</b>");
+		TQString errStr = ejectResult.contains("errStr") ? ejectResult["errStr"].toString() : TQString::null;
+		if (!errStr.isEmpty())
+		{
+			qerror.append(i18n("<p>Technical details:<br>").append(errStr));
+			result["errStr"] = qerror;
+			result["result"] = false;
+			return result;
+		}
+	}
+
+	result["result"] = true;
+	return result;
+}
+
+TQStringVariantMap TDEBackend::safeRemove(const TQString &id)
+{
+	kdDebug(1219) << "TDEBackend::safeRemove for id " << id << endl;
+
+	TQStringVariantMap result;
+
+	const Medium *medium = m_mediaList.findById(id);
+	if (!medium)
+	{
+		result["errStr"] = i18n("No such medium: %1").arg(id);
+		result["result"] = false;
+		return result;
+	}
+
+	releaseHolderDevices(medium->deviceNode(), true);
+	return eject(id);
+}
+
+void TDEBackend::releaseHolderDevices(const TQString &deviceNode, bool handleThis)
+{
+	kdDebug(1219) << "TDEBackend::releaseHolderDevices for node " << deviceNode
+	              << ", handle this " << (handleThis ? "yes" : "no") << endl;
+
+	const Medium *medium = m_mediaList.findByNode(deviceNode);
+	if (!medium)
+	{
+		return;
+	}
+
+	// Scan the holding devices and unmount/lock them if possible
+	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
+	TDEStorageDevice *sdevice = hwdevices->findDiskByUID(medium->id());
+	if (sdevice)
+	{
+		TQStringList holdingDeviceList = sdevice->holdingDevices();
+		for (TQStringList::Iterator holdingDevIt = holdingDeviceList.begin(); holdingDevIt != holdingDeviceList.end(); ++holdingDevIt)
+		{
+			TDEGenericDevice *hwHolderDevice = hwdevices->findBySystemPath(*holdingDevIt);
+			if (hwHolderDevice->type() == TDEGenericDeviceType::Disk)
+			{
+				TDEStorageDevice *holderSDevice = static_cast<TDEStorageDevice*>(hwHolderDevice);
+				const Medium *holderMedium = m_mediaList.findByNode(holderSDevice->deviceNode());
+				if (holderMedium && !holderMedium->id().isEmpty())
+				{
+					releaseHolderDevices(holderMedium->deviceNode(), true);
+				}
+			}
+		}
+	}
+
+	if (handleThis)
+	{
+		// Unmount if necessary
+		if (medium->isMountable() && medium->isMounted())
+		{
+			unmount(medium->id());
+			// Must process udev events before continuing, to make sure all
+			// affected devices are properly updated
+			tqApp->processEvents();
+		}
+		// Lock if necessary.
+		if (medium->isEncrypted() && !medium->isLocked())
+		{
+			lock(medium->id(), false);
+			// Must process udev events before continuing, to make sure all
+			// affected devices are properly updated
+			tqApp->processEvents();
+		}
+	}
+}
+
 void TDEBackend::slotResult(TDEIO::Job *job)
 {
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -1491,8 +1657,7 @@ void TDEBackend::slotResult(TDEIO::Job *job)
 	if (job->error() == TDEIO::ERR_COULD_NOT_UNMOUNT) {
 		TQString proclist(listUsingProcesses(medium));
 
-		qerror = "<qt>";
-		qerror += "<p>" + i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and "
+		qerror += "<p>" + i18n("The device <b>%1</b> (%2) named <b>'%3'</b> and "
 			"currently mounted at <b>%4</b> could not be unmounted. ").arg(
 				"system:/media/" + medium->name(),
 				medium->deviceNode(),
@@ -1504,7 +1669,6 @@ void TDEBackend::slotResult(TDEIO::Job *job)
 		if (!proclist.isEmpty()) {
 			qerror += proclist;
 		}
-		qerror += "</qt>";
 	} else if (job->error()) {
 		qerror = job->errorText();
 	}
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.h b/tdeioslave/media/mediamanager/tdehardwarebackend.h
index 5c6ce1260..0c3f84410 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.h
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.h
@@ -44,7 +44,7 @@ class Dialog;
 
 class TDEBackend : public TQObject, public BackendBase
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/**
@@ -68,11 +68,13 @@ public:
 
 	bool setMountoptions(const TQString &id, const TQStringList &options);
 
-	TQStringVariantMap mount(const TQString &id);
 	TQStringVariantMap mount(const Medium *medium);
+	TQStringVariantMap mount(const TQString &id);
 	TQStringVariantMap unmount(const TQString &id);
-// 	TQStringVariantMap unlock(const TQString &id, const TQString &password);
-// 	TQStringVariantMap lock(const TQString &id);
+	TQStringVariantMap unlock(const TQString &id, const TQString &password);
+	TQStringVariantMap lock(const TQString &id, bool releaseHolders);
+	TQStringVariantMap eject(const TQString &id);
+	TQStringVariantMap safeRemove(const TQString &uid);
 
 private:
 	/**
@@ -103,9 +105,6 @@ private slots:
 	void RemoveDeviceHandler(TDEGenericDevice* device);
 	void ModifyDeviceHandler(TDEGenericDevice* device);
 
-	void slotPasswordReady();
-	void slotPasswordCancel();
-
 signals:
 	void signalDecryptionPasswordError(TQString);
 
@@ -120,28 +119,19 @@ private:
 	*/
 	void ResetProperties(TDEStorageDevice * sdevice, bool allowNotification=false, bool overrideIgnoreList=false);
 
-	/**
-	* Find the medium that is concerned with device udi
-	*/
-// 	const char* findMediumUdiFromUdi(const char* udi);
-
 	void setVolumeProperties(Medium* medium);
 	bool setFloppyProperties(Medium* medium);
-	void setFloppyMountState( Medium* medium );
-// 	bool setFstabProperties(Medium* medium);
+	void setFloppyMountState(Medium* medium);
 	void setCameraProperties(Medium* medium);
+	void releaseHolderDevices(const TQString &deviceNode, bool handleThis);
 	TQString generateName(const TQString &devNode);
+
 	static TQString isInFstab(const Medium *medium);
 	static TQString listUsingProcesses(const Medium *medium);
 	static TQString killUsingProcesses(const Medium *medium);
 
 	TQString driveUDIFromDeviceUID(TQString uuid);
 
-	// Decryption
-	Dialog* m_unlockDialog;
-	TQString m_decryptionPassword;
-	bool m_decryptPasswordValid;
-
 private slots:
 	void slotResult(TDEIO::Job *job);
 
diff --git a/tdeioslave/media/medianotifier/CMakeLists.txt b/tdeioslave/media/medianotifier/CMakeLists.txt
index ff2a8d802..215ee6de3 100644
--- a/tdeioslave/media/medianotifier/CMakeLists.txt
+++ b/tdeioslave/media/medianotifier/CMakeLists.txt
@@ -14,6 +14,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}/tdeioslave/media/libmediacommon
   ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
   ${CMAKE_SOURCE_DIR}/tdmlib
+  ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index 069e205de..2510019f2 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -19,14 +19,18 @@
 
 #include "medianotifier.h"
 
-#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)\
+ || defined(Q_OS_SOLARIS)
+#ifdef Q_OS_SOLARIS
+#include <sys/types.h>
+#endif /* Q_OS_SOLARIS */
 #include <sys/statvfs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #else
 #include <sys/vfs.h>
 #endif
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(Q_OS_SOLARIS)
 #define statfs statvfs
 #endif
 
@@ -65,7 +69,7 @@ MediaNotifier::MediaNotifier(const TQCString &name) : KDEDModule(name)
 
 	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;
 }
@@ -119,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 )
@@ -343,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();
 		}
@@ -403,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() ) );
         }
     }
 }
@@ -421,7 +425,7 @@ void MediaNotifier::slotFreeCancel()
 
 void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res )
 {
-    TQCheckBox *checkbox = ::tqqt_cast<TQCheckBox*>( m_freeDialog->child( 0, TQCHECKBOX_OBJECT_NAME_STRING ) );
+    TQCheckBox *checkbox = ::tqt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
     if ( checkbox && checkbox->isChecked() )
         KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res);
     m_freeDialog->delayedDestruct();
diff --git a/tdeioslave/media/medianotifier/medianotifier.h b/tdeioslave/media/medianotifier/medianotifier.h
index 84eee525c..c45db66c1 100644
--- a/tdeioslave/media/medianotifier/medianotifier.h
+++ b/tdeioslave/media/medianotifier/medianotifier.h
@@ -34,7 +34,7 @@ typedef TQPtrList<NotificationDialog> NotificationDialogList;
 
 class MediaNotifier:  public KDEDModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 
 public:
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index 7e4004e8c..a8bb81ea5 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -17,6 +17,10 @@
    Boston, MA 02110-1301, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "notificationdialog.h"
 #include <tqlayout.h>
 
@@ -28,7 +32,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #endif
 
@@ -40,7 +44,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
 	: KDialogBase( parent, name, false, i18n( "Medium Detected" ), Ok|Cancel|User1, Ok, true),
 	  m_medium(medium), m_settings( settings )
 {
-	setCaption( TDEIO::decodeFileName(m_medium.name()) );
+	setCaption( m_medium.text() );
 	clearWState( WState_Polished );
 
 	TQWidget *page = new TQWidget( this );
@@ -50,13 +54,14 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
 	m_view = new NotificationDialogView( page );
 
 	topLayout->addWidget(m_view);
-	m_view->iconLabel->setPixmap( m_medium.pixmap(64) );
-	m_view->mimetypeLabel->setText( i18n( "<b>Medium type:</b>" ) + " "
-	                              + m_medium.mimeTypePtr()->comment() );
+	m_view->iconLabel->setPixmap(m_medium.pixmap(64));
+	m_view->mimetypeLabel->setText(i18n("<b>Name:</b>") + "&#9;" + m_medium.text() + "<br/>" +
+	    i18n("<b>Type:</b>") + "&#9;" + m_medium.mimeTypePtr()->comment() + "<br/>" +
+	    i18n("<b>Url:</b>") + "&#9;" + m_medium.url().prettyURL());
 
 	updateActionsListBox();
 
-	resize( TQSize(400,400).expandedTo( minimumSizeHint() ) );
+	resize( TQSize(500,500).expandedTo( minimumSizeHint() ) );
 
 
 	m_actionWatcher = new KDirWatch();
@@ -66,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/medianotifier/notificationdialog.h b/tdeioslave/media/medianotifier/notificationdialog.h
index 16bedb842..9f1f8057f 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.h
+++ b/tdeioslave/media/medianotifier/notificationdialog.h
@@ -31,7 +31,7 @@
 
 class NotificationDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	NotificationDialog( KFileItem medium, NotifierSettings *settings,
diff --git a/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
index f4f288d10..50a23de70 100644
--- a/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked CD-R
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
index 4826eddfa..c410a4e43 100644
--- a/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked CD-R
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
index b5d3cabf0..5edac87e4 100644
--- a/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked CD-RW
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
index c64bb19f8..6dd0de842 100644
--- a/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked CD-RW
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop
index e5b7e80c9..6dc794dff 100644
--- a/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked CD-ROM
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop
index 4731ffe4e..011228a88 100644
--- a/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked CD-ROM
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop b/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop
index 0450a29ed..d4e3b25bd 100644
--- a/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked DVD
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop
index 16e0a86a8..a4a66904a 100644
--- a/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked DVD
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop b/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop
index 7de6c35cb..d4cc6d261 100644
--- a/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked Hard Disk Volume
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop
index 9e944ef58..7c91927aa 100644
--- a/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked Hard Disk Volume
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop b/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop
index 66671c168..d97745e12 100644
--- a/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Locked Removable Medium
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop
index 94e81353b..fd98df9c0 100644
--- a/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop
@@ -9,4 +9,3 @@ Comment=Encrypted Unlocked Removable Medium
 Patterns=
 
 X-TDE-AutoEmbed=true
-X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mounthelper/CMakeLists.txt b/tdeioslave/media/mounthelper/CMakeLists.txt
index 90afad33f..cf7ca553f 100644
--- a/tdeioslave/media/mounthelper/CMakeLists.txt
+++ b/tdeioslave/media/mounthelper/CMakeLists.txt
@@ -12,6 +12,7 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/tdeioslave/media/libmediacommon
+  ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -31,6 +32,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK mediacommon-static tdeio-shared
+  LINK mediacommon-static tdeio-shared ${TDEHW_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp
index f2cdb6b53..a257ca6d8 100644
--- a/tdeioslave/media/mounthelper/dialog.cpp
+++ b/tdeioslave/media/mounthelper/dialog.cpp
@@ -23,11 +23,10 @@
 #include "dialog.h"
 
 Dialog::Dialog(TQString url, TQString iconName) :
-	KDialogBase(NULL, "Dialog", true, "Unlock Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
+	KDialogBase(NULL, "Dialog", true, i18n("Unlock Storage Device"), (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
 {
 	unlockDialog = new UnlockDialog(this);
 
-	unlockDialog->errorBox->hide();
 	unlockDialog->descLabel->setText(unlockDialog->descLabel->text().arg(url));
 	unlockDialog->descLabel->adjustSize();
 	unlockDialog->adjustSize();
@@ -37,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);
 }
@@ -52,14 +51,6 @@ TQString Dialog::getPassword()
 	return unlockDialog->passwordEdit->text();
 }
 
-void Dialog::slotDialogError(TQString errorMsg)
-{
-	kdDebug() << __func__ << "(" << errorMsg << " )" << endl;
-
-	unlockDialog->errorLabel->setText(TQString("<b>%1</b>").arg(errorMsg));
-	unlockDialog->errorBox->show();
-}
-
 void Dialog::slotPasswordChanged(const TQString &text)
 {
 	enableButton( User1, !text.isEmpty() );
diff --git a/tdeioslave/media/mounthelper/dialog.h b/tdeioslave/media/mounthelper/dialog.h
index 8444ec7dd..d2b2925a9 100644
--- a/tdeioslave/media/mounthelper/dialog.h
+++ b/tdeioslave/media/mounthelper/dialog.h
@@ -36,12 +36,10 @@
 
 #include "unlockdialog.h"
 
-class KryptoMedia;
-
 class Dialog : public KDialogBase
 {
 
-Q_OBJECT	
+TQ_OBJECT	
 
 public:
 	Dialog(TQString url, TQString iconName);
@@ -50,7 +48,6 @@ public:
 	TQString getPassword();
 
 public slots:
-	void slotDialogError(TQString errorMsg);
 	void slotPasswordChanged(const TQString &text);
 
 private:
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 65b53a0f4..90f3caa3f 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -19,6 +19,10 @@
    Boston, MA 02110-1301, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
 #include <tdeapplication.h>
@@ -33,223 +37,238 @@
 #include <kprocess.h>
 #include <tdestartupinfo.h>
 #include <kmimetype.h>
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #endif
 
 #include "dialog.h"
 #include "tdeio_media_mounthelper.h"
 
-const Medium MountHelper::findMedium(const KURL &url)
+const Medium MountHelper::findMedium(const TQString &device)
 {
 	DCOPRef mediamanager("kded", "mediamanager");
-
-	// Try filename first
-	DCOPReply reply = mediamanager.call( "properties", url.fileName() );
-	if ( !reply.isValid() ) {
-		m_errorStr = i18n("The TDE mediamanager is not running.")+"\n";
+	DCOPReply reply = mediamanager.call("properties", device);
+	if (!reply.isValid())
+	{
+		m_errorStr = i18n("The TDE mediamanager is not running.\n");
 		return Medium(TQString::null, TQString::null, TQString::null);
 	}
-	const Medium& medium = Medium::create(reply);
-	if ( medium.id().isEmpty() ) {
-		// Try full URL now
-		reply = mediamanager.call( "properties", url.prettyURL() );
-		if ( !reply.isValid() ) {
-			m_errorStr = i18n("Internal Error");
-			return Medium(TQString::null, TQString::null, TQString::null);
-		}
-		return Medium::create(reply);
-	} else {
-		return medium;
-	}
+	const Medium &medium = Medium::create(reply);
+	return medium;
 }
 
-MountHelper::MountHelper() : TDEApplication()
+void MountHelper::mount(const Medium &medium)
 {
-	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
+	DCOPRef mediamanager("kded", "mediamanager");
+	DCOPReply reply = mediamanager.call("mount", medium.id());
+	TQStringVariantMap mountResult;
+	if (reply.isValid()) {
+		reply.get(mountResult);
+	}
+	if (!mountResult.contains("result") || !mountResult["result"].toBool()) {
+		m_errorStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : i18n("Unknown mount error.");
+		errorAndExit();
+	}
+}
 
-	m_errorStr = TQString::null;
+void MountHelper::unmount(const Medium &medium)
+{
+	DCOPRef mediamanager("kded", "mediamanager");
+	DCOPReply reply = mediamanager.call("unmount", medium.id());
+	TQStringVariantMap unmountResult;
+	if (reply.isValid()) {
+		reply.get(unmountResult);
+	}
+	if (!unmountResult.contains("result") || !unmountResult["result"].toBool()) {
+		m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
+		kdDebug() << "medium unmount " << m_errorStr << endl;
+		errorAndExit();
+	}
+}
 
-	KURL url(args->url(0));
-	const Medium medium = findMedium(url);
+void MountHelper::unlock(const Medium &medium)
+{
+	TQString device = medium.deviceNode();
+	if (device.isEmpty()) {
+		m_errorStr = i18n("Try to unlock an unknown medium.");
+		errorAndExit();
+	}
 
-	if (medium.id().isEmpty())
+	TQString iconName = medium.iconName();
+	if (iconName.isEmpty())
 	{
-		if (m_errorStr.isEmpty()) {
-			m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL());
-		}
-		TQTimer::singleShot(0, this, TQT_SLOT(error()) );
-		return;
+		TQString mime = medium.mimeType();
+		iconName = KMimeType::mimeType(mime)->icon(mime, false);
 	}
+	m_mediumId = medium.id();
+	m_dialog = new Dialog(device, iconName);
+	connect(m_dialog, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotSendPassword()));
+	connect(m_dialog, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancel()));
+	m_dialog->show();
+}
 
-	if (!medium.isMountable() && !args->isSet("e") && !args->isSet("s"))
+void MountHelper::lock(const Medium &medium)
+{
+	DCOPRef mediamanager("kded", "mediamanager");
+	DCOPReply reply = mediamanager.call("lock", medium.id(), true);
+	TQStringVariantMap lockResult;
+	if (reply.isValid()) {
+		reply.get(lockResult);
+	}
+	if (!lockResult.contains("result") || !lockResult["result"].toBool()) {
+		m_errorStr = lockResult.contains("errStr") ? lockResult["errStr"].toString() : i18n("Unknown lock error.");
+		kdDebug() << "medium lock " << m_errorStr << endl;
+		errorAndExit();
+	}
+}
+
+void MountHelper::eject(const Medium &medium)
+{
+#ifdef WITH_TDEHWLIB
+	DCOPRef mediamanager("kded", "mediamanager");
+	DCOPReply reply = mediamanager.call("eject", medium.id());
+	TQStringVariantMap ejectResult;
+	if (reply.isValid()) {
+		reply.get(ejectResult);
+	}
+	if (!ejectResult.contains("result") || !ejectResult["result"].toBool()) {
+		m_errorStr = ejectResult.contains("errStr") ? ejectResult["errStr"].toString() : i18n("Unknown eject error.");
+		kdDebug() << "medium eject " << m_errorStr << endl;
+		errorAndExit();
+	}
+	else
 	{
-		m_errorStr = i18n("%1 is not a mountable media.").arg(url.prettyURL());
-		TQTimer::singleShot(0, this, TQT_SLOT(error()) );
-		return;
+		::exit(0); // Success!
 	}
+#endif
 
-	TQString device = medium.deviceNode();
-	TQString mount_point = medium.mountPoint();
+	// Otherwise fall back to tdeeject
+	TDEProcess *proc = new TDEProcess(this);
+	*proc << "tdeeject";
+	*proc << medium.deviceNode();
+	connect(proc, TQ_SIGNAL(processExited(TDEProcess*)),	this, TQ_SLOT(ejectFinished(TDEProcess*)));
+	proc->start();
+}
+
+void MountHelper::safeRemoval(const Medium &medium)
+{
+	DCOPRef mediamanager("kded", "mediamanager");
+	DCOPReply reply = mediamanager.call("safeRemove", medium.id());
+	TQStringVariantMap safeRemoveResult;
+	if (reply.isValid()) {
+		reply.get(safeRemoveResult);
+	}
+	if (!safeRemoveResult.contains("result") || !safeRemoveResult["result"].toBool()) {
+		m_errorStr = safeRemoveResult.contains("errStr") ? safeRemoveResult["errStr"].toString() : i18n("Unknown safe removal error.");
+		kdDebug() << "medium safeRemoval " << m_errorStr << endl;
+		errorAndExit();
+	}
+}
 
-	m_isCdrom = medium.mimeType().find("dvd") != -1 || medium.mimeType().find("cd") != -1;
+void MountHelper::openRealFolder(const Medium &medium)
+{
+	Medium &m = const_cast<Medium&>(medium);
+	if (!m.isMounted())
+	{
+		// If the medium is not mounted, try mounting it first
+		mount(m);
+		m = findMedium(m.deviceNode());
+	}
 
-	if (args->isSet("d"))
+	if (m.isMounted())
 	{
-		if (!medium.isEncrypted())
-		{
-			m_errorStr = i18n("%1 is not an encrypted media.").arg(url.prettyURL());
-			TQTimer::singleShot(0, this, TQT_SLOT(error()) );
-			return;
-		}
-		if (!medium.needDecryption())
-		{
-			m_errorStr = i18n("%1 is already unlocked.").arg(url.prettyURL());
-			TQTimer::singleShot(0, this, TQT_SLOT(error()));
-			return;
-		}
+		system((TQString("kfmclient exec 'file://") + m.mountPoint()).local8Bit() + "'");
+	}
+	else
+	{
+		m_errorStr = i18n("Try to open an unknown medium.");
+		errorAndExit();
+	}
+}
 
-		TQString iconName = medium.iconName();
-		if (iconName.isEmpty())
-		{
-			TQString mime = medium.mimeType();
-			iconName = KMimeType::mimeType(mime)->icon(mime, false);
+MountHelper::MountHelper() : TDEApplication()
+{
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
+	m_errorStr = TQString::null;
+
+	const Medium medium = findMedium(args->arg(0));
+	if (medium.id().isEmpty())
+	{
+		if (m_errorStr.isEmpty()) {
+			m_errorStr+= i18n("%1 cannot be found.").arg(args->arg(0));
 		}
+		errorAndExit();
+	}
 
-		m_mediumId = medium.id();
-		dialog = new Dialog(url.prettyURL(), iconName);
-		dialog->show();
+	TQString device = medium.deviceNode();
+	if (!medium.isMountable() && !medium.isEncrypted() && !args->isSet("e") && !args->isSet("s"))
+	{
+		m_errorStr = i18n("%1 is not a mountable or encrypted media.").arg(device);
+		errorAndExit();
+	}
 
-		connect(dialog, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotSendPassword()));
-		connect(dialog, TQT_SIGNAL (cancelClicked()), this, TQT_SLOT (slotCancel()));
-		connect(this, TQT_SIGNAL (signalPasswordError(TQString)), dialog, TQT_SLOT (slotDialogError(TQString)));
+	if (args->isSet("m"))
+	{
+		mount(medium);
+		::exit(0);
 	}
 	else if (args->isSet("u"))
 	{
-	  DCOPRef mediamanager("kded", "mediamanager");
-	  DCOPReply reply = mediamanager.call("unmount", medium.id());
-	  TQStringVariantMap unmountResult;
-	  if (reply.isValid()) {
-	    reply.get(unmountResult);
-    }
-	  if (unmountResult.contains("result") && unmountResult["result"].toBool()) {
-	    ::exit(0);
-	  }
-	  else {
-			m_errorStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : i18n("Unknown unmount error.");
-		  kdDebug() << "medium unmount " << m_errorStr << endl;
-	    error();
-	  }
-	}
-	else if (args->isSet("s") || args->isSet("e"))
+		unmount(medium);
+		::exit(0);
+	}
+	else if (args->isSet("k"))
 	{
-		DCOPRef mediamanager("kded", "mediamanager");
-
-		/*
-		* We want to call mediamanager unmount before invoking eject. That's
-		* because unmount would provide an informative error message in case of
-		* failure. However, there are cases when unmount would fail
-		* (supermount, slackware, see bug#116209) but eject would succeed.
-		* Thus if unmount fails, save unmount error message and invokeEject()
-		* anyway. Only if both unmount and eject fail, notify the user by
-		* displaying the saved error message (see ejectFinished()).
-		*/
-		TQStringVariantMap unmountResult;
-		if (medium.isMounted())
-		{
-			DCOPReply reply = mediamanager.call( "unmount", medium.id());
-			if (reply.isValid()) {
-				reply.get(unmountResult);
-				if (unmountResult["result"].toBool()) {
-					reply.get(m_errorStr);
-				}
-			}
-		}
-
-		// If this is an unlocked encrypted volume and there is no error yet, we try to lock it
-		if (unmountResult.contains("result") && unmountResult["result"].toBool() &&
-		    medium.isEncrypted() && !medium.clearDeviceUdi().isNull())
-		{
-			DCOPReply reply = mediamanager.call( "undecrypt", medium.id());
-			if (reply.isValid()) {
-			  TQStringVariantMap undecryptResult;
-				reply.get(undecryptResult);
-				if (undecryptResult["result"].toBool()) {
-					reply.get(m_errorStr);
-				}
-			}
-		}
-
-		if (m_errorStr.isNull()) {
-			invokeEject(device, true);
-		}
-		else {
-			error();
-		}
+		unlock(medium);
+		// No call to ::exit() here because this will open up the password dialog
+		// ::exit() is handled in the invoked code.
+	}
+	else if (args->isSet("l"))
+	{
+		lock(medium);
+		::exit(0);
+	}
+	else if (args->isSet("e"))
+	{
+		eject(medium);
+		::exit(0);
+	}
+	else if (args->isSet("s"))
+	{
+		safeRemoval(medium);
+		::exit(0);
+	}
+	else if (args->isSet("f"))
+	{
+		openRealFolder(medium);
+		::exit(0);
 	}
 	else
 	{
-	  DCOPRef mediamanager("kded", "mediamanager");
-	  DCOPReply reply = mediamanager.call("mount", medium.id());
-	  TQStringVariantMap mountResult;
-	  if (reply.isValid()) {
-	    reply.get(mountResult);
-	  }
-	  if (mountResult.contains("result") && mountResult["result"].toBool()) {
-	    ::exit(0);
-	  }
-	  else {
-			m_errorStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : i18n("Unknown mount error.");
-	    error();
-	  }
+		TDECmdLineArgs::usage();
+		::exit(0);
 	}
 }
 
-void MountHelper::invokeEject(const TQString &device, bool quiet)
+MountHelper::~MountHelper()
 {
-#ifdef __TDE_HAVE_TDEHWLIB
-	// Try TDE HW library eject first...
-	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);
-	if (hwdevice->type() == TDEGenericDeviceType::Disk) {
-		TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-		if (sdevice->ejectDrive()) {
-			// Success!
-			::exit(0);
-		}
-	}
-#endif
-
-	// Then fall back to tdeeject if needed
-	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));
-	*proc << "tdeeject";
-	if (quiet)
+	if (m_dialog)
 	{
-		*proc << "-q";
+		delete m_dialog;
 	}
-	*proc << device;
-	connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
-		this, TQT_SLOT( ejectFinished(TDEProcess *) ) );
-	proc->start();
 }
 
-void MountHelper::ejectFinished(TDEProcess* proc)
+void MountHelper::ejectFinished(TDEProcess *proc)
 {
-	/*
-	* If eject failed, report the error stored in m_errorStr
-	*/
+	//If eject failed, report the error stored in m_errorStr
 	if (proc->normalExit() && proc->exitStatus() == 0) {
 		::exit(0);
-	} else {
-		if (m_errorStr.isEmpty()) {
-			if (m_isCdrom)
-				m_errorStr = i18n("The device was successfully unmounted, but the tray could not be opened");
-			else
-				m_errorStr = i18n("The device was successfully unmounted, but could not be ejected");
+	}
+	else {
+		if (!m_errorStr.isEmpty()) {
+			errorAndExit();
 		}
-//X Comment this because the error is useless as long as the unmount is successful.
-//X 		TQTimer::singleShot(0, this, TQT_SLOT(error()));
-      ::exit(0);
+		::exit(0);
 	}
 }
 
@@ -262,25 +281,28 @@ void MountHelper::error()
 		}
 	}
 	KMessageBox::error(0, prettyErrorString);
+}
+
+void MountHelper::errorAndExit()
+{
+	error();
 	::exit(1);
 }
 
 void MountHelper::slotSendPassword()
 {
 	DCOPRef mediamanager("kded", "mediamanager");
-
-	DCOPReply reply = mediamanager.call( "decrypt", m_mediumId, dialog->getPassword() );
-	TQStringVariantMap decryptResult;
+	DCOPReply reply = mediamanager.call("unlock", m_mediumId, m_dialog->getPassword());
+	TQStringVariantMap unlockResult;
 	if (reply.isValid()) {
-		reply.get(decryptResult);
+		reply.get(unlockResult);
 	}
-	if (decryptResult.contains("result") && decryptResult["result"].toBool()) {
+	if (unlockResult.contains("result") && unlockResult["result"].toBool()) {
 		::exit(0);
 	}
 	else {
-		m_errorStr = decryptResult.contains("errStr") ? decryptResult["errStr"].toString() : i18n("Unknown decrypt error.");
-		kdDebug() << "medium decrypt " << m_errorStr << endl;
-		emit signalPasswordError(m_errorStr);
+		m_errorStr = unlockResult.contains("errStr") ? unlockResult["errStr"].toString() : i18n("Unknown unlock error.");
+		kdDebug() << "medium unlock " << m_errorStr << endl;
 		error();
 	}
 }
@@ -292,12 +314,14 @@ void MountHelper::slotCancel()
 
 static TDECmdLineOptions options[] =
 {
-	{ "d", I18N_NOOP("Decrypt given URL"), 0 },
+	{ "m", I18N_NOOP("Mount given URL"), 0 },
 	{ "u", I18N_NOOP("Unmount given URL"), 0 },
-	{ "m", I18N_NOOP("Mount given URL (default)"), 0 },
-	{ "e", I18N_NOOP("Eject given URL via tdeeject"), 0},
-	{ "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0},
-	{"!+URL",   I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 },
+	{ "k", I18N_NOOP("Unlock given URL"), 0 },
+	{ "l", I18N_NOOP("Lock given URL"), 0 },
+	{ "e", I18N_NOOP("Eject given URL"), 0},
+	{ "s", I18N_NOOP("Safely remove (unmount and eject) given URL"), 0},
+	{ "f", I18N_NOOP("Open real medium folder"), 0},
+	{"!+URL", I18N_NOOP("media:/URL to mount/unmount/unlock/lock/eject/remove"), 0 },
 	TDECmdLineLastOption
 };
 
@@ -308,13 +332,15 @@ int main(int argc, char **argv)
 	                   "tdeio_media_mounthelper", "tdeio_media_mounthelper",
 	                   "0.1");
 
-	TDECmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::addCmdLineOptions(options);
 	TDEGlobal::locale()->setMainCatalogue("tdeio_media");
 	TDEApplication::addCmdLineOptions();
+	if (TDECmdLineArgs::parsedArgs()->count()==0)
+	{
+		TDECmdLineArgs::usage();
+	}
 
-	if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage();
-	TDEApplication *app = new  MountHelper();
-
+	TDEApplication *app = new MountHelper();
 	TDEStartupInfo::appStarted();
 	app->dcopClient()->attach();
 	return app->exec();
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
index 97df6b7e8..3cdf58488 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Copyright (c) 2004 Kévin Ottens <ervin ipsquad net>
+   Copyright (c) 2004 Kévin Ottens <ervin ipsquad net>
    Parts of this file are
    Copyright 2003 Waldo Bastian <bastian@kde.org>
 
@@ -29,29 +29,37 @@
 #include "medium.h"
 
 class Dialog;
+class TDEProcess;
 
 class MountHelper : public TDEApplication
 {
-        Q_OBJECT
+	TQ_OBJECT
+
 public:
 	MountHelper();
+	~MountHelper();
 
 private:
-	const Medium findMedium(const KURL &url);
-	void invokeEject(const TQString &device, bool quiet=false);
 	TQString m_errorStr;
-	bool m_isCdrom;
 	TQString m_mediumId;
-	Dialog *dialog;
+	Dialog *m_dialog;
+
+	const Medium findMedium(const TQString &device);
+	void error();
+
+	void mount(const Medium &medium);
+	void unmount(const Medium &medium);
+	void unlock(const Medium &medium);
+	void lock(const Medium &medium);
+	void eject(const Medium &medium);
+	void safeRemoval(const Medium &medium);
+	void openRealFolder(const Medium &medium);
 
 private slots:
 	void slotSendPassword();
 	void slotCancel();
 	void ejectFinished(TDEProcess* proc);
-	void error();
-
-signals:
-	void signalPasswordError(TQString errorMsg);
+	void errorAndExit();
 };
 
 #endif
diff --git a/tdeioslave/media/mounthelper/unlockdialog.ui b/tdeioslave/media/mounthelper/unlockdialog.ui
index 99a46a9ac..7b78cdb42 100644
--- a/tdeioslave/media/mounthelper/unlockdialog.ui
+++ b/tdeioslave/media/mounthelper/unlockdialog.ui
@@ -107,7 +107,7 @@
                     </property>
                     <property name="text">
                         <string>&lt;p&gt;&lt;b&gt;%1&lt;/b&gt; is an encrypted storage device.&lt;/p&gt;
-&lt;p&gt;Please enter the password to decrypt the storage device.&lt;/p&gt;</string>
+&lt;p&gt;Please enter the password to unlock the storage device.&lt;/p&gt;</string>
                     </property>
                     <property name="alignment">
                         <set>WordBreak|AlignTop</set>
@@ -155,46 +155,6 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="TQGroupBox" row="2" column="0">
-            <property name="name">
-                <cstring>errorBox</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>3</hsizetype>
-                    <vsizetype>3</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="title">
-                <string>Error</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="TQLabel" row="0" column="0">
-                    <property name="name">
-                        <cstring>errorLabel</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>3</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="alignment">
-                        <set>WordBreak|AlignTop</set>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop b/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
index bd5ece69c..8d460d565 100644
--- a/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
+++ b/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 X-TDE-Library=media_propsdlgplugin
-X-TDE-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/blankcd,media/blankbluray,media/blankdvd,media/hdd_mounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/removable_mounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/nfs_mounted,media/nfs_unmounted,media/smb_mounted,media/smb_unmounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd,media/floppy_mounted,media/floppy_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/zip_mounted,media/zip_unmounted,media/gphoto2camera,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/blankcd,media/blankbluray,media/blankdvd,media/hdd_mounted,media/hdd_unmounted,media/bluray_mounted,media/bluray_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cd-r_mounted,media/cd-r_unmounted,media/cd-rw_mounted,media/cd-rw_unmounted,media/dvd_mounted,media/dvd_unmounted,media/removable_mounted,media/removable_unmounted,media/nfs_mounted,media/nfs_unmounted,media/smb_mounted,media/smb_unmounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd,media/floppy_mounted,media/floppy_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/zip_mounted,media/zip_unmounted,media/gphoto2camera,media/camera_mounted,media/camera_unmounted
 
 Name=Media Properties Page
 
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/propertiespage.h b/tdeioslave/media/propsdlgplugin/propertiespage.h
index 50a480719..33baef40f 100644
--- a/tdeioslave/media/propsdlgplugin/propertiespage.h
+++ b/tdeioslave/media/propsdlgplugin/propertiespage.h
@@ -28,7 +28,7 @@ class Medium;
 
 class PropertiesPage : public PropertiesPageGUI
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   PropertiesPage(TQWidget* parent, const TQString &_id);
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..dce33d786 100644
--- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -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/propsdlgplugin/propsdlgshareplugin.h b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h
index 87b7d1e13..e2ed740a7 100644
--- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.h
@@ -24,7 +24,7 @@
 
 class PropsDlgSharePlugin : public KPropsDlgPlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const TQStringList & );
   virtual ~PropsDlgSharePlugin();
diff --git a/tdeioslave/media/services/CMakeLists.txt b/tdeioslave/media/services/CMakeLists.txt
index b550409ba..932188725 100644
--- a/tdeioslave/media/services/CMakeLists.txt
+++ b/tdeioslave/media/services/CMakeLists.txt
@@ -13,8 +13,10 @@
 
 tde_create_translated_desktop(
   SOURCE
-    media_decrypt.desktop media_mount.desktop media_unmount.desktop
+    media_mount.desktop media_unmount.desktop
+    media_unlock.desktop media_lock.desktop
     media_eject.desktop media_safelyremove.desktop
+    media_realfolder.desktop
   DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
   PO_DIR tdeioslave-desktops
 )
diff --git a/tdeioslave/media/services/Makefile.am b/tdeioslave/media/services/Makefile.am
index c744934f2..e08b06be8 100644
--- a/tdeioslave/media/services/Makefile.am
+++ b/tdeioslave/media/services/Makefile.am
@@ -1,3 +1,3 @@
 servicesdir = $(kde_datadir)/konqueror/servicemenus
-services_DATA = media_decrypt.desktop media_mount.desktop media_unmount.desktop media_eject.desktop media_safelyremove.desktop
+services_DATA = media_mount.desktop media_unmount.desktop media_unlock.desktop media_lock.desktop media_eject.desktop media_safelyremove.desktop media_realfolder.desktop
 
diff --git a/tdeioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop
deleted file mode 100644
index ee48f2e63..000000000
--- a/tdeioslave/media/services/media_decrypt.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-X-TDE-ServiceTypes=media/removable_encrypted_locked,media/hdd_encrypted_locked,media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked
-Actions=MediaUnlock;
-X-TDE-Priority=TopLevel
-X-TDE-MediaNotifierHide=true
-
-[Desktop Action MediaUnlock]
-Name=Unlock
-
-Exec=tdeio_media_mounthelper -k %u
-Icon=decrypted
diff --git a/tdeioslave/media/services/media_eject.desktop b/tdeioslave/media/services/media_eject.desktop
index ad289fd33..0bb128656 100644
--- a/tdeioslave/media/services/media_eject.desktop
+++ b/tdeioslave/media/services/media_eject.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_unlocked,media/bluray_encrypted_locked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cdrom_encrypted_locked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-r_encrypted_locked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/cd-rw_encrypted_locked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/dvd_encrypted_locked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaEject;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaEject]
-Name=Eject
-
 Exec=tdeio_media_mounthelper -e %u
+Icon=player_eject
+Name=Eject
diff --git a/tdeioslave/media/services/media_lock.desktop b/tdeioslave/media/services/media_lock.desktop
new file mode 100644
index 000000000..d57565312
--- /dev/null
+++ b/tdeioslave/media/services/media_lock.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_encrypted_unlocked,media/cdrom_encrypted_unlocked,media/cd-r_encrypted_unlocked,media/cd-rw_encrypted_unlocked,media/dvd_encrypted_unlocked,media/hdd_encrypted_unlocked,media/removable_encrypted_unlocked
+Actions=MediaLock;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
+
+[Desktop Action MediaLock]
+Exec=tdeio_media_mounthelper -l %u
+Icon=encrypted
+Name=Lock
diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop
index d0f164bb9..f018cfd18 100644
--- a/tdeioslave/media/services/media_mount.desktop
+++ b/tdeioslave/media/services/media_mount.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_unmounted,media/bluray_encrypted_unlocked,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,media/nfs_unmounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/bluray_unmounted,media/camera_unmounted,media/cdrom_unmounted,media/cd-r_unmounted,media/cd-rw_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaMount;
 X-TDE-Priority=TopLevel
-X-TDE-MediaNotifierHide=true
+X-TDE-MediaNotifierHide=false
 
 [Desktop Action MediaMount]
-Name=Mount
-
 Exec=tdeio_media_mounthelper -m %u
+Icon=drive-harddisk-mounted
+Name=Mount
diff --git a/tdeioslave/media/services/media_realfolder.desktop b/tdeioslave/media/services/media_realfolder.desktop
new file mode 100644
index 000000000..a89066c53
--- /dev/null
+++ b/tdeioslave/media/services/media_realfolder.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/camera_mounted,media/camera_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cd-r_mounted,media/cd-r_unmounted,media/cd-rw_mounted,media/cd-rw_unmounted,media/dvd_mounted,media/dvd_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/floppy_unmounted,media/hdd_mounted,media/hdd_unmounted,media/nfs_mounted,media/nfs_unmounted,media/removable_mounted,media/removable_unmounted,media/smb_mounted,media/smb_unmounted,media/zip_mounted,media/zip_unmounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
+Actions=MediaRealFolder
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=false
+
+[Desktop Action MediaRealFolder]
+Exec=tdeio_media_mounthelper -f %u
+Icon=folder_red
+Name=Open Medium System Folder
diff --git a/tdeioslave/media/services/media_safelyremove.desktop b/tdeioslave/media/services/media_safelyremove.desktop
index 5abfdcd85..cf7191c8b 100644
--- a/tdeioslave/media/services/media_safelyremove.desktop
+++ b/tdeioslave/media/services/media_safelyremove.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/removable_mounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted,media/camera_unmounted,media/removable_mounted,media/removable_unmounted,media/removable_encrypted_locked,media/removable_encrypted_unlocked
 Actions=MediaSafelyRemove;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaSafelyRemove]
-Name=Safely Remove
-
 Exec=tdeio_media_mounthelper -s %u
+Icon=player_safe_removal
+Name=Safely Remove
diff --git a/tdeioslave/media/services/media_unlock.desktop b/tdeioslave/media/services/media_unlock.desktop
new file mode 100644
index 000000000..8d15cd46e
--- /dev/null
+++ b/tdeioslave/media/services/media_unlock.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked,media/hdd_encrypted_locked,media/removable_encrypted_locked
+Actions=MediaUnlock;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=false
+
+[Desktop Action MediaUnlock]
+Exec=tdeio_media_mounthelper -k %u
+Icon=decrypted
+Name=Unlock
diff --git a/tdeioslave/media/services/media_unmount.desktop b/tdeioslave/media/services/media_unmount.desktop
index 32bd58406..38370dd25 100644
--- a/tdeioslave/media/services/media_unmount.desktop
+++ b/tdeioslave/media/services/media_unmount.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/removable_mounted,media/bluray_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted
+X-TDE-ServiceTypes=media/bluray_mounted,media/camera_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/removable_mounted,media/smb_mounted,media/zip_mounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaUnmount;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaUnmount]
-Name=Unmount
-
 Exec=tdeio_media_mounthelper -u %u
+Icon=drive-harddisk-unmounted
+Name=Unmount
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/main.h b/tdeioslave/media/tdecmodule/main.h
index 5052d58eb..29d9eb21f 100644
--- a/tdeioslave/media/tdecmodule/main.h
+++ b/tdeioslave/media/tdecmodule/main.h
@@ -24,7 +24,7 @@
 
 class MediaModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	MediaModule( TQWidget *parent, const char *name, const TQStringList& );
diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
index 6478ee2a8..03a5ea500 100644
--- a/tdeioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -44,13 +44,6 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name )
 
 	addConfig(  MediaManagerSettings::self(), view );
 
-#ifndef COMPILE_HALBACKEND
-	TQString hal_text = view->kcfg_HalBackendEnabled->text();
-	hal_text += " ("+i18n("No support for HAL on this system")+")";
-	view->kcfg_HalBackendEnabled->setText( hal_text );
-#endif
-	view->kcfg_HalBackendEnabled->setEnabled( false );
-
 #ifndef COMPILE_LINUXCDPOLLING
 	TQString poll_text = view->kcfg_CdPollingEnabled->text();
 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
@@ -58,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();
 }	
@@ -98,7 +91,7 @@ void ManagerModule::load()
 	else
 	    view->option_atime->setNoChange();
 	
-	QString value;	
+	TQString value;	
 	
 	value = config.readEntry("shortname", "lower").lower();
 	for (int i = 0; i < view->option_shortname->count(); i++)
@@ -140,13 +133,12 @@ void ManagerModule::save()
 	
 	rememberSettings();
 
-	//Well... reloadBackends is buggy with HAL, it seems to be linked
-	//to a bug in the unmaintained Qt3 DBUS binding ;-/
-	//DCOPRef mediamanager( "kded", "mediamanager" );
-	//DCOPReply reply = mediamanager.call( "reloadBackends" );
-	
-	// So we use this hack instead...
 	DCOPRef kded( "kded", "kded" );
+	// DCOPReply reply = mediamanager.call( "reloadBackends" );
+	// Well... reloadBackends had issues with HAL, it seems it was linked
+	// to a bug in the unmaintained Qt3 DBUS binding, but it is not quite clear.
+	// It may be ok now that HAL is no longer supported but needs to be tested.
+	// So we use this hack instead...
 	kded.call( "unloadModule", "mediamanager" );
 	kded.call( "loadModule", "mediamanager" );
 
diff --git a/tdeioslave/media/tdecmodule/managermodule.h b/tdeioslave/media/tdecmodule/managermodule.h
index a0a384675..ae79e8d78 100644
--- a/tdeioslave/media/tdecmodule/managermodule.h
+++ b/tdeioslave/media/tdecmodule/managermodule.h
@@ -27,7 +27,7 @@ class ManagerModuleView;
 
 class ManagerModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	ManagerModule( TQWidget* parent = 0, const char* name = 0);
diff --git a/tdeioslave/media/tdecmodule/managermoduleview.ui b/tdeioslave/media/tdecmodule/managermoduleview.ui
index febef70f7..748cd825c 100644
--- a/tdeioslave/media/tdecmodule/managermoduleview.ui
+++ b/tdeioslave/media/tdecmodule/managermoduleview.ui
@@ -21,46 +21,46 @@
         </property>
         <widget class="TQCheckBox">
             <property name="name">
-                <cstring>kcfg_HalBackendEnabled</cstring>
+                <cstring>kcfg_CdPollingEnabled</cstring>
             </property>
             <property name="text">
-                <string>Enable HAL backend</string>
+                <string>Enable CD polling</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Select this if you want to enable the Hardware Abstraction Layer (http://hal.freedesktop.org/wiki/Software/hal) support.</string>
+                <string>Select this to enable the CD polling.</string>
             </property>
         </widget>
         <widget class="TQCheckBox">
             <property name="name">
-                <cstring>kcfg_CdPollingEnabled</cstring>
+                <cstring>kcfg_AutostartEnabled</cstring>
             </property>
             <property name="text">
-                <string>Enable CD polling</string>
+                <string>Enable medium application autostart after mount</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Select this to enable the CD polling.</string>
+                <string>Select this if you want to enable application autostart after mounting a device.</string>
             </property>
         </widget>
         <widget class="TQCheckBox">
             <property name="name">
-                <cstring>kcfg_AutostartEnabled</cstring>
+                <cstring>kcfg_NotificationPopupsEnabled</cstring>
             </property>
             <property name="text">
-                <string>Enable medium application autostart after mount</string>
+                <string>Enable notification dialog popups</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Select this if you want to enable application autostart after mounting a device.</string>
+                <string>Deselect this if you do not want action request dialog popups to be generated when devices are plugged in.</string>
             </property>
         </widget>
         <widget class="TQCheckBox">
             <property name="name">
-                <cstring>kcfg_NotificationPopupsEnabled</cstring>
+                <cstring>kcfg_DeviceMonitorPopupsEnabled</cstring>
             </property>
             <property name="text">
-                <string>Enable notification popups</string>
+                <string>Enable device monitor notification popups</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Deselect this if you do not want action request popups to be generated when devices are plugged in.</string>
+                <string>Deselect this if you do not want device monitoring popups to be generated when devices are added, modified or removed.</string>
             </property>
         </widget>
         <widget class="TQGroupBox">
@@ -337,19 +337,11 @@ Display the short name as is; store a long name when the short name is not all u
         </spacer>
     </vbox>
 </widget>
-<connections>
-    <connection>
-        <sender>kcfg_HalBackendEnabled</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>groupbox_mount</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-</connections>
 <tabstops>
-    <tabstop>kcfg_HalBackendEnabled</tabstop>
     <tabstop>kcfg_CdPollingEnabled</tabstop>
     <tabstop>kcfg_AutostartEnabled</tabstop>
     <tabstop>kcfg_NotificationPopupsEnabled</tabstop>
+    <tabstop>kcfg_DeviceMonitorPopupsEnabled</tabstop>
     <tabstop>option_automount</tabstop>
     <tabstop>option_ro</tabstop>
     <tabstop>option_quiet</tabstop>
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp
index 4364d93ad..2d2d53481 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()
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.h b/tdeioslave/media/tdecmodule/notifiermodule.h
index d5d97a96d..2192c30a9 100644
--- a/tdeioslave/media/tdecmodule/notifiermodule.h
+++ b/tdeioslave/media/tdecmodule/notifiermodule.h
@@ -28,7 +28,7 @@
 
 class NotifierModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	NotifierModule( TQWidget* parent = 0, const char* name = 0);
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/tdecmodule/serviceconfigdialog.h b/tdeioslave/media/tdecmodule/serviceconfigdialog.h
index 24e907205..2f35bfb54 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.h
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.h
@@ -27,7 +27,7 @@
 
 class ServiceConfigDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	ServiceConfigDialog(NotifierServiceAction *action,
diff --git a/tdeioslave/media/tdefile-plugin/tdefile_media.desktop b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
index bfb7a6762..2b9b7c68e 100644
--- a/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
+++ b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
 X-TDE-Library=tdefile_media
-X-TDE-ServiceTypes=KFilePlugin,media/audiocd,media/blankcd,media/blankbluray,media/blankdvd,media/hdd_mounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/removable_mounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/nfs_mounted,media/nfs_unmounted,media/smb_mounted,media/smb_unmounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd,media/floppy_mounted,media/floppy_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/zip_mounted,media/zip_unmounted,media/gphoto2camera,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=KFilePlugin,media/audiocd,media/blankcd,media/blankbluray,media/blankdvd,media/hdd_mounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,media/hdd_encrypted_locked,media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_unlocked,media/bluray_encrypted_locked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cdrom_encrypted_locked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-r_encrypted_locked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/cd-rw_encrypted_locked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/dvd_encrypted_locked,media/removable_mounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/removable_encrypted_locked,media/nfs_mounted,media/nfs_unmounted,media/smb_mounted,media/smb_unmounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd,media/floppy_mounted,media/floppy_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/zip_mounted,media/zip_unmounted,media/gphoto2camera,media/camera_mounted,media/camera_unmounted
 
 Name=Medium Information
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
index b7e4a437d..190bec197 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
@@ -55,24 +55,31 @@ KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name,
 	addMimeType( "media/bluray_mounted" );
 	addMimeType( "media/bluray_unmounted" );
 	addMimeType( "media/bluray_encrypted_unlocked" );
+	addMimeType( "media/bluray_encrypted_locked" );
 	addMimeType( "media/cdrom_mounted" );
 	addMimeType( "media/cdrom_unmounted" );
 	addMimeType( "media/cdrom_encrypted_unlocked" );
+	addMimeType( "media/cdrom_encrypted_locked" );
 	addMimeType( "media/cd-r_mounted" );
 	addMimeType( "media/cd-r_unmounted" );
 	addMimeType( "media/cd-r_encrypted_unlocked" );
+	addMimeType( "media/cd-r_encrypted_locked" );
 	addMimeType( "media/cd-rw_mounted" );
 	addMimeType( "media/cd-rw_unmounted" );
 	addMimeType( "media/cd-rw_encrypted_unlocked" );
+	addMimeType( "media/cd-rw_encrypted_locked" );
 	addMimeType( "media/dvd_mounted" );
 	addMimeType( "media/dvd_unmounted" );
 	addMimeType( "media/dvd_encrypted_unlocked" );
+	addMimeType( "media/dvd_encrypted_locked" );
 	addMimeType( "media/hdd_mounted" );
 	addMimeType( "media/hdd_unmounted" );
 	addMimeType( "media/hdd_encrypted_unlocked" );
+	addMimeType( "media/hdd_encrypted_locked" );
 	addMimeType( "media/removable_mounted" );
 	addMimeType( "media/removable_unmounted" );
 	addMimeType( "media/removable_encrypted_unlocked" );
+	addMimeType( "media/removable_encrypted_locked" );
 	addMimeType( "media/nfs_mounted" );
 	addMimeType( "media/nfs_unmounted" );
 	addMimeType( "media/smb_mounted" );
@@ -151,12 +158,12 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
 			TQPixmap bar(150, 20);
 			TQPainter p(&bar);
 
-			p.fillRect(0, 0, length, 20, Qt::red);
-			p.fillRect(length, 0, 150-length, 20, Qt::green);
+			p.fillRect(0, 0, length, 20, TQt::red);
+			p.fillRect(length, 0, 150-length, 20, TQt::green);
 
 			TQColorGroup cg = TQApplication::palette().active();
 
-			TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, &p,
+			TQApplication::style().drawPrimitive(TQStyle::PE_Panel, &p,
 							    TQRect(0, 0, 150, 20), cg,
 							    TQStyle::Style_Sunken);
 
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
index dcc2591be..0f9dc0038 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
@@ -28,7 +28,7 @@
 
 class KFileMediaPlugin : public KFilePlugin
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KFileMediaPlugin(TQObject *parent, const char *name,
 	                 const TQStringList &args);
diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp
index 9124568c1..c68bc25d5 100644
--- a/tdeioslave/media/tdeio_media.cpp
+++ b/tdeioslave/media/tdeio_media.cpp
@@ -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/media/tdeio_media.h b/tdeioslave/media/tdeio_media.h
index 7acc44df0..473a623b1 100644
--- a/tdeioslave/media/tdeio_media.h
+++ b/tdeioslave/media/tdeio_media.h
@@ -26,7 +26,7 @@
 
 class MediaProtocol : public TDEIO::ForwardingSlaveBase
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	MediaProtocol(const TQCString &protocol, const TQCString &pool,
 	              const TQCString &app);
diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp
index 8a7fd94b8..e2908f815 100644
--- a/tdeioslave/nfs/tdeio_nfs.cpp
+++ b/tdeioslave/nfs/tdeio_nfs.cpp
@@ -425,7 +425,7 @@ void NFSProtocol::openConnection()
       hostName=nameBuffer;
       // I have the same problem here as Stefan Westerfeld, that's why I use
       // the getdomainname() from fakes.cpp (renamed to x_getdomainname()), this one works
-      // taken from tdelibs/arts/mcopy/mcoputils.cc
+      // taken from tdelibs/arts/mcopy/mcoputils.cpp
       nameBuffer[0] = '\0';
       if (x_getdomainname(nameBuffer, 1024)==0)
       {
@@ -777,7 +777,7 @@ void NFSProtocol::stat( const KURL & url)
 
 void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& path)
 {
-   //taken from file.cc
+   //taken from file.cpp
    struct stat buff;
    if ( ::stat( path.data(), &buff ) == -1 ) return;
 
diff --git a/tdeioslave/pop3/CMakeLists.txt b/tdeioslave/pop3/CMakeLists.txt
index e488d5e99..725abcabf 100644
--- a/tdeioslave/pop3/CMakeLists.txt
+++ b/tdeioslave/pop3/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
 set( target tdeio_pop3 )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES pop3.cc
+  SOURCES pop3.cpp
   LINK tdeio-shared ${SASL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/pop3/Makefile.am b/tdeioslave/pop3/Makefile.am
index 130fb34d8..1dc92b73b 100644
--- a/tdeioslave/pop3/Makefile.am
+++ b/tdeioslave/pop3/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_pop3.la
 
-tdeio_pop3_la_SOURCES = pop3.cc
+tdeio_pop3_la_SOURCES = pop3.cpp
 tdeio_pop3_la_LIBADD  = $(LIB_TDEIO) $(SASL2_LIBS)
 tdeio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
@@ -14,4 +14,4 @@ kdelnk_DATA = pop3.protocol pop3s.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/tdeio_pop3.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_pop3.pot
diff --git a/tdeioslave/pop3/pop3.cc b/tdeioslave/pop3/pop3.cpp
index f45f06d60..f45f06d60 100644
--- a/tdeioslave/pop3/pop3.cc
+++ b/tdeioslave/pop3/pop3.cpp
diff --git a/tdeioslave/remote/Makefile.am b/tdeioslave/remote/Makefile.am
index 9505065f3..988016d3c 100644
--- a/tdeioslave/remote/Makefile.am
+++ b/tdeioslave/remote/Makefile.am
@@ -28,5 +28,5 @@ check: testremote
 	./testremote
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_remote.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_remote.pot
 
diff --git a/tdeioslave/settings/CMakeLists.txt b/tdeioslave/settings/CMakeLists.txt
index 04fc4e69f..0b05ff0c1 100644
--- a/tdeioslave/settings/CMakeLists.txt
+++ b/tdeioslave/settings/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
 set( target tdeio_settings )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES tdeio_settings.cc
+  SOURCES tdeio_settings.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/settings/Makefile.am b/tdeioslave/settings/Makefile.am
index b470a7782..5b804af90 100644
--- a/tdeioslave/settings/Makefile.am
+++ b/tdeioslave/settings/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_settings.la
 
-tdeio_settings_la_SOURCES = tdeio_settings.cc
+tdeio_settings_la_SOURCES = tdeio_settings.cpp
 tdeio_settings_la_LIBADD  = $(LIB_TDESYCOCA)
 tdeio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
@@ -17,5 +17,5 @@ kdelnkdir = $(kde_servicesdir)
 SUBDIRS=. 
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_settings.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_settings.pot
 
diff --git a/tdeioslave/settings/tdeio_settings.cc b/tdeioslave/settings/tdeio_settings.cpp
index db797fab5..5d1e67a0e 100644
--- a/tdeioslave/settings/tdeio_settings.cc
+++ b/tdeioslave/settings/tdeio_settings.cpp
@@ -294,5 +294,3 @@ void SettingsProtocol::listDir(const KURL& url)
 	listEntry(entry, true);
 	finished();
 }
-
-// vim: ts=4 sw=4 et
diff --git a/tdeioslave/sftp/AUTHORS b/tdeioslave/sftp/AUTHORS
deleted file mode 100644
index c763d00bc..000000000
--- a/tdeioslave/sftp/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Dawit Alemayehu <adawit@kde.org>
-Lucas Fisher <ljfisher@iastate.edu>
-
diff --git a/tdeioslave/sftp/CHANGELOG b/tdeioslave/sftp/CHANGELOG
deleted file mode 100644
index c34cd9dec..000000000
--- a/tdeioslave/sftp/CHANGELOG
+++ /dev/null
@@ -1,59 +0,0 @@
-- add dialog to ask for username
-- rename() causes SSH to die
-- How to handle overwrite?
-- After the user cancels with the stop button, we get ERR_CANNOT_LAUNCH_PROCESS
-  errors, until we kill the ioslave. Same thing after trying the wrong passwd
-  too many times.
-  This is happening because TDEProcess thinks that the ssh process is still running
-  even though it exited.
-- How to handle password and caching?
-  - Write our own askpass program using kde
-  - set env SSH_ASKPASS_PROGRAM before launching
-    -how to do this? TDEProcess doesn't give us access to env variables.
-  - Our askpass program can probably talk to the tdesu daemon to implement caching.
-- chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties
-  dialog is right though.
-  Nevermind - ftp ioslave does this too! Maybe a bug with konqueror.
-- stat does not give us group and owner names, only numbers.  We could cache the uid/name and
-  gid/name so we can give names when doing a stat also.
-  
-7-13-2001 - ReadLink stopped working. sftp server always retuns a file not found error
-          - Need to implement 64 bit file lengths-->write DataStream << for u_int64
-            Still need to offer 32 bit size since this is what kde wants. ljf
-          - rename() isn't exactly causing ioslave to die.  The stat of the file we are
-            going to rename is killing the slave.  The slave dies in the statEntry() call.
-            I don't know what I am putting in the UDS entry that is causing this. ljf
-7-14-2001 - got put, mimetype working ljf
-          - fixed readlink problem - I was sending the wrong path. doh! ljf
-7-17-2001 - If the user changes the host, the slave doesn't change host! setHost() is not
-            called, nor is another ioslave spawned. I have not investigated the problem
-            yet. ljf
-7-21-2001 - got slave working with kde 2.2 cvs
-7-22-2001 - probable solution to getting password prompt -- open with controlling
-            but don't connect stdin/out to terminal. duh!
-8-9-2001  - Doh! I haven't kept very good logs. Look at the cvs logs for better info.
-          - At this point tdeio_sftp is using KSshProcess which I wrote in order to make
-            a standard interface to the various version of ssh out there. So far it is
-            working fairly well.  We also now report host key changes to the user and
-            allow them to choose whether or not to continue. This is a big improvement.
-          - Todo: support use of keys and ssh agent
-                  put()'s resume functionality needs some work
-1-26-2002 - Rewrote put() following the ftp::put() so it should behave the same way
-          - increase the size of the data packet we ask for in ::get up to 60k.
-            Through-put increases nicely.
-          - Call closeConnection() from construction. Keeps from having unused ssh
-            processes laying around after failed operations.
-2-19-2002 - get() now emits mimetype, fixes problem with konqi not downloading file for
-            viewing in kpart.
-          - get port number using getservbyname instead of hard coding it.
-2-27-2002 - testing before committing back to cvs, test with openssh 3, ssh 3
-6-?-2002 - rewrote openConnection() to using new KSshProcess connect proceedures
-7-20-2002 - Don't put up a message box when auth fails because of now or changed key,
-            the call to error() will put up the dialog.
-          - Connect fails and no more password are prompted for when we get
-            ERR_AUTH_FAILED from KSshProcess.
-9-15-2002 - stuff
-9-29-2002 - the last i18n string updates, fixed problem with uploading files to
-            openssh server.
-5-8-2003  - check whether operation types are supported by the negotiated sftp
-            protocol version
diff --git a/tdeioslave/sftp/CMakeLists.txt b/tdeioslave/sftp/CMakeLists.txt
index 62fe0fce3..8074ea76e 100644
--- a/tdeioslave/sftp/CMakeLists.txt
+++ b/tdeioslave/sftp/CMakeLists.txt
@@ -1,13 +1,10 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 2   #
+#                                         #
+###########################################
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -21,7 +18,7 @@ link_directories(
 )
 
 
-##### other data ################################
+##### other data #########################
 
 tde_create_translated_desktop(
   SOURCE sftp.protocol
@@ -30,12 +27,12 @@ tde_create_translated_desktop(
 )
 
 
-##### tdeio_sftp (module) #########################
+##### tdeio_sftp (module) ################
 
 set( target tdeio_sftp )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-  LINK tdeio-shared tdesu-shared
+  SOURCES tdeio_sftp.cpp
+  LINK tdeio-shared ssh
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/sftp/DEBUGGING b/tdeioslave/sftp/DEBUGGING
deleted file mode 100644
index 8e15c91d4..000000000
--- a/tdeioslave/sftp/DEBUGGING
+++ /dev/null
@@ -1,12 +0,0 @@
-DEBUGGING
-
-The best way to debug this slave is to send debug info to a
-file using 'tdedebugDialog --fullmode'. Then you can 'tail -f' the file to 
-see debug messages in real-time.
-
-I also suggest getting the openssh source and recompiling sftp-server to 
-send messages to the auth log.  This can be done in sftp-server.c be defining
-DEBUG_SFTP_SERVER.
-
-You can do the same with the ssh client by finding the two calls to log_init() 
-in ssh.c and changing the last argument from 1 to 0 and recompiling.
diff --git a/tdeioslave/sftp/Makefile.am b/tdeioslave/sftp/Makefile.am
deleted file mode 100644
index 512f5f7dd..000000000
--- a/tdeioslave/sftp/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-## Makefile.am of tdebase/tdeioslave/sftp
-
-INCLUDES = $(all_includes)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-METASOURCES = AUTO
-
-####### Files
-
-check_PROGRAMS = ksshprocesstest
-
-ksshprocesstest_SOURCES = ksshprocesstest.cpp
-ksshprocesstest_LDADD = $(LIB_TDESYCOCA) ksshprocess.lo process.lo atomicio.lo
-
-kde_module_LTLIBRARIES = tdeio_sftp.la
-
-tdeio_sftp_la_SOURCES = process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp
-tdeio_sftp_la_LIBADD = $(LIB_TDEIO)
-tdeio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-noinst_HEADERS = atomicio.h tdeio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h
-
-kdelnk_DATA = sftp.protocol
-kdelnkdir = $(kde_servicesdir)
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/tdeio_sftp.pot
diff --git a/tdeioslave/sftp/TODO b/tdeioslave/sftp/TODO
deleted file mode 100644
index 0f1411317..000000000
--- a/tdeioslave/sftp/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-TODO:
-=====
-
-- Support for use of public keys, maybe ssh-agent, a key management app, etc.
-
diff --git a/tdeioslave/sftp/atomicio.cpp b/tdeioslave/sftp/atomicio.cpp
deleted file mode 100644
index 057f20fe9..000000000
--- a/tdeioslave/sftp/atomicio.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-//#include "includes.h"
-//RCSID("$OpenBSD: atomicio.c,v 1.9 2001/03/02 18:54:30 deraadt Exp $");
-
-//#include "xmalloc.h"
-#include "atomicio.h"
-#include <unistd.h>
-#include <errno.h>
-#include <kdebug.h>
-
-/*
- * ensure all of data on socket comes through. f==read || f==write
- */
-
-ssize_t	atomicio(int fd, char *_s, size_t n, bool read)	
-{
-	char *s = _s;
-	ssize_t res;
-	ssize_t pos = 0;
-
-	while (n > pos) {
-		if( read)
-		    res = ::read(fd, s + pos, n - pos);
-		else
-		    res = ::write(fd, s + pos, n - pos);
-
-		switch (res) {
-		case -1:
-		    kdDebug() << "atomicio(): errno=" << errno << endl;
-#ifdef EWOULDBLOCK
-			if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
-#else
-			if (errno == EINTR || errno == EAGAIN)
-#endif
-				continue;
-		case 0:
-			return (res);
-		default:
-			pos += res;
-		}
-	}
-	return (pos);
-}
diff --git a/tdeioslave/sftp/atomicio.h b/tdeioslave/sftp/atomicio.h
deleted file mode 100644
index 4468757d5..000000000
--- a/tdeioslave/sftp/atomicio.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef atomicio_h
-#define atomicio_h
-
-/*	$OpenBSD: atomicio.h,v 1.3 2001/03/02 18:54:30 deraadt Exp $	*/
-
-/*
- * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <unistd.h>
-
-/*
- * Ensure all of data on socket comes through. f==read || f==write
- */
-ssize_t	atomicio(int fd, char *_s, size_t n, bool read = true);
-
-#endif
diff --git a/tdeioslave/sftp/ksshprocess.cpp b/tdeioslave/sftp/ksshprocess.cpp
deleted file mode 100644
index 0f19126d2..000000000
--- a/tdeioslave/sftp/ksshprocess.cpp
+++ /dev/null
@@ -1,1114 +0,0 @@
-/***************************************************************************
-                          ksshprocess.cpp  -  description
-                             -------------------
-    begin                : Tue Jul 31 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@purdue.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/*
- * See the KSshProcess header for examples on use.
- *
- * This class uses a hacked version of the PTYProcess
- * class.  This was needed because the tdelibs PTYProcess does not provide 
- * access to the pty file descriptor which we need, because ssh prints the
- * password prompt to the pty and reads the password from the pty.  I don't
- * feel I know enough about ptys to confidently modify the orignial
- * PTYProcess class.
- *
- * To start ssh we take the arguments the user gave us
- * in the SshOptList and build the ssh command arguments based on the version
- * of ssh we are using.  This command and its arguments are  passed to
- * PTYProcess for execution.  Once ssh is started we scan each line of input
- * from stdin, stderr, and the pty for recognizable strings.  The recognizable
- * strings are taken from several string tables.  Each table contains a string
- * for each specific version of ssh we support and a string for a generic
- * version of OpenSSH and commercial SSH incase we don't recognized the 
- * specific ssh version strings (as when a new SSH version is released after
- * a release of KSshProcess).  There are tables for ssh version strings,
- * password prompts, new host key errors, different host key errors,
- * messages than indicate a successful connect, authentication errors, etc.
- * If we find user interaction is necessary, for instance to provide a 
- * password or passphrase, we return a err code to the user who can send
- * a message to KSshProcess, using one of several methods, to correct
- * the error.
- *
- * Determining when the ssh connection has successfully authenticationed has
- * proved to be the most difficult challenge.  OpenSSH does not print a message
- * on successful authentication, thus the only way to know is to send data
- * and wait for a return.  The problem here is sometimes it can take a bit
- * to establish the connection (for example, do to DNS lookups).  This means
- * the user may be sitting there waiting for a connection that failed.
- * Instead, ssh is always started with the verbose flag.  Then we look for
- * a message that indicates auth succeeded.  This is hazardous because
- * debug messages are more likely to change between OpenSSH releases.
- * Thus, we could become incompatible with new OpenSSH releases.
- */
-
-#include <config.h>
-
-#include "ksshprocess.h"
-
-#include <stdio.h>
-#include <errno.h>
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <kstandarddirs.h>
-#include <tdelocale.h>
-#include <tqregexp.h>
-
-/*
- * The following are tables of string and regexps we match
- * against the output of ssh.  An entry in each array 
- * corresponds the the version of ssh found in versionStrs[].
- * 
- * The version strings must be ordered in the array from most
- * specific to least specific in cases where the beginning
- * of several version strings are the similar. For example,
- * consider the openssh version strings.  The generic "OpenSSH"
- * must be the last of the openssh version strings in the array
- * so that is matched last. We use these generic version strings
- * so we can do a best effor to  support unknown ssh versions.
- */
-TQRegExp KSshProcess::versionStrs[] = {
-    TQRegExp("OpenSSH_3\\.[6-9]|OpenSSH_[1-9]*[4-9]\\.[0-9]"),
-    TQRegExp("OpenSSH"),
-    TQRegExp("SSH Secure Shell")
-};
-
-const char * const KSshProcess::passwordPrompt[] = {
-    "password:", // OpenSSH
-    "password:", // OpenSSH
-    "password:"  // SSH
-};
-
-const char * const KSshProcess::passphrasePrompt[] = {
-    "Enter passphrase for key",
-    "Enter passphrase for key",
-    "Passphrase for key"
-};
-
-const char * const KSshProcess::authSuccessMsg[] = {
-    "Authentication succeeded",
-    "ssh-userauth2 successful",
-    "Received SSH_CROSS_AUTHENTICATED packet"
-};
-
-const char* const KSshProcess::authFailedMsg[] = {
-    "Permission denied (",
-    "Permission denied (",
-    "Authentication failed."
-};
-
-const char* const KSshProcess::tryAgainMsg[] = {
-    "please try again",
-    "please try again",
-    "adjfhjsdhfdsjfsjdfhuefeufeuefe"
-};
-
-TQRegExp KSshProcess::hostKeyMissingMsg[] = {
-    TQRegExp("The authenticity of host|No (DSA|RSA) host key is known for"),
-    TQRegExp("The authenticity of host|No (DSA|RSA) host key is known for"),
-    TQRegExp("Host key not found from database")
-};
-
-const char* const KSshProcess::continuePrompt[] = {
-    "Are you sure you want to continue connecting (yes/no)?",
-    "Are you sure you want to continue connecting (yes/no)?",
-    "Are you sure you want to continue connecting (yes/no)?"
-};
-
-const char* const KSshProcess::hostKeyChangedMsg[] = {
-    "WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!",
-    "WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!",
-    "WARNING: HOST IDENTIFICATION HAS CHANGED!"
-};
-
-TQRegExp KSshProcess::keyFingerprintMsg[] = {
-    TQRegExp("..(:..){15}"),
-    TQRegExp("..(:..){15}"),
-    TQRegExp(".....(-.....){10}")
-};
-
-TQRegExp KSshProcess::knownHostsFileMsg[] = {
-    TQRegExp("Add correct host key in (.*) to get rid of this message."),
-    TQRegExp("Add correct host key in (.*) to get rid of this message."),
-    TQRegExp("Add correct host key to \"(.*)\"")
-};
-
-
-// This prompt only applies to commerical ssh.
-const char* const KSshProcess::changeHostKeyOnDiskPrompt[] = {
-    "as;jf;sajkfdslkfjas;dfjdsa;fj;dsajfdsajf",
-    "as;jf;sajkfdslkfjas;dfjdsa;fj;dsajfdsajf",
-    "Do you want to change the host key on disk (yes/no)?"
-};
-
-// We need this in addition the authFailedMsg because when
-// OpenSSH gets a changed host key it will fail to connect
-// depending on the StrictHostKeyChecking option.  Depending
-// how this option is set, it will print "Permission denied"
-// and quit, or print "Host key verification failed." and
-// quit.  The later if StrictHostKeyChecking is "no".
-// The former if StrictHostKeyChecking is
-// "yes" or explicitly set to "ask".
-TQRegExp KSshProcess::hostKeyVerifyFailedMsg[] = {
-    TQRegExp("Host key verification failed\\."),
-    TQRegExp("Host key verification failed\\."),
-    TQRegExp("Disconnected; key exchange or algorithm? negotiation failed \\(Key exchange failed\\.\\)\\.")
-};
-
-const char * const KSshProcess::connectionClosedMsg[] = {
-    "Connection closed by remote host",
-    "Connection closed by remote host",
-    "Connection closed by remote host"
-};
-
-
-void KSshProcess::SIGCHLD_handler(int) {
-	while(waitpid(-1, NULL, WNOHANG) > 0);
-}
-
-void KSshProcess::installSignalHandlers() {
-    struct sigaction act;
-    memset(&act,0,sizeof(act));
-    act.sa_handler = SIGCHLD_handler;
-    act.sa_flags = 0
-#ifdef SA_NOCLDSTOP
-	    | SA_NOCLDSTOP
-#endif
-#ifdef SA_RESTART
-	    | SA_RESTART
-#endif
-	    ;
-    sigaction(SIGCHLD,&act,NULL);
-}
-					
-void KSshProcess::removeSignalHandlers() {
-	struct sigaction act;
-	memset(&act,0,sizeof(act));
-	act.sa_handler = SIG_DFL;
-	sigaction(SIGCHLD,&act,NULL);
-}
-
-KSshProcess::KSshProcess() 
-            : mVersion(UNKNOWN_VER), mConnected(false), 
-        mRunning(false), mConnectState(0) {
-    mSshPath = TDEStandardDirs::findExe(TQString::fromLatin1("ssh"));
-    kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" << 
-		mSshPath << "]" << endl;
-        
-	installSignalHandlers();
-}
-
-KSshProcess::KSshProcess(TQString pathToSsh)
-            : mSshPath(pathToSsh), mVersion(UNKNOWN_VER), mConnected(false),
-    mRunning(false), mConnectState(0)  {
-	installSignalHandlers();
-}
-
-KSshProcess::~KSshProcess(){
-    disconnect();
-    removeSignalHandlers();
-    while(waitpid(-1, NULL, WNOHANG) > 0);
-}
-
-bool KSshProcess::setSshPath(TQString pathToSsh) {
-    mSshPath = pathToSsh;
-    version();
-    if( mVersion == UNKNOWN_VER )
-        return false;
-
-    return true;
-}
-
-KSshProcess::SshVersion KSshProcess::version() {
-    TQString cmd;
-    cmd = mSshPath+" -V 2>&1";
-
-    // Get version string from ssh client.
-    FILE *p;
-    if( (p = popen(cmd.latin1(), "r")) == NULL ) {
-        kdDebug(KSSHPROC) << "KSshProcess::version(): "
-            "failed to start ssh: " << strerror(errno) << endl;
-        return UNKNOWN_VER;
-    }
-
-    // Determine of the version from the version string. 
-    size_t len;
-    char buf[128];
-    if( (len = fread(buf, sizeof(char), sizeof(buf)-1, p)) == 0 ) {
-        kdDebug(KSSHPROC) << "KSshProcess::version(): "
-            "Read of ssh version string failed " << 
-             strerror(ferror(p)) << endl;
-        return UNKNOWN_VER;
-    }
-    if( pclose(p) == -1 ) {
-        kdError(KSSHPROC) << "KSshProcess::version(): pclose failed." << endl;
-    }
-    buf[len] = '\0';
-    TQString ver;
-    ver = buf;
-    kdDebug(KSSHPROC) << "KSshProcess::version(): "
-        "got version string [" << ver << "]" << endl;
-
-    mVersion = UNKNOWN_VER;
-    for(int i = 0; i < SSH_VER_MAX; i++) {
-        if( ver.find(versionStrs[i]) != -1 ) {
-             mVersion = (SshVersion)i;
-             break;
-        }
-    }
-
-    kdDebug(KSSHPROC) << "KSshPRocess::version(): version number = "
-	    << mVersion << endl;
-    
-    if( mVersion == UNKNOWN_VER ) {
-        kdDebug(KSSHPROC) << "KSshProcess::version(): "
-            "Sorry, I don't know about this version of ssh" << endl;
-        mError = ERR_UNKNOWN_VERSION;
-        return UNKNOWN_VER;
-    }
-
-    return mVersion;
-}
-/*
-TQString KSshProcess::versionStr() {
-    if( mVersion == UNKNOWN_VER ) {
-        version();
-        if( mVersion == UNKNOWN_VER )
-            return TQString::null;
-    }
-
-    return TQString::fromLatin1(versionStrs[mVersion]);
-}
-*/
-
-bool KSshProcess::setOptions(const SshOptList& opts) {
-    kdDebug(KSSHPROC) << "KSshProcess::setOptions()" << endl;
-    mArgs.clear();
-    SshOptListConstIterator it;
-    TQString cmd, subsystem;
-    mPassword = mUsername = mHost = TQString::null;
-    TQCString tmp;
-    for(it = opts.begin(); it != opts.end(); ++it) {
-        //kdDebug(KSSHPROC) << "opt.opt = " << (*it).opt << endl;
-        //kdDebug(KSSHPROC) << "opt.str = " << (*it).str << endl;
-        //kdDebug(KSSHPROC) << "opt.num = " << (*it).num << endl;
-        switch( (*it).opt ) {
-        case SSH_VERBOSE:
-            mArgs.append("-v");
-            break;
-
-        case SSH_SUBSYSTEM:
-            subsystem = (*it).str;
-            break;
-
-        case SSH_PORT:
-            mArgs.append("-p");
-            tmp.setNum((*it).num);
-            mArgs.append(tmp);
-            mPort = (*it).num;
-            break;
-
-        case SSH_HOST:
-            mHost = (*it).str;
-            break;
-
-        case SSH_USERNAME:
-            mArgs.append("-l");
-            mArgs.append((*it).str.latin1());
-            mUsername = (*it).str;
-            break;
-
-        case SSH_PASSWD:
-            mPassword = (*it).str;
-            break;
-
-        case SSH_PROTOCOL:
-            if( mVersion <= OPENSSH ) {
-                tmp = "Protocol=";
-                tmp += TQString::number((*it).num).latin1();
-                mArgs.append("-o");
-                mArgs.append(tmp);
-            }
-            else if( mVersion <= SSH ) {
-                if( (*it).num == 1 ) {
-                    mArgs.append("-1");
-                }
-                // else uses version 2 by default
-            }
-            break;
-
-        case SSH_FORWARDX11:
-            tmp = "ForwardX11=";
-            tmp += (*it).boolean ? "yes" : "no";
-            mArgs.append("-o");
-            mArgs.append(tmp);
-            break;
-
-        case SSH_FORWARDAGENT:
-            tmp = "ForwardAgent=";
-            tmp += (*it).boolean ? "yes" : "no";
-            mArgs.append("-o");
-            mArgs.append(tmp);
-            break;
-
-        case SSH_ESCAPE_CHAR:
-            if( (*it).num == -1 )
-                tmp = "none";
-            else
-                tmp = (char)((*it).num);
-            mArgs.append("-e");
-            mArgs.append(tmp);
-            break;
-
-        case SSH_OPTION:
-            // don't allow NumberOfPasswordPrompts or StrictHostKeyChecking
-            // since KSshProcess depends on specific setting of these for 
-            // preforming authentication correctly.
-            tmp = (*it).str.latin1();
-            if( tmp.contains("NumberOfPasswordPrompts") ||
-                tmp.contains("StrictHostKeyChecking") ) {
-                mError = ERR_INVALID_OPT;
-                return false;
-            }
-            else {
-                mArgs.append("-o");
-                mArgs.append(tmp);
-            }
-            break;
-            
-        case SSH_COMMAND:
-            cmd = (*it).str;
-            break;
-
-        default:
-            kdDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-                "unrecognized ssh opt " << (*it).opt << endl;
-        }
-    }
-
-    if( !subsystem.isEmpty() && !cmd.isEmpty() ) {
-        kdDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-            "cannot use a subsystem and command at the same time" << endl;
-        mError = ERR_CMD_SUBSYS_CONFLICT;
-        mErrorMsg = i18n("Cannot specify a subsystem and command at the same time.");
-        return false;
-    }
-
-    // These options govern the behavior of ssh and 
-    // cannot be defined by the user
-    //mArgs.append("-o");
-    //mArgs.append("StrictHostKeyChecking=ask");
-    mArgs.append("-v"); // So we get a message that the 
-                        // connection was successful
-    if( mVersion <= OPENSSH ) {
-        // nothing
-    }
-    else if( mVersion <= SSH ) {
-        mArgs.append("-o"); // So we can check if the connection was successful
-        mArgs.append("AuthenticationSuccessMsg=yes");
-    }
-
-    if( mHost.isEmpty() ) {
-        kdDebug(KSSHPROC) << "KSshProcess::setOptions(): "
-            "a host name must be supplied" << endl;
-        return false;
-    }
-    else {
-        mArgs.append(mHost.latin1());
-    }
-
-    if( !subsystem.isEmpty() ) {
-        mArgs.append("-s");
-        mArgs.append(subsystem.latin1());
-    }
-
-    if( !cmd.isEmpty() ) {
-        mArgs.append(cmd.latin1());
-    }
-
-    return true;
-}
-
-void KSshProcess::printArgs() {
-    TQValueListIterator<TQCString> it;
-    for( it = mArgs.begin(); it != mArgs.end(); ++it) {
-        kdDebug(KSSHPROC) << "arg: " << *it << endl;
-    }
-}
-
-
-int KSshProcess::error(TQString& msg) {
-    kdDebug(KSSHPROC) << "KSshProcess::error()" << endl;
-    kdDebug() << mErrorMsg << endl;
-    msg = mErrorMsg;
-    return mError;
-}
-
-void KSshProcess::kill(int signal) {
-    int pid = ssh.pid();
-    
-    kdDebug(KSSHPROC) << "KSshProcess::kill(signal:" << signal 
-                      << "): ssh pid is " << pid << endl;
-    kdDebug(KSSHPROC) << "KSshPRocess::kill(): we are " 
-                      << (mConnected ? "" : "not ") << "connected" << endl;
-    kdDebug(KSSHPROC) << "KSshProcess::kill(): we are " 
-                      << (mRunning ? "" : "not ") << "running a ssh process" << endl;
-
-    if( mRunning && pid > 1 ) {
-            // Kill the child process...
-            if ( ::kill(pid, signal) == 0 ) {
-                // clean up if we tried to kill the process
-                if( signal == SIGTERM || signal == SIGKILL ) {
-                    while(waitpid(-1, NULL, WNOHANG) > 0);
-                    mConnected = false;
-                    mRunning = false;
-                }
-            }
-            else
-                kdDebug(KSSHPROC) << "KSshProcess::kill(): kill failed" << endl;
-    }
-    else
-        kdDebug(KSSHPROC) << "KSshProcess::kill(): "
-            "Refusing to kill ssh process" << endl;
-}
-
-
-
-/**
- * Try to open an ssh connection.
- * SSH prints certain messages to certain file descriptiors:
- *    passwordPrompt - pty
- *    passphrasePrompt - pty
- *    authSuccessMsg - stderr (OpenSSH), 
- *    authFailedMsg - stderr
- *    hostKeyMissing - stderr
- *    hostKeyChanged - stderr
- *    continuePrompt - stderr
- * 
- * We will use a select to wait for a line on each descriptor. Then get
- * each line that available and take action based on it.  The type
- * of messages we are looking for and the action we take on each
- * message are:
- *   passwordPrompt - Return false, set error to ERR_NEED_PASSWD.
- *                    On the next call to connect() we expect a password
- *                    to be available.
- *                    
- *   passpharsePrompt - Return false, set error to ERR_NEED_PASSPHRASE.
- *                      On the next call to connect() we expect a
- *                      passphrase to be available.
- *   
- *   authSuccessMsg - Return true, as we have successfully established a
- *                    ssh connection.
- *   
- *   authFailedMsg - Return false, set error to ERR_AUTH_FAILED. We
- *                   were unable to authenticate the connection given
- *                   the available authentication information.
- *   
- *   hostKeyMissing - Return false, set error to ERR_NEW_HOST_KEY. Caller
- *                    must call KSshProcess.acceptHostKey(bool) to accept
- *                    or reject the key before calling connect() again.
- *   
- *   hostKeyChanged - Return false, set error to ERR_DIFF_HOST_KEY. Caller
- *                    must call KSshProcess.acceptHostKey(bool) to accept
- *                    or reject the key before calling connect() again.
- *   
- *   continuePrompt - Send 'yes' or 'no' to accept or reject a key,
- *                    respectively.
- *
- */
-
-
-void KSshProcess::acceptHostKey(bool accept) {
-    kdDebug(KSSHPROC) << "KSshProcess::acceptHostKey(accept:"
-        << accept << ")" << endl;
-    mAcceptHostKey = accept;
-}
-
-void KSshProcess::setPassword(TQString password) {
-    kdDebug(KSSHPROC) << "KSshProcess::setPassword(password:xxxxxxxx)" << endl;
-    mPassword = password;
-}
-
-TQString KSshProcess::getLine() {
-    static TQStringList buffer;
-    TQString line = TQString::null;
-    TQCString ptyLine, errLine;
-
-    if( buffer.empty() ) {
-        // PtyProcess buffers lines.  First check that there
-        // isn't something on the PtyProces buffer or that there
-        // is not data ready to be read from the pty or stderr.
-        ptyLine = ssh.readLineFromPty(false);
-        errLine = ssh.readLineFromStderr(false);
-
-        // If PtyProcess did have something for us, get it and
-        // place it in our line buffer.
-        if( ! ptyLine.isEmpty() ) {
-            buffer.prepend(TQString(ptyLine));
-        }
-
-        if( ! errLine.isEmpty() ) {
-            buffer.prepend(TQString(errLine));
-        }
-
-        // If we still don't have anything in our buffer so there must
-        // not be anything on the pty or stderr. Setup a select()
-        // to wait for some data from SSH.
-        // Hack around select() failure on newer systems
-        unsigned long milliseconds = 0;
-        while ((buffer.size() == 0) && (milliseconds < (60*1000))) {
-            //kdDebug(KSSHPROC) << "KSshProcess::getLine(): " <<
-            //    "Line buffer empty, calling select() to wait for data." << endl;
-            int errfd = ssh.stderrFd();
-            int ptyfd = ssh.fd();
-            fd_set rfds;
-            fd_set efds;
-            struct timeval tv;
-            
-            // find max file descriptor
-            int maxfd = ptyfd > errfd ? ptyfd : errfd;          
-            
-            FD_ZERO(&rfds);
-            FD_SET(ptyfd, &rfds);      // Add pty file descriptor
-            FD_SET(errfd, &rfds);      // Add std error file descriptor
-    
-            FD_ZERO(&efds);
-            FD_SET(ptyfd, &efds);
-            FD_SET(errfd, &efds);
-   
-            tv.tv_sec = 60; tv.tv_usec = 0; // 60 second timeout
-    
-            // Wait for a message from ssh on stderr or the pty.
-            int ret = -1;
-            do 
-              ret = ::select(maxfd+1, &rfds, NULL, &efds, &tv);
-            while( ret == -1 && errno == EINTR );
-    
-            // Handle any errors from select
-            if( ret == 0 ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): " <<
-                    "timed out waiting for a response" << endl;
-                mError = ERR_TIMED_OUT;
-                return TQString::null;
-            }
-            else if( ret == -1 ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    << "select error: " << strerror(errno) << endl;
-                mError = ERR_INTERNAL;
-                return TQString::null;
-            }
-    
-            // We are not respecting any type of order in which the
-            // lines were received. Who knows whether pty or stderr
-            // had data on it first.
-            if( FD_ISSET(ptyfd, &rfds) ) {
-                ptyLine = ssh.readLineFromPty(false);
-                if (ptyLine.size() > 0) {
-                    buffer.prepend(TQString(ptyLine));
-                }
-                //kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                //    "line from pty -" << ptyLine  << endl;
-            }
-
-            if( FD_ISSET(errfd, &rfds) ) {
-                errLine = ssh.readLineFromStderr(false);
-                if (errLine.size() > 0) {
-                    buffer.prepend(TQString(errLine));
-                }
-                //kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                //    "line from err -" << errLine << endl;
-            }
-
-            if( FD_ISSET(ptyfd, &efds) ) {
-                kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                    "Exception on pty file descriptor." << endl;
-            }
-
-            if( FD_ISSET(errfd, &efds) ) {
-                kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-                    "Exception on std err file descriptor." << endl;
-            }
-
-            if (buffer.size() == 0) {
-                milliseconds++;
-                usleep(1000);
-            }
-        }
-    }
-   
-    // We should have something in our buffer now.
-    // Return the last line.
-    //it = buffer.end();
-    //line = *it;
-    //buffer.remove(it);
-
-    line = buffer.last();
-    buffer.pop_back();
-
-    if( line.isNull() && buffer.count() > 0 ) {
-        line = buffer.last();
-        buffer.pop_back();
-    }
-    
-//    kdDebug(KSSHPROC) << "KSshProcess::getLine(): " << 
-//        buffer.count() << " lines in buffer" << endl;
-    kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
-        "ssh: " << line << endl;
-    
-
-    return line;
-}
-
-// All the different states we could go through while trying to connect.
-enum sshConnectState {
-    STATE_START, STATE_TRY_PASSWD, STATE_WAIT_PROMPT, STATE_NEW_KEY_CONTINUE,
-    STATE_DIFF_KEY_CONTINUE, STATE_FATAL, STATE_WAIT_CONTINUE_PROMPT,
-    STATE_SEND_CONTINUE, STATE_AUTH_FAILED, STATE_NEW_KEY_WAIT_CONTINUE,
-    STATE_DIFF_KEY_WAIT_CONTINUE, STATE_TRY_PASSPHRASE
-};
-
-// Print the state as a string. Good for debugging
-const char* stateStr(int state) {
-    switch(state) {
-        case STATE_START:
-            return "STATE_START";
-        case STATE_TRY_PASSWD:
-            return "STATE_TRY_PASSWD";
-        case STATE_WAIT_PROMPT:
-            return "STATE_WAIT_PROMPT";
-        case STATE_NEW_KEY_CONTINUE:
-            return "STATE_NEW_KEY_CONTINUE";
-        case STATE_DIFF_KEY_CONTINUE:
-            return "STATE_DIFF_KEY_CONTINUE";
-        case STATE_FATAL:
-            return "STATE_FATAL";
-        case STATE_WAIT_CONTINUE_PROMPT:
-            return "STATE_WAIT_CONTINUE_PROMPT";
-        case STATE_SEND_CONTINUE:
-            return "STATE_SEND_CONTINE";
-        case STATE_AUTH_FAILED:
-            return "STATE_AUTH_FAILED";
-        case STATE_NEW_KEY_WAIT_CONTINUE:
-            return "STATE_NEW_KEY_WAIT_CONTINUE";
-        case STATE_DIFF_KEY_WAIT_CONTINUE:
-            return "STATE_DIFF_KEY_WAIT_CONTINUE";
-        case STATE_TRY_PASSPHRASE:
-            return "STATE_TRY_PASSPHRASE";
-    }
-    return "UNKNOWN";
-}
-
-bool KSshProcess::connect() {
-    if( mVersion == UNKNOWN_VER ) {
-        // we don't know the ssh version yet, so find out
-        version();
-        if( mVersion == -1 ) {
-            return false;
-        }
-    }
-
-    // We'll put a limit on the number of state transitions
-    // to ensure we don't go out of control.
-    int transitionLimit = 500;
-
-    while(--transitionLimit) {
-        kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-            << "Connect state " << stateStr(mConnectState) << endl;
-        
-        TQString line;      // a line from ssh
-        TQString msgBuf;    // buffer for important messages from ssh
-                           // which are to be returned to the user
-        
-        switch(mConnectState) {
-        // STATE_START:
-        // Executes the ssh binary with the options provided.  If no options
-        // have been specified, sets error and returns false. Continue to
-        // state 1 if execution is successful, otherwise set error and 
-        // return false.
-        case STATE_START:
-            // reset some key values to safe values
-            mAcceptHostKey = false;
-            mKeyFingerprint = TQString::null;
-            mKnownHostsFile = TQString::null;
-            
-            if( mArgs.isEmpty() ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): ssh options "
-                    "need to be set first using setArgs()" << endl;
-                mError = ERR_NO_OPTIONS;
-                mErrorMsg = i18n("No options provided for ssh execution.");
-                return false;
-            }
-
-            if( ssh.exec(mSshPath.latin1(), mArgs) ) {
-                kdDebug(KSSHPROC) << 
-                    "KSshProcess::connect(): ssh exec failed" << endl;
-                mError = ERR_CANNOT_LAUNCH;
-                mErrorMsg = i18n("Failed to execute ssh process.");
-                return false;
-            }
-           
-            kdDebug(KSSHPROC) << "KSshPRocess::connect(): ssh pid = " << ssh.pid() << endl;
-	    
-            // set flag to indicate what have started a ssh process
-            mRunning = true;
-            mConnectState = STATE_WAIT_PROMPT;
-            break;
-        
-        // STATE_WAIT_PROMPT:
-        // Get a line of input from the ssh process. Check the contents 
-        // of the line to determine the next state. Ignore the line
-        // if we don't recognize its contents.  If the line contains
-        // the continue prompt, we have an error since we should never
-        // get that line in this state.  Set ERR_INVALID_STATE error
-        // and return false.
-        case STATE_WAIT_PROMPT:
-            line = getLine();
-            if( line.isNull() ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "Got null line in STATE_WAIT_PROMPT." << endl;
-                mError = ERR_INTERACT;
-                mErrorMsg =
-                    i18n("Error encountered while talking to ssh.");
-                mConnectState = STATE_FATAL;
-            }
-            else if( line.find(TQString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) {
-                mConnectState = STATE_TRY_PASSWD;
-            }
-            else if( line.find(passphrasePrompt[mVersion]) != -1 ) {
-                mConnectState = STATE_TRY_PASSPHRASE;
-            }
-            else if( line.find(authSuccessMsg[mVersion]) != -1 ) {
-                return true;
-            }
-            else if( line.find(authFailedMsg[mVersion]) != -1
-                    && line.find(tryAgainMsg[mVersion]) == -1 ) {
-                mConnectState = STATE_AUTH_FAILED;
-            }
-            else if( line.find(hostKeyMissingMsg[mVersion]) != -1 ) {
-                mConnectState = STATE_NEW_KEY_WAIT_CONTINUE;
-            }
-            else if( line.find(hostKeyChangedMsg[mVersion]) != -1 ) {
-                mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE;
-            }
-            else if( line.find(continuePrompt[mVersion]) != -1 ) {
-                //mConnectState = STATE_SEND_CONTINUE;
-                kdDebug(KSSHPROC) << "KSshProcess:connect(): "
-                    "Got continue prompt where we shouldn't (STATE_WAIT_PROMPT)"
-                    << endl;
-                mError = ERR_INTERACT;
-                mErrorMsg =
-                    i18n("Error encountered while talking to ssh.");
-            }
-            else if( line.find(connectionClosedMsg[mVersion]) != -1 ) {
-                mConnectState = STATE_FATAL;
-                mError = ERR_CLOSED_BY_REMOTE_HOST;
-                mErrorMsg = i18n("Connection closed by remote host.");
-            }
-            else if( line.find(changeHostKeyOnDiskPrompt[mVersion]) != -1 ) {
-                // always say yes to this.  It always comes after commerical ssh
-                // prints a "continue to connect prompt". We assume that if the
-                // user choose to continue, then they also want to save the
-                // host key to disk.
-                ssh.writeLine("yes");
-            }
-            else {
-                // ignore line
-            }
-            break; 
-
-        // STATE_TRY_PASSWD:
-        // If we have password send it to the ssh process, else
-        // set error ERR_NEED_PASSWD and return false to the caller.
-        // The caller then must then call KSshProcess::setPassword(TQString)
-        // before calling KSshProcess::connect() again.
-        //
-        // Almost exactly liek STATE_TRY_PASSPHRASE.  Check there if you
-        // make changes here.
-        case STATE_TRY_PASSWD:
-            // We have a password prompt waiting for us to supply
-            // a password.  Send that password to ssh.  If the caller
-            // did not supply a password like we asked, then ask
-            // again.
-            if( !mPassword.isEmpty() ) {
-//                ssh.WaitSlave();
-                ssh.writeLine(mPassword.latin1());
-                
-                // Overwrite the password so it isn't in memory.
-                mPassword.fill(TQChar('X'));
-                
-                // Set the password to null so we will request another
-                // password if this one fails.
-                mPassword = TQString::null;
-                
-                mConnectState = STATE_WAIT_PROMPT;
-            }
-            else {
-                kdDebug(KSSHPROC) << "KSshProcess::connect() "
-                    "Need password from caller." << endl;
-                // The caller needs to supply a password before
-                // connecting can continue.
-                mError = ERR_NEED_PASSWD;
-                mErrorMsg = i18n("Please supply a password.");
-                mConnectState = STATE_TRY_PASSWD;
-                return false;
-            }
-            break;
-
-        // STATE_TRY_KEY_PASSPHRASE:
-        // If we have passphrase send it to the ssh process, else
-        // set error ERR_NEED_PASSPHRASE and return false to the caller.
-        // The caller then must then call KSshProcess::setPassword(TQString)
-        // before calling KSshProcess::connect() again.
-        //
-        // Almost exactly like STATE_TRY_PASSWD. The only difference is 
-        // the error we set if we don't have a passphrase.  We duplicate
-        // this code to keep in the spirit of the state machine.
-        case STATE_TRY_PASSPHRASE:
-            // We have a passphrase prompt waiting for us to supply
-            // a passphrase.  Send that passphrase to ssh.  If the caller
-            // did not supply a passphrase like we asked, then ask
-            // again.
-            if( !mPassword.isEmpty() ) {
-//                ssh.WaitSlave();
-                ssh.writeLine(mPassword.latin1());
-                
-                // Overwrite the password so it isn't in memory.
-                mPassword.fill(TQChar('X'));
-                
-                // Set the password to null so we will request another
-                // password if this one fails.
-                mPassword = TQString::null;
-                
-                mConnectState = STATE_WAIT_PROMPT;
-            }
-            else {
-                kdDebug(KSSHPROC) << "KSshProcess::connect() "
-                    "Need passphrase from caller." << endl;
-                // The caller needs to supply a passphrase before
-                // connecting can continue.
-                mError = ERR_NEED_PASSPHRASE;
-                mErrorMsg = i18n("Please supply the passphrase for " 
-                    "your SSH private key.");
-                mConnectState = STATE_TRY_PASSPHRASE;
-                return false;
-            }
-            break;
-
-        // STATE_AUTH_FAILED:
-        // Authentication has failed.  Tell the caller by setting the
-        // ERR_AUTH_FAILED error and returning false. If
-        // auth has failed then ssh should have exited, but
-        // we will kill it to make sure. 
-        case STATE_AUTH_FAILED:
-            mError = ERR_AUTH_FAILED;
-            mErrorMsg = i18n("Authentication to %1 failed").arg(mHost);
-            mConnectState = STATE_FATAL;
-            break; 
-        
-        // STATE_NEW_KEY_WAIT_CONTINUE:
-        // Grab lines from ssh until we get a continue prompt or a auth
-        // denied.  We will get the later if StrictHostKeyChecking is set
-        // to yes.  Go to STATE_NEW_KEY_CONTINUE if we get a continue prompt.
-        case STATE_NEW_KEY_WAIT_CONTINUE:
-            line = getLine();
-            if( line.isNull() ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "Got null line in STATE_NEW_KEY_WAIT_CONTINUE." << endl;
-                mError = ERR_INTERACT;
-                mErrorMsg =
-                    i18n("Error encountered while talking to ssh.");
-                mConnectState = STATE_FATAL;
-            }
-            else if( (line.find(authFailedMsg[mVersion]) != -1
-                           && line.find(tryAgainMsg[mVersion]) == -1)
-                    || line.find(hostKeyVerifyFailedMsg[mVersion]) != -1 ) {
-                mError = ERR_AUTH_FAILED_NEW_KEY;
-                mErrorMsg = i18n(
-                    "The identity of the remote host '%1' could not be verified "
-                    "because the host's key is not in the \"known hosts\" file."
-                ).arg(mHost);
-                
-                if( mKnownHostsFile.isEmpty() ) {
-                    mErrorMsg += i18n(
-                        " Manually, add the host's key to the \"known hosts\" "
-                        "file or contact your administrator."
-                    );
-                }
-                else {
-                    mErrorMsg += i18n(
-                        " Manually, add the host's key to %1 "
-                        "or contact your administrator."
-                    ).arg(mKnownHostsFile);
-                }
-
-                mConnectState = STATE_FATAL;
-            }
-            else if( line.find(continuePrompt[mVersion]) != -1 ) {
-                mConnectState = STATE_NEW_KEY_CONTINUE;
-            }
-            else if( line.find(connectionClosedMsg[mVersion]) != -1 ) {
-                mConnectState = STATE_FATAL;
-                mError = ERR_CLOSED_BY_REMOTE_HOST;
-                mErrorMsg = i18n("Connection closed by remote host.");
-            }
-            else if( line.find(keyFingerprintMsg[mVersion]) != -1 ) {
-                mKeyFingerprint = keyFingerprintMsg[mVersion].cap();
-                kdDebug(KSSHPROC) << "Found key fingerprint: " << mKeyFingerprint << endl;
-                mConnectState = STATE_NEW_KEY_WAIT_CONTINUE;
-            }
-            else {
-                // ignore line
-            }
-            break; 
-            
-        
-        // STATE_NEW_KEY_CONTINUE:
-        // We got a continue prompt for the new key message.  Set the error 
-        // message to reflect this, return false and hope for caller response.
-        case STATE_NEW_KEY_CONTINUE:
-            mError = ERR_NEW_HOST_KEY;
-            mErrorMsg = i18n(
-                "The identity of the remote host '%1' could not be "
-                "verified. The host's key fingerprint is:\n%2\nYou should "
-                "verify the fingerprint with the host's administrator before "
-                "connecting.\n\n"
-                "Would you like to accept the host's key and connect anyway? "
-            ).arg(mHost).arg(mKeyFingerprint);
-            mConnectState = STATE_SEND_CONTINUE;
-            return false;
-
-        // STATE_DIFF_KEY_WAIT_CONTINUE:
-        // Grab lines from ssh until we get a continue prompt or a auth
-        // denied.  We will get the later if StrictHostKeyChecking is set
-        // to yes.  Go to STATE_DIFF_KEY_CONTINUE if we get a continue prompt.
-        case STATE_DIFF_KEY_WAIT_CONTINUE:
-            line = getLine();
-            if( line.isNull() ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "Got null line in STATE_DIFF_KEY_WAIT_CONTINUE." << endl;
-                mError = ERR_INTERACT;
-                mErrorMsg =
-                    i18n("Error encountered while talking to ssh.");
-                mConnectState = STATE_FATAL;
-            }
-            else if( (line.find(authFailedMsg[mVersion]) != -1
-                           && line.find(tryAgainMsg[mVersion]) == -1)
-                    || line.find(hostKeyVerifyFailedMsg[mVersion]) != -1 ) {
-                mError = ERR_AUTH_FAILED_DIFF_KEY;
-                mErrorMsg = i18n(
-                    "WARNING: The identity of the remote host '%1' has changed!\n\n"
-                    "Someone could be eavesdropping on your connection, or the "
-                    "administrator may have just changed the host's key. "
-                    "Either way, you should verify the host's key fingerprint with the host's "
-                    "administrator. The key fingerprint is:\n%2\n"
-                    "Add the correct host key to \"%3\" to "
-                    "get rid of this message."
-                ).arg(mHost).arg(mKeyFingerprint).arg(mKnownHostsFile);
-                mConnectState = STATE_FATAL;
-            }
-            else if( line.find(continuePrompt[mVersion]) != -1 ) {
-                mConnectState = STATE_DIFF_KEY_CONTINUE;
-            }
-            else if( line.find(keyFingerprintMsg[mVersion]) != -1 ) {
-                mKeyFingerprint = keyFingerprintMsg[mVersion].cap();
-                kdDebug(KSSHPROC) << "Found key fingerprint: " << mKeyFingerprint << endl;
-                mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE;
-            }
-            else if( line.find(knownHostsFileMsg[mVersion]) != -1 ) {
-                mKnownHostsFile = (knownHostsFileMsg[mVersion]).cap(1);
-                kdDebug(KSSHPROC) << "Found known hosts file name: " << mKnownHostsFile << endl;
-                mConnectState = STATE_DIFF_KEY_WAIT_CONTINUE;
-            }
-            else {
-                // ignore line
-            }
-            break; 
-            
-        // STATE_DIFF_KEY_CONTINUE:
-        // We got a continue prompt for the different key message. 
-        // Set ERR_DIFF_HOST_KEY error
-        // and return false to signal need to caller action.
-        case STATE_DIFF_KEY_CONTINUE:
-            mError = ERR_DIFF_HOST_KEY;
-            mErrorMsg = i18n(
-                "WARNING: The identity of the remote host '%1' has changed!\n\n"
-                "Someone could be eavesdropping on your connection, or the "
-                "administrator may have just changed the host's key. "
-                "Either way, you should verify the host's key fingerprint with the host's "
-                "administrator before connecting. The key fingerprint is:\n%2\n\n"
-                "Would you like to accept the host's new key and connect anyway?"
-            ).arg(mHost).arg(mKeyFingerprint);
-            mConnectState = STATE_SEND_CONTINUE;
-            return false;
-
-        // STATE_SEND_CONTINUE:
-        // We found a continue prompt.  Send our answer.
-        case STATE_SEND_CONTINUE:
-            if( mAcceptHostKey ) {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "host key accepted" << endl;
-                ssh.writeLine("yes");
-                mConnectState = STATE_WAIT_PROMPT;
-            }
-            else {
-                kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                    "host key rejected" << endl;
-                ssh.writeLine("no");
-                mError = ERR_HOST_KEY_REJECTED;
-                mErrorMsg = i18n("Host key was rejected.");
-                mConnectState = STATE_FATAL;
-            }
-            break;
-
-        // STATE_FATAL:
-        // Something bad happened that we cannot recover from.
-        // Kill the ssh process and set flags to show we have
-        // ended the connection and killed ssh.
-        // 
-        // mError and mErrorMsg should be set by the immediately
-        // previous state.
-        case STATE_FATAL:
-            kill();
-            mConnected = false;
-            mRunning = false;
-            mConnectState = STATE_START;
-            // mError, mErroMsg set by last state
-            return false;
-        
-        default:
-            kdDebug(KSSHPROC) << "KSshProcess::connect(): "
-                "Invalid state number - " << mConnectState << endl;
-            mError = ERR_INVALID_STATE;
-            mConnectState = STATE_FATAL;
-        }
-    }
-
-    // we should never get here
-    kdDebug(KSSHPROC) << "KSshProcess::connect(): " <<
-        "After switch(). We shouldn't be here." << endl;
-    mError = ERR_INTERNAL;
-    return false;
-}
-            
-void KSshProcess::disconnect() {
-    kill();
-    mConnected = false;
-    mRunning = false;
-    mConnectState = STATE_START;
-}
-
diff --git a/tdeioslave/sftp/ksshprocess.h b/tdeioslave/sftp/ksshprocess.h
deleted file mode 100644
index 5130628e4..000000000
--- a/tdeioslave/sftp/ksshprocess.h
+++ /dev/null
@@ -1,623 +0,0 @@
-/***************************************************************************
-                          ksshprocess.h  -  description
-                             -------------------
-    begin                : Tue Jul 31 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@purdue.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef KSSHPROCESS_H
-#define KSSHPROCESS_H
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include <tqvaluelist.h>
-
-#include <kdebug.h>
-
-#include "process.h"
-
-#define KSSHPROC 7120
-
-/**
- * Provides version independent access to ssh. Currently supported
- * versions of SSH are:
- *   OpenSSH 2.9p1
- *   OpenSSH 2.9p2
- *   OpenSSH 3.0
- *   OpenSSH 3.1
- *   Commercial SSH 3.0.0
- * Other versions of OpenSSH and commerical SSH will probably work also.
- *
- * To setup a SSH connection first create a list of options to use and tell
- * KSshProcess about your options. Then start the ssh connection. Once the
- * connection is setup use the  stdin, stdout, stderr, and pty file descriptors
- * to communicate with ssh. For a detailed example of how to use, see
- * ksshprocesstest.cpp.
- *
- * @author Lucas Fisher
- *
- * Example: Connect to ssh server on localhost
- *   KSshProcess::SshOpt opt;
- *   KSshProcess::SshOptList options;
- *
- *   opt.opt = KSshProcess::SSH_HOST;
- *   opt.str = "localhost";
- *   options.append(opt);
- *
- *   opt.opt = KSshProcess::SSH_USERNAME;
- *   opt.str = "me";
- *   options.append(opt);
- *
- *   KSshProcess ssh;
- *   if( !ssh.setOptions(options) ) {
- *       int err = ssh.error();
- *       // process error
- *        return false;
- *   }
- *
- *   int err;
- *   TQString errMsg;
- *   while( !ssh.connect() ) {
- *       err = ssh.error(errMsg);
- *       
- *       switch( err ) {
- *       case KSshProcess::ERR_NEW_HOST_KEY:
- *       case KSshProcess::ERR_DIFF_HOST_KEY:
- *           // ask user to accept key
- *           if( acceptHostKey ) {
- *               ssh.acceptKey(true);
- *           }
- *           break;
- *
- *       case KSshProcess::ERR_NEED_PASSWORD:
- *           // ask user for password
- *           ssh.password(userPassword);
- *           break;
- *       
- *       case KSshProcess::ERR_NEED_KEY_PASSPHRASE:
- *           // ask user for their key passphrase
- *           ssh.keyPassphrase(keyPassphrase);
- *           break;
- *
- *       default:
- *           // somethings wrong, alert user
- *           return;
- *       }
- *   }
- *   // We have an open ssh connection to localhost
- *
- */
-
-class KSshProcess {
-public:
-    /**
-     * SSH Option
-     *
-     * Stores SSH options for use with KSshProcess.
-     *
-     * SSH options are configured much like UDS entries.
-     * Each option is assigned a constant and a string, bool,
-     * or number is assigned based on the option.
-     *
-     * @author Lucas Fisher (ljfisher@iastate.edu)
-     */
-    class SshOpt {
-    public:
-        TQ_UINT32 opt;
-        TQString  str;
-        TQ_INT32  num;
-        bool     boolean;
-    };
-
-    /**
-     * List of SshOptions and associated iterators
-     */
-    typedef TQValueList<SshOpt> SshOptList;
-    typedef TQValueListIterator<SshOpt> SshOptListIterator;
-    typedef TQValueListConstIterator<SshOpt> SshOptListConstIterator;
-
-    /**
-     * Ssh versions supported by KSshProcess. Subject to change
-     * at any time.
-     */
-    enum SshVersion {
-	OPENSSH_3_6,
-        OPENSSH,
-        SSH,
-        SSH_VER_MAX,
-        UNKNOWN_VER
-    };	
-
-    /**
-     * SSH options supported by KSshProcess.  Set SshOpt::opt to one of these
-     * values.
-     */
-    // we cannot do this like UDSAtomType (ORing the type with the name) because
-    // we have too many options for ssh and not enough bits.
-    enum SshOptType {
-        /**
-         * Request server to invoke subsystem. (str)
-         */
-        SSH_SUBSYSTEM,
-        /**
-         * Connect to port on the server. (num)
-         */
-        SSH_PORT,
-        /**
-         * Connect to host. (str)
-         */
-        SSH_HOST,
-        /**
-         * connect using this username. (str)
-         */
-        SSH_USERNAME,
-        /** 
-         * connect using this password. (str)
-         */
-        SSH_PASSWD,
-        /**
-         * connect using this version of the SSH protocol. num == 1 or 2
-         */
-        SSH_PROTOCOL,
-        /**
-         * whether to forward X11 connections. (boolean)
-         */
-        SSH_FORWARDX11,
-        /**
-         * whether to do agent forwarding. (boolean)
-         */
-        SSH_FORWARDAGENT,
-        /**
-         * use as escape character. 0 for none  (num)
-         */
-        SSH_ESCAPE_CHAR,
-        /**
-         * command for ssh to perform once it is connected (str)
-         */
-        SSH_COMMAND,
-        /**
-         * Set ssh verbosity. This may be added multiple times. It may also cause KSSHProcess
-         * to fail since we don't understand all the debug messages.
-         */
-        SSH_VERBOSE,
-        /**
-         * Set a ssh option as one would find in the ssh_config file
-         * The str member should be set to 'optName value'
-         */
-        SSH_OPTION,
-        /**
-         * Set some other option not supported by KSSHProcess. The option should
-         * be specified in the str member of SshOpt. Careful with this since
-         * not all versions of SSH support the same options.
-         */
-        SSH_OTHER,
-        SSH_OPT_MAX // always last
-    }; // that's all for now
-
-    /**
-     * Errors that KSshProcess can encounter.  When a member function returns
-     * false, call error() to retrieve one of these error codes.
-     */
-    enum SshError {
-        /**
-         * Don't recognize the ssh version
-         */
-        ERR_UNKNOWN_VERSION,
-        /**
-         * Cannot lauch ssh client
-         */
-        ERR_CANNOT_LAUNCH,
-        /**
-         * Interaction with the ssh client failed. This happens when we can't
-         * find the password prompt or something similar
-         */
-        ERR_INTERACT,
-        /**
-         * Arguments for both a remotely executed subsystem and command were provide.
-         * Only one or the other may be used
-         */
-        ERR_CMD_SUBSYS_CONFLICT,
-        /**
-         * No password was supplied
-         */
-        ERR_NEED_PASSWD,
-        /**
-         * No passphrase was supplied.
-         */
-        ERR_NEED_PASSPHRASE,
-        /**
-         * No usename was supplied
-         */
-        ERR_NEED_USERNAME,
-        /**
-         * Timed out waiting for a response from ssh or the server
-         */
-        ERR_TIMED_OUT,
-        /**
-         * Internal error, probably from a system call
-         */
-        ERR_INTERNAL,
-        /**
-         * ssh was disconnect from the host
-         */
-        ERR_DISCONNECTED,
-        /**
-         * No ssh options have been set. Call setArgs() before calling connect.
-         */
-        ERR_NO_OPTIONS,
-        /**
-         * A host key was received from an unknown host. 
-         * Call connect() with the acceptHostKey argument to accept the key.
-         */
-        ERR_NEW_HOST_KEY,
-        /**
-         * A host key different from what is stored in the user's known_hosts file
-         * has be received. This is an indication of an attack
-         */
-        ERR_DIFF_HOST_KEY,
-        /**
-         * A new or different host key was rejected by the caller. The ssh
-         * connection was terminated and the ssh process killed.
-         */
-        ERR_HOST_KEY_REJECTED,
-        /**
-         * An invalid option was found in the SSH option list
-         */
-        ERR_INVALID_OPT,
-        /**
-         * SSH accepted host key without prompting user.
-         */
-        ERR_ACCEPTED_KEY,
-        /**
-         * Authentication failed
-         */
-        ERR_AUTH_FAILED,
-        /**
-         * Authentication failed because a new host key was detected and 
-         * SSH is configured with strict host key checking enabled.
-         */
-        ERR_AUTH_FAILED_NEW_KEY,
-        /**
-         * Authentication failed because a changed host key was detected and 
-         * SSH is configured with strict host key checking enabled.
-         */
-        ERR_AUTH_FAILED_DIFF_KEY,
-        /**
-         * The remote host closed the connection for unknown reasons.
-         */
-        ERR_CLOSED_BY_REMOTE_HOST,
-        /**
-         * We have no idea what happened
-         */
-        ERR_UNKNOWN,
-        /**
-         * The connect state machine entered an invalid state.
-         */
-        ERR_INVALID_STATE,
-        ERR_MAX
-    };
-
-    /**
-     * Initialize a SSH process using the first SSH binary found in the PATH
-     */
-    KSshProcess();
-
-    /**
-     * Initialize a SSH process using the specified SSH binary.
-     * @param pathToSsh The fully qualified path name of the ssh binary
-     *                  KSshProcess should use to setup a SSH connection.
-     */
-    KSshProcess(TQString pathToSsh);
-    ~KSshProcess();
-
-    /**
-     * Set the ssh binary KSshProcess should use. This will only affect the
-     * next ssh connection attempt using this instance.
-     *
-     * @param pathToSsh Full path to the ssh binary.
-     *
-     * @return True if the ssh binary is found and KSshProcess
-     *         recognizes the version.
-     *
-     */
-     bool setSshPath(TQString pathToSsh);
-
-    /**
-     * Get the ssh version.
-     *
-     * @return  The ssh version or -1 if KSshProcess does not recognize
-     *          the ssh version. The returned value corresponds to the
-     *          member of the SshVersion enum.
-     */
-    SshVersion version();
-
-    /**
-     * Get a string describing the ssh version
-     *
-     * @return A string describing the ssh version recognized by KSshProcess
-     */
-    //TQString versionStr();
-
-    /**
-     * Get the last error encountered by KSshProcess.
-     *
-     * @param msg Set to the error message, if any, outputted by ssh when it is run.
-     *
-     * @return The error number. See SshError for descriptions.
-     */
-    int error(TQString& msg);
-
-    /**
-     * Get the last error encountered by KSshProcess.
-     * @return The error number. See SshError for descriptions.
-     */
-    int error() { return mError; }
-
-    TQString errorMsg() { return mErrorMsg; }
-
-    /**
-     * Send a signal to the ssh process. Do not use this to end the
-     * ssh connection as it will not correctly reset the internal
-     * state of the KSshProcess object.  Use KSshProcess::disconnect()
-     * instead.
-     *
-     * @param signal The signal to send to the ssh process. See 'kill -l'
-     *               for a list of possible signals.
-     *               The default signal is SIGKILL which kills ssh.
-     *
-     */
-    void kill(int signal = SIGKILL);
-
-    /**
-     * The pid of the ssh process started by this instance of KSshProcess.
-     * Only valid if KSshProcess::running() returns true;
-     * 
-     * @return The pid of the running ssh process.
-     */
-    int pid() { return ssh.pid(); }
-    
-    /**
-     * Whether a ssh connection has been  established with a
-     * remote host.  A establish connection means ssh has successfully
-     * authenticated with the remote host and user data can be transfered
-     * between the local and remote host.  This cannot return
-     * true unless the most recent call to KSshProccess::connect() returned true.
-     *
-     * @return True if a ssh connection has been established with a remote
-     *         host. False otherwise.
-     */
-    bool connected() { return mConnected; }
-
-    /**
-     * Whether a ssh process is currently running.  This  only indicates
-     * if a ssh process has been started and is still running.  It does not
-     * tell if authentication has been successful.  This may return true
-     * even if the most recent call to KSshProcess::connect() returned false.
-     *
-     * @return True if a ssh process started by this instance of KSshProcess
-     *         is running. False otherwise.
-     */
-    bool running() { return mRunning; }
-    
-    /**
-     * Print the command line arguments ssh is run with using kdDebug.
-     */
-    void printArgs();
-
-    /**
-     * Set the SSH options.
-     * This must be called before connect().  See SshOptType for a list of
-     * supported ssh options.  The required options are SSH_USERNAME 
-     * and SSH_HOST.
-     *
-     * To reset the saved options, just recall setOptions() again with
-     * a different options list.
-     *
-     * @param opts A list of SshOpt objects specifying the ssh options.
-     *
-     * @return True if all options are valid. False if unrecognized options
-     *         or a required option is missing. Call error()
-     *         for details.
-     *
-     */
-    bool setOptions(const SshOptList& opts);
-
-    /**
-     * Create a ssh connection based on the options provided by setOptions().
-     * Sets one of the following error codes on failure:
-     * <ul>
-     * <li>ERR_NO_OPTIONS</li>
-     * <li>ERR_CANNOT_LAUNCH</li>
-     * <li>ERR_INVALID_STATE</li>
-     * <li>ERR_NEED_PASSWD</li>
-     * <li>ERR_AUTH_FAILED</li>
-     * <li>ERR_NEW_HOST_KEY</li>
-     * <li>ERR_KEY_ACCEPTED</li>
-     * <li>ERR_DIFF_HOST_KEY</li>
-     * <li>ERR_INTERNAL</li>
-     * <li>ERR_INTERACT</li>
-     * </ul>
-     *
-     * @param acceptHostKey When true KSshProcess will automatically accept
-     *                      unrecognized or changed host keys.
-     *
-     * @return True if the ssh connection is successful. False if the connection
-     *         fails.  Call error() to get the reason for the failure.
-     */
-    bool connect();
-
-
-    /**
-     * Disconnect ssh from the host.  This kills the ssh process and
-     * resets the internal state of this KSshProcess object. After a 
-     * disconnect, the same KSshProcess can be used to connect to a
-     * host.
-     */
-    void disconnect();
-    
-    /**
-     * Call to respond to a ERR_NEW_HOST_KEY or ERR_DIFF_HOST_KEY error.
-     * 
-     * @param accept True to accept the host key, false to not accept the
-     *               host key and kill ssh.
-     * 
-     */
-    void acceptHostKey(bool accept);
-
-    /**
-     * Call to respond to a ERR_NEED_PASSWD or ERR_NEED_PASSPHRASE error.
-     *
-     * @param password The user password to give ssh.
-     */
-    void setPassword(TQString password);
-     
-    /**
-     * Access to standard in and out of the ssh process.
-     *
-     * @return The file description for stdin and stdout of the ssh process.
-     */
-    int stdioFd() { return ssh.stdioFd(); }
-
-    /**
-     * Access to standard error of the ssh process.
-     *
-     * @return The file descriptior for stderr of the ssh process.
-     */
-    int stderrFd() { return ssh.stderrFd(); }
-
-    /**
-     * Access the pty to which the ssh process is attached.
-     *
-     * @return The file descriptor of pty to which ssh is attached.
-     */
-    int pty() { return ssh.fd(); }
-private:
-    /**
-     * Path the the ssh binary.
-     */
-    TQString mSshPath;
-    
-    /**
-     * SSH version.  This is an index into the supported SSH 
-     * versions array, and the various messages arrays.
-     */
-    SshVersion mVersion;
-
-    /**
-     * User's password.  Zero this out when it is no longer needed.
-     */
-    TQString mPassword;
-    
-    /**
-     * User's username.
-     */
-    TQString mUsername;
-    
-    /**
-     * Name of host we are connecting to.
-     */
-    TQString mHost;
-
-    /**
-     * Accept new or changed host keys if true.
-     */
-    bool mAcceptHostKey;
-    
-    /**
-     * Flag to tell use if we have an open, authenticated ssh
-     * session going.
-     */
-    bool mConnected;
-    
-    /**
-     * Flag to tell us if we have started a ssh process, we use this
-     * to make sure we kill ssh before going away.
-     */
-    bool mRunning;
-
-    /**
-     * Save any key fingerprint msg from ssh so we can present
-     * it to the caller.
-     */
-    TQString mKeyFingerprint;
-
-    /**
-     * The location of the known host key file. We grab this from
-     * any error messages ssh prints out.
-     */
-    TQString mKnownHostsFile;
-
-    /**
-     * The state of our connect state machine.
-     */
-    int mConnectState;
-    
-    /**
-     * Port on on which the target ssh server is listening.
-     */
-    int mPort;
-
-    /**
-     * The last error number encountered. This is only valid for the
-     * last error.
-     */
-    SshError mError;
-
-    /**
-     * An error message that corresponds to the error number set in
-     * mError.  Optional.
-     */
-    TQString mErrorMsg;
-    
-    /**
-     * Interface to the SSH process we ceate.  Handles communication
-     * to and from the SSH process using stdin, stdout, stderr, and
-     * pty.
-     */
-    MyPtyProcess ssh;
-
-    /**
-     * List of arguments we start SSH with.
-     */
-    QCStringList mArgs;
-    void init();
-
-    /**
-      * Handler to clean up when ssh process terminates.
-      */
-    static void SIGCHLD_handler(int signo);
-    void installSignalHandlers();
-    void removeSignalHandlers();
-
-    TQString getLine();
-    
-    static TQRegExp versionStrs[];
-    static const char * const passwordPrompt[];
-    static const char * const passphrasePrompt[];
-    static const char * const authSuccessMsg[];
-    static const char * const authFailedMsg[];
-    static TQRegExp hostKeyMissingMsg[];
-    static const char * const hostKeyChangedMsg[];
-    static const char * const continuePrompt[];
-    static const char * const hostKeyAcceptedMsg[];
-    static const char * const tryAgainMsg[];
-    static TQRegExp hostKeyVerifyFailedMsg[];
-    static const char * const connectionClosedMsg[];
-    static const char * const changeHostKeyOnDiskPrompt[];
-    static TQRegExp keyFingerprintMsg[];
-    static TQRegExp knownHostsFileMsg[];
-};
-#endif
diff --git a/tdeioslave/sftp/ksshprocesstest.cpp b/tdeioslave/sftp/ksshprocesstest.cpp
deleted file mode 100644
index 59dbf58c7..000000000
--- a/tdeioslave/sftp/ksshprocesstest.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "ksshprocess.h"
-#include <iostream>
-
-using namespace std;
-
-int main(int argc, char *argv[]) {
-
-    if( argc < 5 ) {
-        cout << "Usage: " << argv[0] << 
-            " <ssh path> <host> <username> <password>" << endl;
-        return 1;
-    }
-
-    KSshProcess ssh(argv[1]);
-    cout << ssh.version() << endl;
-    
-    KSshProcess::SshOptList opts;
-    KSshProcess::SshOpt opt;
-
-    opt.opt = KSshProcess::SSH_PORT;
-    opt.num = 22;
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_HOST;
-    opt.str = TQString(argv[2]);
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_USERNAME;
-    opt.str = TQString(argv[3]);
-    opts.append(opt);
-
-//    opt.opt = KSshProcess::SSH_PASSWD;
-//    opt.str = TQString(argv[4]);
-//   opts.append(opt);
-
-    if( !ssh.setOptions(opts) ) {
-        cout << "ksshprocesstest: setOptions failed" << endl;
-        return -1;
-    }
-
-    ssh.printArgs();
-
-    bool stop = false;
-    bool connected;
-    char buf[256];
-    char c;
-    while( !stop && !(connected = ssh.connect()) ) {
-        cout << "ksshprocesstest: Error num - " << ssh.error() << endl;
-        cout << "ksshprocesstest: Error msg - " << ssh.errorMsg().latin1() << endl;
-        switch( ssh.error() ) {
-            case KSshProcess::ERR_NEED_PASSWD:
-            case KSshProcess::ERR_NEED_PASSPHRASE:
-                cout << "Password: ";
-                cin >> buf;
-                cout << "password is " << buf << endl;
-                ssh.setPassword(TQString(buf));
-                break;
-            case KSshProcess::ERR_NEW_HOST_KEY:
-            case KSshProcess::ERR_DIFF_HOST_KEY:
-                cout << "Accept host key? (y/n): ";
-                cin >> c;
-                cout << "Answered " << c << endl;
-                ssh.acceptHostKey(c == 'y' ? true : false);
-                break;
-            case KSshProcess::ERR_AUTH_FAILED:
-                cout << "ksshprocesstest: auth failed." << endl;
-                stop = true;
-                break;
-            case KSshProcess::ERR_AUTH_FAILED_NEW_KEY:
-                cout << "ksshprocesstest: auth failed because of new key." << endl;
-                stop = true;
-                break;
-            case KSshProcess::ERR_AUTH_FAILED_DIFF_KEY:
-                cout << "ksshprocesstest: auth failed because of changed key." << endl;
-                stop = true;
-                break;
-            
-            case KSshProcess::ERR_INTERACT:
-            case KSshProcess::ERR_INTERNAL:
-            case KSshProcess::ERR_UNKNOWN:
-            case KSshProcess::ERR_INVALID_STATE:
-            case KSshProcess::ERR_CANNOT_LAUNCH:
-            case KSshProcess::ERR_HOST_KEY_REJECTED:
-                cout << "ksshprocesstest: FATAL ERROR" << endl;
-                stop = true;
-                break;
-                
-        }
-    }
-
-    if( connected ) {
-        cout << "ksshprocesstest: Successfully connected to " << argv[2] << endl;
-    }
-    else {
-        cout << "ksshprocesstest: Connect to " << argv[2] << " failed." << endl;
-    }
-    
-}
diff --git a/tdeioslave/sftp/process.cpp b/tdeioslave/sftp/process.cpp
deleted file mode 100644
index bcb686df0..000000000
--- a/tdeioslave/sftp/process.cpp
+++ /dev/null
@@ -1,493 +0,0 @@
-/* vi: ts=8 sts=4 sw=4
- *
- *
- * This file is part of the KDE project, module tdesu.
- * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
- * 
- * This file contains code from TEShell.C of the KDE konsole. 
- * Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> 
- *
- * This is free software; you can use this library under the GNU Library 
- * General Public License, version 2. See the file "COPYING.LIB" for the 
- * exact licensing terms.
- *
- * process.cpp: Functionality to build a front end to password asking
- *  terminal programs.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
-#include <termios.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/socket.h>
-
-#if defined(__SVR4) && defined(sun)
-#include <stropts.h>
-#include <sys/stream.h>
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>		// Needed on some systems.
-#endif
-
-#include <tqglobal.h>
-#include <tqcstring.h>
-#include <tqfile.h>
-
-#include <kdebug.h>
-#include <kstandarddirs.h>
-
-#include "process.h"
-#include <tdesu/tdesu_pty.h>
-#include <tdesu/kcookie.h>
-
-
-MyPtyProcess::MyPtyProcess()
-{
-    m_bTerminal = false;
-    m_bErase = false;
-    m_pPTY = 0L;
-    m_Pid = -1;
-    m_Fd = -1;
-}
-
-
-int MyPtyProcess::init()
-{
-    delete m_pPTY;
-    m_pPTY = new PTY();
-    m_Fd = m_pPTY->getpt();
-    if (m_Fd < 0)
-	return -1;
-    if ((m_pPTY->grantpt() < 0) || (m_pPTY->unlockpt() < 0)) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "Master setup failed.\n" << endl;
-	m_Fd = -1;
-	return -1;
-    }
-    m_TTY = m_pPTY->ptsname();
-    m_stdoutBuf.resize(0);
-    m_stderrBuf.resize(0);
-    m_ptyBuf.resize(0);
-    return 0;
-}
-
-
-MyPtyProcess::~MyPtyProcess()
-{
-    delete m_pPTY;
-}
-    
-
-/*
- * Read one line of input. The terminal is in canonical mode, so you always
- * read a line at at time, but it's possible to receive multiple lines in
- * one time.
- */
-
-
-TQCString MyPtyProcess::readLineFrom(int fd, TQCString& inbuf, bool block)
-{
-    int pos;
-    TQCString ret;
-
-    if (!inbuf.isEmpty())
-    {
-
-        pos = inbuf.find('\n');
-        
-        if (pos == -1) 
-	{
-	    ret = inbuf;
-	    inbuf.resize(0);
-	} else
-	{
-	    ret = inbuf.left(pos);
-	    inbuf = inbuf.mid(pos+1);
-	}
-	return ret;
-
-    }
-
-    int flags = fcntl(fd, F_GETFL);
-    if (flags < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "fcntl(F_GETFL): " << perror << "\n";
-	return ret;
-    }
-    if (block)
-	flags &= ~O_NONBLOCK;
-    else
-	flags |= O_NONBLOCK;
-    if (fcntl(fd, F_SETFL, flags) < 0)
-    {
-	kdError(PTYPROC) << k_lineinfo << "fcntl(F_SETFL): " << perror << "\n";
-	return ret;
-    }
-
-    int nbytes;
-    char buf[256];
-    while (1) 
-    {
-	nbytes = read(fd, buf, 255);
-	if (nbytes == -1) 
-	{
-	    if (errno == EINTR)
-		continue;
-	    else break;
-	}
-	if (nbytes == 0)
-	    break;	// eof
-
-	buf[nbytes] = '\000';
-	inbuf += buf;
-
-	pos = inbuf.find('\n');
-        if (pos == -1) 
-	{
-	    ret = inbuf;
-	    inbuf.resize(0);
-	} else 
-	{
-	    ret = inbuf.left(pos);
-	    inbuf = inbuf.mid(pos+1);
-	}
-	break;
-
-    }
-
-    return ret;
-}
-
-void MyPtyProcess::writeLine(TQCString line, bool addnl)
-{
-    if (!line.isEmpty())
-	write(m_Fd, line, line.length());
-    if (addnl)
-	write(m_Fd, "\n", 1);
-}
-
-void MyPtyProcess::unreadLineFrom(TQCString inbuf, TQCString line, bool addnl)
-{
-    if (addnl)
-	line += '\n';
-    if (!line.isEmpty())
-	inbuf.prepend(line);
-}
-
-
-/*
- * Fork and execute the command. This returns in the parent.
- */
-
-int MyPtyProcess::exec(TQCString command, QCStringList args)
-{
-  kdDebug(PTYPROC) << "MyPtyProcess::exec(): " << command << endl;// << ", args = " << args << endl;
-
-    if (init() < 0)
-        return -1;
-
-    // Open the pty slave before forking. See SetupTTY()
-    int slave = open(m_TTY, O_RDWR);
-    if (slave < 0) 
-    {
-        kdError(PTYPROC) << k_lineinfo << "Could not open slave pty.\n";
-        return -1;
-    } 
-
-    // Also create a socket pair to connect to standard in/out.
-    // This will allow use to bypass the terminal.
-    int inout[2];
-    int err[2];
-    int ok = 1;
-    ok &= socketpair(AF_UNIX, SOCK_STREAM, 0, inout) >= 0;
-    ok &= socketpair(AF_UNIX, SOCK_STREAM, 0, err  ) >= 0;
-    if( !ok ) {
-        kdDebug(PTYPROC) << "Could not create socket" << endl;
-        return -1;
-    }
-    m_stdinout = inout[0];
-    m_err = err[0];
-
-    if ((m_Pid = fork()) == -1) 
-    {
-        kdError(PTYPROC) << k_lineinfo << "fork(): " << perror << "\n";
-        return -1;
-    } 
-
-    // Parent
-    if (m_Pid) 
-    {
-	    close(slave);
-    	close(inout[1]);
-	    close(err[1]);
-    	return 0;
-    }
-
-    // Child
-	
-    ok = 1;
-    ok &= dup2(inout[1], STDIN_FILENO)  >= 0;
-    ok &= dup2(inout[1], STDOUT_FILENO) >= 0;
-    ok &= dup2(err[1],   STDERR_FILENO) >= 0;
-
-    if( !ok )
-    {
-        kdError(PTYPROC) << "dup of socket descriptor failed" << endl;
-        _exit(1);
-    }
-
-    close(inout[1]);
-    close(inout[0]);
-    close(err[1]);
-    close(err[0]);
-
-    if (SetupTTY(slave) < 0)
-	    _exit(1);
-
-    // From now on, terminal output goes through the tty.
-    TQCString path;
-    if (command.contains('/'))
-	    path = command;
-    else 
-    {
-	    TQString file = TDEStandardDirs::findExe(command);
-    	if (file.isEmpty())
-	    {
-	        kdError(PTYPROC) << k_lineinfo << command << " not found\n";
-    	    _exit(1);
-	    }
-    	path = TQFile::encodeName(file);
-    }
-
-    int i;
-    const char * argp[32];
-    argp[0] = path;
-    QCStringList::Iterator it;
-    for (i=1, it=args.begin(); it!=args.end() && i<31; it++) {
-    	argp[i++] = *it;
-    	kdDebug(PTYPROC) << *it << endl;
-    }
-    argp[i] = 0L;
-    execv(path, (char * const *)argp);
-    kdError(PTYPROC) << k_lineinfo << "execv(\"" << path << "\"): " << perror << "\n";
-    _exit(1);
-    return -1; // Shut up compiler. Never reached.
-}
-
-/*
- * Wait until the terminal is set into no echo mode. At least one su 
- * (RH6 w/ Linux-PAM patches) sets noecho mode AFTER writing the Password: 
- * prompt, using TCSAFLUSH. This flushes the terminal I/O queues, possibly 
- * taking the password  with it. So we wait until no echo mode is set 
- * before writing the password.
- * Note that this is done on the slave fd. While Linux allows tcgetattr() on
- * the master side, Solaris doesn't.
- */
-
-int MyPtyProcess::WaitSlave()
-{
-    int slave = open(m_TTY, O_RDWR);
-    if (slave < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "Could not open slave tty.\n";
-	return -1;
-    }
-
-    struct termios tio;
-    struct timeval tv;
-    while (1) 
-    {
-	if (tcgetattr(slave, &tio) < 0) 
-	{
-	    kdError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror << "\n";
-	    close(slave);
-	    return -1;
-	}
-	if (tio.c_lflag & ECHO) 
-	{
-	    kdDebug(PTYPROC) << k_lineinfo << "Echo mode still on." << endl;
-	    // sleep 1/10 sec
-	    tv.tv_sec = 0; tv.tv_usec = 100000;
-	    select(slave, 0L, 0L, 0L, &tv);
-	    continue;
-	}
-	break;
-    }
-    close(slave);
-    return 0;
-}
-
-
-int MyPtyProcess::enableLocalEcho(bool enable)
-{
-    int slave = open(m_TTY, O_RDWR);
-    if (slave < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "Could not open slave tty.\n";
-	return -1;
-    }
-    struct termios tio;
-    if (tcgetattr(slave, &tio) < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror << "\n";
-	close(slave); return -1;
-    }
-    if (enable)
-	tio.c_lflag |= ECHO;
-    else
-	tio.c_lflag &= ~ECHO;
-    if (tcsetattr(slave, TCSANOW, &tio) < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "tcsetattr(): " << perror << "\n";
-	close(slave); return -1;
-    }
-    close(slave);
-    return 0;
-}
-
-
-/*
- * Copy output to stdout until the child process exists, or a line of output
- * matches `m_Exit'.
- * We have to use waitpid() to test for exit. Merely waiting for EOF on the
- * pty does not work, because the target process may have children still
- * attached to the terminal.
- */
-
-int MyPtyProcess::waitForChild()
-{
-    int ret, state, retval = 1;
-    struct timeval tv;
-
-    fd_set fds;
-    FD_ZERO(&fds);
-
-    while (1) 
-    {
-	tv.tv_sec = 1; tv.tv_usec = 0;
-	FD_SET(m_Fd, &fds);
-	ret = select(m_Fd+1, &fds, 0L, 0L, &tv);
-	if (ret == -1) 
-	{
-	    if (errno == EINTR) continue;
-	    else 
-	    {
-		kdError(PTYPROC) << k_lineinfo << "select(): " << perror << "\n";
-		return -1;
-	    }
-	}
-
-	if (ret) 
-	{
-	    TQCString line = readLine(false);
-	    while (!line.isNull()) 
-	    {
-		if (!m_Exit.isEmpty() && !tqstrnicmp(line, m_Exit, m_Exit.length()))
-		    kill(m_Pid, SIGTERM);
-		if (m_bTerminal) 
-		{
-		    fputs(line, stdout);
-		    fputc('\n', stdout);
-		}
-		line = readLine(false);
-	    }
-	}
-
-	// Check if the process is still alive
-	ret = waitpid(m_Pid, &state, WNOHANG);
-	if (ret < 0) 
-	{
-	    if (errno == ECHILD)
-		retval = 0;
-	    else
-		kdError(PTYPROC) << k_lineinfo << "waitpid(): " << perror << "\n";
-	    break;
-	}
-	if (ret == m_Pid) 
-	{
-	    if (WIFEXITED(state))
-		retval = WEXITSTATUS(state);
-	    break;
-	}
-    }
-
-    return -retval;
-}
-   
-/*
- * SetupTTY: Creates a new session. The filedescriptor "fd" should be
- * connected to the tty. It is closed after the tty is reopened to make it
- * our controlling terminal. This way the tty is always opened at least once
- * so we'll never get EIO when reading from it.
- */
-
-int MyPtyProcess::SetupTTY(int fd)
-{    
-    // Reset signal handlers
-    for (int sig = 1; sig < NSIG; sig++)
-	signal(sig, SIG_DFL);
-    signal(SIGHUP, SIG_IGN);
-
-    // Close all file handles
-//    struct rlimit rlp;
-//    getrlimit(RLIMIT_NOFILE, &rlp);
-//    for (int i = 0; i < (int)rlp.rlim_cur; i++)
-//    if (i != fd) close(i);
-
-    // Create a new session.
-    setsid();
-
-    // Open slave. This will make it our controlling terminal
-    int slave = open(m_TTY, O_RDWR);
-    if (slave < 0) 
-    {
-	kdError(PTYPROC) << k_lineinfo << "Could not open slave side: " << perror << "\n";
-	return -1;
-    }
-    close(fd);
-
-#if defined(__SVR4) && defined(sun)
-
-    // Solaris STREAMS environment.
-    // Push these modules to make the stream look like a terminal.
-    ioctl(slave, I_PUSH, "ptem");
-    ioctl(slave, I_PUSH, "ldterm");
-
-#endif
-
-    // Connect stdin, stdout and stderr
-//    dup2(slave, 0); dup2(slave, 1); dup2(slave, 2);
-//    if (slave > 2)
-//	close(slave);
-
-    // Disable OPOST processing. Otherwise, '\n' are (on Linux at least)
-    // translated to '\r\n'.
-    struct termios tio;
-    if (tcgetattr(slave, &tio) < 0)
-    {
-	kdError(PTYPROC) << k_lineinfo << "tcgetattr(): " << perror << "\n";
-	return -1;
-    }
-    tio.c_oflag &= ~OPOST;
-    if (tcsetattr(slave, TCSANOW, &tio) < 0)
-    {
-	kdError(PTYPROC) << k_lineinfo << "tcsetattr(): " << perror << "\n";
-	return -1;
-    }
-
-    return 0;
-}
diff --git a/tdeioslave/sftp/process.h b/tdeioslave/sftp/process.h
deleted file mode 100644
index 215c51ea7..000000000
--- a/tdeioslave/sftp/process.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* vi: ts=8 sts=4 sw=4
- *
- *
- * This file is part of the KDE project, module tdesu.
- * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
- * 
- * This is free software; you can use this library under the GNU Library 
- * General Public License, version 2. See the file "COPYING.LIB" for the 
- * exact licensing terms.
- */
-
-#ifndef __Process_h_Included__
-#define __Process_h_Included__
-
-#include <tqcstring.h>
-#include <tqstring.h>
-#include <tqstringlist.h>
-#include <tqvaluelist.h>
-
-#define PTYPROC 7120
-
-class PTY;
-typedef TQValueList<TQCString> QCStringList;
-
-/**
- * Synchronous communication with tty programs.
- *
- * PtyProcess provides synchronous communication with tty based programs. 
- * The communications channel used is a pseudo tty (as opposed to a pipe) 
- * This means that programs which require a terminal will work.
- */
-
-class MyPtyProcess
-{
-public:
-    MyPtyProcess();
-    virtual ~MyPtyProcess();
-
-    /**
-     * Fork off and execute a command. The command's standard in and output 
-     * are connected to the pseudo tty. They are accessible with @ref #readLine 
-     * and @ref #writeLine.
-     * @param command The command to execute.
-     * @param args The arguments to the command.
-     */
-    int exec(TQCString command, QCStringList args);
-
-    /**
-     * Read a line from the program's standard out. Depending on the @em block 
-     * parameter, this call blocks until a single, full line is read. 
-     * @param block Block until a full line is read?
-     * @return The output string.
-     */
-    TQCString readLine(bool block = true)
-        { return readLineFrom(m_Fd, m_ptyBuf, block); }
-
-    TQCString readLineFromPty(bool block = true)
-        { return readLineFrom(m_Fd, m_ptyBuf, block); }
-
-    TQCString readLineFromStdout(bool block = true)
-        { return readLineFrom(m_stdinout, m_stdoutBuf, block); }
-
-    TQCString readLineFromStderr(bool block = true)
-        { return readLineFrom(m_err, m_stderrBuf, block); }
-
-    /**
-     * Write a line of text to the program's standard in.
-     * @param line The text to write.
-     * @param addNewline Adds a '\n' to the line.
-     */
-    void writeLine(TQCString line, bool addNewline=true);
-
-    /**
-     * Put back a line of input.
-     * @param line The line to put back.
-     * @param addNewline Adds a '\n' to the line.
-     */
-
-    void unreadLine(TQCString line, bool addNewline = true)
-        { unreadLineFrom(m_ptyBuf, line, addNewline); }
-
-    void unreadLineFromPty(TQCString line, bool addNewline = true)
-        { unreadLineFrom(m_ptyBuf, line, addNewline); }
-
-    void unreadLineFromStderr(TQCString line, bool addNewline = true)
-        { unreadLineFrom(m_stderrBuf, line, addNewline); }
-
-    void unreadLineFromStdout(TQCString line, bool addNewline = true)
-        { unreadLineFrom(m_stdoutBuf, line, addNewline); }
-
-    /**
-     * Set exit string. If a line of program output matches this,
-     * @ref #waitForChild() will terminate the program and return.
-     */
-    void setExitString(TQCString exit) { m_Exit = exit; }
-
-    /**
-     * Wait for the child to exit. See also @ref #setExitString.
-     */
-    int waitForChild();
-
-    /**
-     * Wait until the pty has cleared the ECHO flag. This is useful 
-     * when programs write a password prompt before they disable ECHO.
-     * Disabling it might flush any input that was written.
-     */
-    int WaitSlave();
-
-    /** Enables/disables local echo on the pseudo tty. */
-    int enableLocalEcho(bool enable=true);
-
-    /** Enable/disable terminal output. Relevant only to some subclasses. */
-    void setTerminal(bool terminal) { m_bTerminal = terminal; }
-
-    /** Overwritte the password as soon as it is used. Relevant only to
-     * some subclasses. */
-    void setErase(bool erase) { m_bErase = erase; }
-
-    /** Return the filedescriptor of the process. */
-    int fd() {return m_Fd;}
-
-    /** Return the pid of the process. */
-    int pid() {return m_Pid;}
-
-    int stdioFd() {return m_stdinout;}
-
-    int stderrFd() {return m_err;}
-
-protected:
-    bool m_bErase, m_bTerminal;
-    int m_Pid, m_Fd, m_stdinout, m_err;
-    TQCString m_Command, m_Exit;
-
-private:
-    int init();
-    int SetupTTY(int fd);
-
-    PTY *m_pPTY;
-    TQCString m_TTY;
-    TQCString m_ptyBuf, m_stderrBuf, m_stdoutBuf;
-
-    TQCString readLineFrom(int fd, TQCString& inbuf, bool block);
-    void unreadLineFrom(TQCString inbuf, TQCString line, bool addnl);
-    class PtyProcessPrivate;
-    PtyProcessPrivate *d;
-};
-
-#endif
diff --git a/tdeioslave/sftp/sftp.h b/tdeioslave/sftp/sftp.h
deleted file mode 100644
index 95518130d..000000000
--- a/tdeioslave/sftp/sftp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*    $OpenBSD: sftp.h,v 1.3 2001/03/07 10:11:23 djm Exp $    */
-
-/*
- * Copyright (c) 2001 Markus Friedl.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * draft-ietf-secsh-filexfer-01.txt
- */
-
-/* version */
-#define    SSH2_FILEXFER_VERSION        3
-
-/* client to server */
-#define SSH2_FXP_INIT            1
-#define SSH2_FXP_OPEN            3
-#define SSH2_FXP_CLOSE           4
-#define SSH2_FXP_READ            5
-#define SSH2_FXP_WRITE           6
-#define SSH2_FXP_LSTAT           7
-#define SSH2_FXP_FSTAT           8
-#define SSH2_FXP_SETSTAT         9
-#define SSH2_FXP_FSETSTAT        10
-#define SSH2_FXP_OPENDIR         11
-#define SSH2_FXP_READDIR         12
-#define SSH2_FXP_REMOVE          13
-#define SSH2_FXP_MKDIR           14
-#define SSH2_FXP_RMDIR           15
-#define SSH2_FXP_REALPATH        16
-#define SSH2_FXP_STAT            17
-#define SSH2_FXP_RENAME          18
-#define SSH2_FXP_READLINK        19
-#define SSH2_FXP_SYMLINK         20
-
-/* server to client */
-#define SSH2_FXP_VERSION         2
-#define SSH2_FXP_STATUS          101
-#define SSH2_FXP_HANDLE          102
-#define SSH2_FXP_DATA            103
-#define SSH2_FXP_NAME            104
-#define SSH2_FXP_ATTRS           105
-
-#define SSH2_FXP_EXTENDED        200
-#define SSH2_FXP_EXTENDED_REPLY  201
-
-/* attributes */
-#define SSH2_FILEXFER_ATTR_SIZE         0x00000001
-#define SSH2_FILEXFER_ATTR_UIDGID       0x00000002
-#define SSH2_FILEXFER_ATTR_PERMISSIONS  0x00000004
-#define SSH2_FILEXFER_ATTR_ACMODTIME    0x00000008
-#define SSH2_FILEXFER_ATTR_EXTENDED     0x80000000
-
-/* portable open modes */
-#define SSH2_FXF_READ            0x00000001
-#define SSH2_FXF_WRITE           0x00000002
-#define SSH2_FXF_APPEND          0x00000004
-#define SSH2_FXF_CREAT           0x00000008
-#define SSH2_FXF_TRUNC           0x00000010
-#define SSH2_FXF_EXCL            0x00000020
-
-/* status messages */
-#define SSH2_FX_OK                 0
-#define SSH2_FX_EOF                1
-#define SSH2_FX_NO_SUCH_FILE       2
-#define SSH2_FX_PERMISSION_DENIED  3
-#define SSH2_FX_FAILURE            4
-#define SSH2_FX_BAD_MESSAGE        5
-#define SSH2_FX_NO_CONNECTION      6
-#define SSH2_FX_CONNECTION_LOST    7
-#define SSH2_FX_OP_UNSUPPORTED     8
-#define SSH2_FX_MAX                8
diff --git a/tdeioslave/sftp/sftp.protocol b/tdeioslave/sftp/sftp.protocol
index 33e66867a..931ee7890 100644
--- a/tdeioslave/sftp/sftp.protocol
+++ b/tdeioslave/sftp/sftp.protocol
@@ -2,7 +2,7 @@
 exec=tdeio_sftp
 protocol=sftp
 input=none
-listing=Name,Type,Size,Date,Access,Owner,Group,Link
+listing=Name,Type,Size,Date,Access,Owner,Group,Link,MimeType
 output=filesystem
 copyToFile=true
 copyFromFile=true
diff --git a/tdeioslave/sftp/sftpfileattr.cpp b/tdeioslave/sftp/sftpfileattr.cpp
deleted file mode 100644
index 4c25909d9..000000000
--- a/tdeioslave/sftp/sftpfileattr.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-/***************************************************************************
-                          sftpfileattr.cpp  -  description
-                             -------------------
-    begin                : Sat Jun 30 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@iastate.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "sftpfileattr.h"
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <tqstring.h>
-#include <tqdatastream.h>
-
-#include <tdeio/global.h>
-#include <kremoteencoding.h>
-
-using namespace TDEIO;
-
-sftpFileAttr::sftpFileAttr(){
-    clear();
-    mDirAttrs = false;
-}
-
-sftpFileAttr::sftpFileAttr(KRemoteEncoding* encoding){
-    clear();
-    mDirAttrs = false;
-    mEncoding = encoding;
-}
-
-
-/** Constructor to initialize the file attributes on declaration. */
-sftpFileAttr::sftpFileAttr(TQ_ULLONG size, uid_t uid, gid_t gid,
-                    mode_t permissions, time_t atime,
-                    time_t mtime, TQ_UINT32 extendedCount) {
-    clear();
-    mDirAttrs = false;
-    mSize  = size;
-    mUid   = uid;
-    mGid   = gid;
-    mAtime = atime;
-    mMtime = mtime;
-    mPermissions   = permissions;
-    mExtendedCount = extendedCount;
-}
-
-sftpFileAttr::~sftpFileAttr(){
-}
-
-/** Returns a UDSEntry describing the file.
-The UDSEntry is generated from the sftp file attributes. */
-UDSEntry sftpFileAttr::entry() {
-    UDSEntry entry;
-    UDSAtom atom;
-
-    atom.m_uds = UDS_NAME;
-    atom.m_str = mFilename;
-    entry.append(atom);
-
-    if( mFlags & SSH2_FILEXFER_ATTR_SIZE ) {
-        atom.m_uds = UDS_SIZE;
-        atom.m_long = mSize;
-        entry.append(atom);
-    }
-
-    if( mFlags & SSH2_FILEXFER_ATTR_ACMODTIME ) {
-        atom.m_uds = UDS_ACCESS_TIME;
-        atom.m_long = mAtime;
-        entry.append(atom);
-
-        atom.m_uds = UDS_MODIFICATION_TIME;
-        atom.m_long = mMtime;
-        entry.append(atom);
-    }
-
-    if( mFlags & SSH2_FILEXFER_ATTR_UIDGID ) {
-        if( mUserName.isEmpty() || mGroupName.isEmpty() )
-            getUserGroupNames();
-
-        atom.m_uds = UDS_USER;
-        atom.m_str = mUserName;
-        entry.append(atom);
-
-        atom.m_uds = UDS_GROUP;
-        atom.m_str = mGroupName;
-        entry.append(atom);
-    }
-
-    if( mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS ) {
-        atom.m_uds = UDS_ACCESS;
-        atom.m_long = mPermissions;
-        entry.append(atom);
-
-        mode_t type = fileType();
-
-        // Set the type if we know what it is
-        if( type != 0 ) {
-            atom.m_uds = UDS_FILE_TYPE;
-            atom.m_long = (mLinkType ? mLinkType:type);
-            entry.append(atom);
-        }
-
-        if( S_ISLNK(type) ) {
-            atom.m_uds = UDS_LINK_DEST;
-            atom.m_str = mLinkDestination;
-            entry.append(atom);
-        }
-    }
-
-    return entry;
-}
-
-/** Use to output the file attributes to a sftp packet */
-TQDataStream& operator<< (TQDataStream& s, const sftpFileAttr& fa) {
-    s << (TQ_UINT32)fa.mFlags;
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_SIZE )
-        { s << (TQ_ULLONG)fa.mSize; }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_UIDGID )
-        { s << (TQ_UINT32)fa.mUid << (TQ_UINT32)fa.mGid; }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS )
-        { s << (TQ_UINT32)fa.mPermissions; }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_ACMODTIME )
-        { s << (TQ_UINT32)fa.mAtime << (TQ_UINT32)fa.mMtime; }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_EXTENDED ) {
-        s << (TQ_UINT32)fa.mExtendedCount;
-        // XXX: Write extensions to data stream here
-        // s.writeBytes(extendedtype).writeBytes(extendeddata);
-    }
-    return s;
-}
-
-
-/** Use to read a file attribute from a sftp packet */
-TQDataStream& operator>> (TQDataStream& s, sftpFileAttr& fa) {
-
-    // XXX Add some error checking in here in case
-    //     we get a bad sftp packet.
-
-    fa.clear();
-
-    if( fa.mDirAttrs ) {
-        TQCString fn;
-        s >> fn;
-        fn.truncate( fn.size() );
-
-        fa.mFilename = fa.mEncoding->decode( fn );
-
-        s >> fa.mLongname;
-        fa.mLongname.truncate( fa.mLongname.size() );
-        //kdDebug() << ">>: ftpfileattr long filename (" << fa.mLongname.size() << ")= " << fa.mLongname <<  endl;
-    }
-
-    s >> fa.mFlags;  // get flags
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_SIZE ) {
-        TQ_ULLONG fileSize;
-        s >> fileSize;
-        fa.setFileSize(fileSize);
-    }
-
-    TQ_UINT32 x;
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_UIDGID ) {
-        s >> x; fa.setUid(x);
-        s >> x; fa.setGid(x);
-    }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS ) {
-        s >> x; fa.setPermissions(x);
-    }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_ACMODTIME ) {
-        s >> x; fa.setAtime(x);
-        s >> x; fa.setMtime(x);
-    }
-
-    if( fa.mFlags & SSH2_FILEXFER_ATTR_EXTENDED ) {
-        s >> x; fa.setExtendedCount(x);
-        // XXX: Read in extensions from data stream here
-        // s.readBytes(extendedtype).readBytes(extendeddata);
-    }
-
-    fa.getUserGroupNames();
-    return s;
-}
-/** Parse longname for the owner and group names. */
-void sftpFileAttr::getUserGroupNames(){
-    // Get the name of the owner and group of the file from longname.
-    TQString user, group;
-    if( mLongname.isEmpty() ) {
-        // do not have the user name so use the user id instead
-        user.setNum(mUid);
-        group.setNum(mGid);
-    }
-    else {
-        int field = 0;
-        int i = 0;
-        int l = mLongname.length();
-
-        TQString longName = mEncoding->decode( mLongname );
-
-        kdDebug(7120) << "Decoded:  " << longName << endl;
-
-        // Find the beginning of the third field which contains the user name.
-        while( field != 2 ) {
-            if( longName[i].isSpace() ) {
-                field++; i++;
-                while( i < l && longName[i].isSpace() ) { i++; }
-            }
-            else { i++; }
-        }
-        // i is the index of the first character of the third field.
-        while( i < l && !longName[i].isSpace() ) {
-            user.append(longName[i]);
-            i++;
-        }
-
-        // i is the first character of the space between fields 3 and 4
-        // user contains the owner's user name
-        while( i < l && longName[i].isSpace() ) {
-            i++;
-        }
-
-        // i is the first character of the fourth field
-        while( i < l && !longName[i].isSpace() ) {
-            group.append(longName[i]);
-            i++;
-        }
-        // group contains the name of the group.
-    }
-
-    mUserName = user;
-    mGroupName = group;
-}
-
-/** No descriptions */
-kdbgstream& operator<< (kdbgstream& s, sftpFileAttr& a) {
-    s << "Filename: " << a.mFilename
-      << ", Uid: " << a.mUid
-      << ", Gid: " << a.mGid
-      << ", Username: " << a.mUserName
-      << ", GroupName: " << a.mGroupName
-      << ", Permissions: " << a.mPermissions
-      << ", size: " << a.mSize
-      << ", atime: " << a.mAtime
-      << ", mtime: " << a.mMtime
-      << ", extended cnt: " << a.mExtendedCount;
-
-    if (S_ISLNK(a.mLinkType)) {
-      s << ", Link Type: " << a.mLinkType;
-      s << ", Link Destination: " << a.mLinkDestination;
-    }
-
-    return s;
-}
-
-/** Make sure it builds with NDEBUG */
-kndbgstream& operator<< (kndbgstream& s, sftpFileAttr& ) {
-    return s;
-}
-
-/** Clear all attributes and flags. */
-void sftpFileAttr::clear(){
-    clearAtime();
-    clearMtime();
-    clearGid();
-    clearUid();
-    clearFileSize();
-    clearPermissions();
-    clearExtensions();
-    mFilename = TQString::null;
-    mGroupName =  TQString::null;
-    mUserName = TQString::null;
-    mLinkDestination = TQString::null;
-    mFlags = 0;
-    mLongname = "\0";
-    mLinkType = 0;
-}
-
-/** Return the size of the sftp attribute. */
-TQ_UINT32 sftpFileAttr::size() const{
-    TQ_UINT32 size = 4; // for the attr flag
-    if( mFlags & SSH2_FILEXFER_ATTR_SIZE )
-        size += 8;
-
-    if( mFlags & SSH2_FILEXFER_ATTR_UIDGID )
-        size += 8;
-
-    if( mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS )
-        size += 4;
-
-    if( mFlags & SSH2_FILEXFER_ATTR_ACMODTIME )
-        size += 8;
-
-    if( mFlags & SSH2_FILEXFER_ATTR_EXTENDED ) {
-        size += 4;
-        // add size of extensions
-    }
-    return size;
-}
-
-/** Returns the file type as determined from the file permissions */
-mode_t sftpFileAttr::fileType() const{
-    mode_t type = 0;
-
-    if( S_ISLNK(mPermissions) )
-      type |= S_IFLNK;
-
-    if( S_ISREG(mPermissions) )
-      type |= S_IFREG;
-    else if( S_ISDIR(mPermissions) )
-      type |= S_IFDIR;
-    else if( S_ISCHR(mPermissions) )
-      type |= S_IFCHR;
-    else if( S_ISBLK(mPermissions) )
-      type |= S_IFBLK;
-    else if( S_ISFIFO(mPermissions) )
-      type |= S_IFIFO;
-    else if( S_ISSOCK(mPermissions) )
-      type |= S_IFSOCK;
-
-    return type;
-}
-
-void sftpFileAttr::setEncoding( KRemoteEncoding* encoding )
-{
-    mEncoding = encoding;
-}
-// vim:ts=4:sw=4
diff --git a/tdeioslave/sftp/sftpfileattr.h b/tdeioslave/sftp/sftpfileattr.h
deleted file mode 100644
index 43b56979d..000000000
--- a/tdeioslave/sftp/sftpfileattr.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/***************************************************************************
-                          sftpfileattr.h  -  description
-                             -------------------
-    begin                : Sat Jun 30 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@iastate.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef SFTPFILEATTR_H
-#define SFTPFILEATTR_H
-
-#include <sys/types.h>
-
-#include <tqglobal.h>
-#include <tqstring.h>
-#include <tqdatastream.h>
-
-#include <tdeio/global.h>
-#include <kdebug.h>
-
-#include "sftp.h"
-
-/**
-  *@author Lucas Fisher
-  */
-
-class KRemoteEncoding;
-
-class sftpFileAttr {
-
-private: // Private attributes
-    /** Name of file. */
-    TQString mFilename;
-
-    /** Specifies which fields of the file attribute are available. */
-    TQ_UINT32 mFlags;
-
-    /** Size of the file in bytes. Should be 64 bit safe. */
-    TQ_ULLONG mSize;
-
-    /** User id of the owner of the file. */
-    uid_t mUid;
-
-    /** Group id of the group to which the file belongs. */
-    gid_t mGid;
-
-    /** POSIX permissions of the file. */
-    mode_t mPermissions;
-
-    /** Last access time of the file in seconds from Jan 1, 1970. */
-    time_t mAtime;
-
-    /** Last modification time of file in seconds since Jan. 1, 1970. */
-    time_t mMtime;
-
-    /** Number of file attribute extensions.
-        Not currently implemented */
-    TQ_UINT32 mExtendedCount;
-
-     /** Longname of the file as found in a SSH_FXP_NAME sftp packet.
-          These contents are parse to return the file's owner name and
-          gr oup name. */
-    TQCString mLongname;
-
-    TQString mUserName;
-    TQString mGroupName;
-
-    /** If file is a link, contains the destination of the link */
-    TQString mLinkDestination;
-
-    /** If resource is a link, contains the type the link,e.g. file,dir... */
-    mode_t mLinkType;
-
-    /** Whether >> operator should read filename and longname from the stream. */
-    bool mDirAttrs;
-
-    /** Holds the encoding of the remote host */
-    KRemoteEncoding* mEncoding;
-
-public:
-    sftpFileAttr();
-
-    sftpFileAttr(KRemoteEncoding* encoding);
-
-    ~sftpFileAttr();
-
-    /** Constructor to initialize the file attributes on declaration. */
-    sftpFileAttr(TQ_ULLONG size_, uid_t uid_, gid_t gid_, mode_t permissions_,
-                 time_t atime_, time_t mtime_, TQ_UINT32 extendedCount_ = 0);
-
-    /** Return the size of the sftp attribute not including filename or longname*/
-    TQ_UINT32 size() const;
-
-    /** Clear all attributes and flags. */
-    void clear();
-
-    /** Set the size of the file. */
-    void setFileSize(TQ_ULLONG s)
-        { mSize = s; mFlags |= SSH2_FILEXFER_ATTR_SIZE; }
-
-    /** The size file attribute will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. */
-    void clearFileSize()
-        { mSize = 0; mFlags &= ~SSH2_FILEXFER_ATTR_SIZE; }
-
-    /** Returns the size of the file. */
-    TQ_ULLONG fileSize() const { return mSize; }
-
-    /** Sets the POSIX permissions of the file. */
-    void setPermissions(mode_t p)
-        { mPermissions = p; mFlags |= SSH2_FILEXFER_ATTR_PERMISSIONS; }
-
-    /** The permissions file attribute will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. */
-    void clearPermissions()
-        { mPermissions = 0; mFlags &= ~SSH2_FILEXFER_ATTR_PERMISSIONS; }
-
-    /** Returns the POSIX permissons of the file. */
-    mode_t permissions() const { return mPermissions; }
-
-    /** Sets the group id of the file. */
-    void setGid(gid_t id)
-        { mGid = id; mFlags |= SSH2_FILEXFER_ATTR_UIDGID; }
-
-    /** Neither the gid or uid file attributes will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. This is
-        equivalent to clearUid() */
-    void clearGid()
-        { mGid = 0; mFlags &= SSH2_FILEXFER_ATTR_UIDGID; }
-
-    /** Returns the group id of the file. */
-    gid_t gid() const { return mGid; }
-
-    /** Sets the uid of the file. */
-    void setUid(uid_t id)
-        { mUid = id; mFlags |= SSH2_FILEXFER_ATTR_UIDGID; }
-
-    /** Neither the gid or uid file attributes will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. This is
-        equivalent to clearGid() */
-    void clearUid()
-        { mUid = 0; mFlags &= SSH2_FILEXFER_ATTR_UIDGID; }
-
-    /** Returns the user id of the file. */
-    gid_t uid() const { return mUid; }
-
-    /** Set the modificatoin time of the file in seconds since Jan. 1, 1970. */
-    void setMtime(time_t t)
-        { mMtime = t; mFlags |= SSH2_FILEXFER_ATTR_ACMODTIME; }
-
-    /** Neither the mtime or atime file attributes will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. This is
-        equivalent to clearAtime() */
-    void clearMtime()
-        { mMtime = 0; mFlags &= SSH2_FILEXFER_ATTR_ACMODTIME; }
-
-    /** Returns the modification time of the file in seconds since Jan. 1, 1970. */
-    time_t mtime() const { return mMtime; }
-
-    /** Sets the access time of the file in seconds since Jan. 1, 1970. */
-    void setAtime(time_t t)
-        { mAtime = t; mFlags |= SSH2_FILEXFER_ATTR_ACMODTIME; }
-
-    /** Neither the atime or mtime file attributes will not be included in the UDSEntry
-        or when the file attribute is written to the sftp packet. This is
-        equivalent to clearMtime() */
-    void clearAtime()
-        { mAtime = 0; mFlags &= SSH2_FILEXFER_ATTR_ACMODTIME; }
-
-    /** Returns the last access time of the file in seconds since Jan. 1, 1970. */
-    time_t atime() const { return mAtime; }
-
-    /** Sets the number of file attribute extensions. */
-    void setExtendedCount(unsigned int c)
-        { mExtendedCount = c; mFlags |= SSH2_FILEXFER_ATTR_EXTENDED; }
-
-    /** No extensions will be included when the file attribute is written
-        to a sftp packet. */
-    void clearExtensions()
-        { mExtendedCount = 0; mFlags &= ~SSH2_FILEXFER_ATTR_EXTENDED; }
-
-    /** Returns the number of file attribute extentsions. */
-    unsigned int extendedCount() const { return mExtendedCount; }
-
-    /** Returns the flags for the sftp file attributes. */
-    unsigned int flags() const { return mFlags; }
-
-    /** Sets file's longname. See sftpFileAttr::longname. */
-    void setLongname(TQString l) { mLongname = l.latin1(); }
-
-    /** Returns a string describing the file attributes. The format is specific
-        to the implementation of the sftp server.  In most cases (ie OpenSSH)
-        this is similar to the long output of 'ls'. */
-    TQString longname() const { return mLongname; }
-
-    void setLinkDestination(const TQString& target)
-        { mLinkDestination = target; }
-
-    TQString linkDestination()
-        { return mLinkDestination; }
-
-    /** Sets the actual type a symbolic link points to. */
-    void setLinkType (mode_t type) { mLinkType = type; }
-
-    mode_t linkType() const { return mLinkType; }
-
-    /** No descriptions */
-    void setFilename(const TQString& fn)
-        { mFilename = fn; }
-
-    TQString filename() const
-        { return mFilename; }
-
-    /** Returns a UDSEntry describing the file.
-       The UDSEntry is generated from the sftp file attributes. */
-    TDEIO::UDSEntry entry();
-
-    /** Use to output the file attributes to a sftp packet
-        This will only write the sftp ATTR structure to the stream.
-        It will never write the filename and longname because the client
-        never sends those to the server. */
-    friend TQDataStream& operator<< (TQDataStream&, const sftpFileAttr&);
-
-    /** Use to read a file attribute from a sftp packet.
-        Read this carefully! If the DirAttrs flag is true, this will
-        read the filename, longname, and file attributes from the stream.
-        This is for use with listing directories.
-        If the DirAttrs flag is false, this will only read file attributes
-        from the stream.
-        BY DEFAULT, A NEW INSTANCE HAS DirAttrs == false */
-    friend TQDataStream& operator>> (TQDataStream&, sftpFileAttr&);
-
-    /** Parse longname for the owner and group names. */
-    void getUserGroupNames();
-
-    /** Sets the DirAttrs flag.  This flag affects how the >> operator works on data streams. */
-    void setDirAttrsFlag(bool flag){ mDirAttrs = flag; }
-
-    /** Gets the DirAttrs flag. */
-    bool getDirAttrsFlag() const { return mDirAttrs; }
-
-    friend kdbgstream& operator<< (kdbgstream& s, sftpFileAttr& a);
-    friend kndbgstream& operator<< (kndbgstream& s, sftpFileAttr& a);
-
-    /** Returns the file type as determined from the file permissions */
-    mode_t fileType() const;
-
-    /** Set the encoding of the remote file system */
-    void setEncoding( KRemoteEncoding* encoding );
-};
-
-#endif
diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index eab0eae42..0abcd6238 100644
--- a/tdeioslave/sftp/tdeio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -1,62 +1,58 @@
-/***************************************************************************
-                          sftp.cpp  -  description
-                             -------------------
-    begin                : Fri Jun 29 23:45:40 CDT 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@purdue.edu
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
 /*
-DEBUGGING
-We are pretty much left with kdDebug messages for debugging. We can't use a gdb
-as described in the ioslave DEBUG.howto because tdeinit has to run in a terminal.
-Ssh will detect this terminal and ask for a password there, but will just get garbage.
-So we can't connect.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+ * Copyright (c) 2001  Lucas Fisher       <ljfisher@purdue.edu>
+ * Copyright (c) 2009  Andreas Schneider  <mail@cynapses.org>
+ * Copyright (c) 2020  Martin Sandsmark   <martin@sandsmark.ninja>
+ *                     KDE2 port
+ * Copyright (c) 2022  Mavridis Philippe  <mavridisf@gmail.com>
+ *                     Trinity port
+ *
+ * Portions Copyright (c) 2020-2021 Harald Sitter <sitter@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License (LGPL) 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 "tdeio_sftp.h"
 
 #include <fcntl.h>
 
-#include <tqcstring.h>
-#include <tqstring.h>
-#include <tqobject.h>
-#include <tqstrlist.h>
+#include <tqapplication.h>
 #include <tqfile.h>
-#include <tqbuffer.h>
+#include <tqdir.h>
+
+#include <numeric>
+#include <functional>
+#include <vector>
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <signal.h>
 #include <errno.h>
-#include <ctype.h>
 #include <time.h>
-#include <netdb.h>
 #include <string.h>
 
-#include <netinet/in.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 
 #include <tdeapplication.h>
-#include <kuser.h>
 #include <kdebug.h>
 #include <tdemessagebox.h>
-#include <kinstance.h>
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdelocale.h>
@@ -64,15 +60,14 @@ So we can't connect.
 #include <tdeio/ioslave_defaults.h>
 #include <kmimetype.h>
 #include <kmimemagic.h>
-#include <klargefile.h>
-#include <kremoteencoding.h>
+#include <signal.h>
 
-#include "sftp.h"
-#include "tdeio_sftp.h"
-#include "atomicio.h"
-#include "sftpfileattr.h"
-#include "ksshprocess.h"
+#include <libssh/libssh.h>
+#include <libssh/sftp.h>
+#include <libssh/callbacks.h>
 
+#define TDEIO_SFTP_SPECIAL_TIMEOUT 30
+#define ZERO_STRUCTP(x) do { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } while(0)
 
 using namespace TDEIO;
 extern "C"
@@ -87,8 +82,13 @@ extern "C"
       kdDebug(TDEIO_SFTP_DB) << "Usage: tdeio_sftp  protocol domain-socket1 domain-socket2" << endl;
       exit(-1);
     }
-
     sftpProtocol slave(argv[2], argv[3]);
+
+    if (getenv("DEBUG_TDEIO_SFTP")) {
+        // Give us a coredump in the journal
+        signal(6, SIG_DFL);
+    }
+
     slave.dispatchLoop();
 
     kdDebug(TDEIO_SFTP_DB) << "*** tdeio_sftp Done" << endl;
@@ -96,2187 +96,2134 @@ extern "C"
   }
 }
 
+// Some helper functions/classes
+namespace {
 
-/*
- * This helper handles some special issues (blocking and interrupted
- * system call) when writing to a file handle.
- *
- * @return 0 on success or an error code on failure (ERR_COULD_NOT_WRITE,
- * ERR_DISK_FULL, ERR_CONNECTION_BROKEN).
- */
-static int writeToFile (int fd, const char *buf, size_t len)
-{
-  while (len > 0)
-  {
-    ssize_t written = ::write(fd, buf, len);
-    if (written >= 0)
-    {
-        buf += written;
-        len -= written;
-        continue;
-    }
-
-    switch(errno)
-    {
-      case EINTR:
-        continue;
-      case EPIPE:
-        return ERR_CONNECTION_BROKEN;
-      case ENOSPC:
-        return ERR_DISK_FULL;
-      default:
-        return ERR_COULD_NOT_WRITE;
-    }
+// 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;
   }
-  return 0;
-}
-
-sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket)
-             : SlaveBase("tdeio_sftp", pool_socket, app_socket),
-                  mConnected(false), mPort(-1), mMsgId(0) {
-  kdDebug(TDEIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl;
-}
-
 
-sftpProtocol::~sftpProtocol() {
-    kdDebug(TDEIO_SFTP_DB) << "~sftpProtocol(): pid = " << getpid() << endl;
-    closeConnection();
-}
+  ~ExitGuard() {
+    run();
+  }
 
-/**
-  * Type is a sftp packet type found in .sftp.h'.
-  * Example: SSH2_FXP_READLINK, SSH2_FXP_RENAME, etc.
-  *
-  * Returns true if the type is supported by the sftp protocol
-  * version negotiated by the client and server (sftpVersion).
-  */
-bool sftpProtocol::isSupportedOperation(int type) {
-  switch (type) {
-    case SSH2_FXP_VERSION:
-    case SSH2_FXP_STATUS:
-    case SSH2_FXP_HANDLE:
-    case SSH2_FXP_DATA:
-    case SSH2_FXP_NAME:
-    case SSH2_FXP_ATTRS:
-    case SSH2_FXP_INIT:
-    case SSH2_FXP_OPEN:
-    case SSH2_FXP_CLOSE:
-    case SSH2_FXP_READ:
-    case SSH2_FXP_WRITE:
-    case SSH2_FXP_LSTAT:
-    case SSH2_FXP_FSTAT:
-    case SSH2_FXP_SETSTAT:
-    case SSH2_FXP_FSETSTAT:
-    case SSH2_FXP_OPENDIR:
-    case SSH2_FXP_READDIR:
-    case SSH2_FXP_REMOVE:
-    case SSH2_FXP_MKDIR:
-    case SSH2_FXP_RMDIR:
-    case SSH2_FXP_REALPATH:
-    case SSH2_FXP_STAT:
-      return true;
-    case SSH2_FXP_RENAME:
-      return sftpVersion >= 2 ? true : false;
-    case SSH2_FXP_EXTENDED:
-    case SSH2_FXP_EXTENDED_REPLY:
-    case SSH2_FXP_READLINK:
-    case SSH2_FXP_SYMLINK:
-      return sftpVersion >= 3 ? true : false;
-    default:
-      kdDebug(TDEIO_SFTP_DB) << "isSupportedOperation(type:"
-                            << type << "): unrecognized operation type" << endl;
-      break;
+  void run() noexcept {
+    if(f) { f(); f = nullptr; }
   }
 
-  return false;
-}
+  void abort() {
+    f = nullptr;
+  }
 
-void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool overwrite)
-{
-    kdDebug(TDEIO_SFTP_DB) << "copy(): " << src << " -> " << dest << endl;
+  ExitGuard(const ExitGuard&) = delete;
+  void operator= (const ExitGuard&) = delete;
 
-    bool srcLocal = src.isLocalFile();
-    bool destLocal = dest.isLocalFile();
+private:
+    std::function<void()> f;
+};
 
-    if ( srcLocal && !destLocal ) // Copy file -> sftp
-      sftpCopyPut(src, dest, permissions, overwrite);
-    else if ( destLocal && !srcLocal ) // Copy sftp -> file
-      sftpCopyGet(dest, src, permissions, overwrite);
-    else
-      error(ERR_UNSUPPORTED_ACTION, TQString::null);
+// 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;
 }
 
-void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite)
-{
-    kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet(): " << src << " -> " << dest << endl;
-
-    // Attempt to establish a connection...
-    openConnection();
-    if( !mConnected )
-        return;
-
-    KDE_struct_stat buff_orig;
-    TQCString dest_orig ( TQFile::encodeName(dest.path()) );
-    bool origExists = (KDE_lstat( dest_orig.data(), &buff_orig ) != -1);
-
-    if (origExists)
-    {
-        if (S_ISDIR(buff_orig.st_mode))
-        {
-          error(ERR_IS_DIRECTORY, dest.prettyURL());
-          return;
-        }
-
-        if (!overwrite)
-        {
-          error(ERR_FILE_ALREADY_EXIST, dest.prettyURL());
-          return;
-        }
-    }
-
-    TDEIO::filesize_t offset = 0;
-    TQCString dest_part ( dest_orig + ".part" );
-
-    int fd = -1;
-    bool partExists = false;
-    bool markPartial = config()->readBoolEntry("MarkPartial", true);
-
-    if (markPartial)
-    {
-        KDE_struct_stat buff_part;
-        partExists = (KDE_stat( dest_part.data(), &buff_part ) != -1);
-
-        if (partExists && buff_part.st_size > 0 && S_ISREG(buff_part.st_mode))
-        {
-            if (canResume( buff_part.st_size ))
-            {
-                offset = buff_part.st_size;
-                kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet: Resuming @ " << offset << endl;
-            }
-        }
-
-        if (offset > 0)
-        {
-            fd = KDE_open(dest_part.data(), O_RDWR);
-            offset = KDE_lseek(fd, 0, SEEK_END);
-            if (offset == 0)
-            {
-              error(ERR_CANNOT_RESUME, dest.prettyURL());
-              return;
-            }
-        }
-        else
-        {
-            // Set up permissions properly, based on what is done in file io-slave
-            int openFlags = (O_CREAT | O_TRUNC | O_WRONLY);
-            int initialMode = (mode == -1) ? 0666 : (mode | S_IWUSR);
-            fd = KDE_open(dest_part.data(), openFlags, initialMode);
-        }
-    }
-    else
-    {
-        // Set up permissions properly, based on what is done in file io-slave
-        int openFlags = (O_CREAT | O_TRUNC | O_WRONLY);
-        int initialMode = (mode == -1) ? 0666 : (mode | S_IWUSR);
-        fd = KDE_open(dest_orig.data(), openFlags, initialMode);
-    }
-
-    if(fd == -1)
-    {
-      kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet: Unable to open (" << fd << ") for writting." << endl;
-      if (errno == EACCES)
-        error (ERR_WRITE_ACCESS_DENIED, dest.prettyURL());
-      else
-        error (ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL());
-      return;
-    }
+// 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);} ) {}
+};
 
-    Status info = sftpGet(src, offset, fd);
-    if ( info.code != 0 )
-    {
-      // Should we keep the partially downloaded file ??
-      TDEIO::filesize_t size = config()->readNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE);
-      if (info.size < size)
-        ::remove(dest_part.data());
+} /* namespace */
 
-      error(info.code, info.text);
-      return;
-    }
+// The callback function for libssh
+int auth_callback(const char *prompt, char *buf, size_t len,
+                  int echo, int verify, void *userdata)
+{
+  if (userdata == NULL) {
+    return -1;
+  }
 
-    if (::close(fd) != 0)
-    {
-      error(ERR_COULD_NOT_WRITE, dest.prettyURL());
-      return;
-    }
+  sftpProtocol *slave = (sftpProtocol *) userdata;
 
-    //
-    if (markPartial)
-    {
-      if (::rename(dest_part.data(), dest_orig.data()) != 0)
-      {
-        error (ERR_CANNOT_RENAME_PARTIAL, dest_part);
-        return;
-      }
-    }
+  if (slave->auth_callback(prompt, buf, len, echo, verify, userdata) < 0) {
+    return -1;
+  }
 
-    data(TQByteArray());
-    kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet(): emit finished()" << endl;
-    finished();
+  return 0;
 }
 
-sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t offset, int fd )
-{
-    int code;
-    sftpFileAttr attr(remoteEncoding());
-
-    Status res;
-    res.code = 0;
-    res.size = 0;
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpGet(): " << src << endl;
+void log_callback(ssh_session session, int priority, const char *message,
+    void *userdata) {
+  if (userdata == NULL) {
+    return;
+  }
 
-    // stat the file first to get its size
-    if( (code = sftpStat(src, attr)) != SSH2_FX_OK ) {
-        return doProcessStatus(code, src.prettyURL());
-    }
+  sftpProtocol *slave = (sftpProtocol *) userdata;
 
-    // We cannot get file if it is a directory
-    if( attr.fileType() == S_IFDIR ) {
-        res.text = src.prettyURL();
-        res.code = ERR_IS_DIRECTORY;
-        return res;
-    }
+  slave->log_callback(session, priority, message, userdata);
+}
 
-    TDEIO::filesize_t fileSize = attr.fileSize();
-    TQ_UINT32 pflags = SSH2_FXF_READ;
-    attr.clear();
+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; }
+};
 
-    TQByteArray handle;
-    if( (code = sftpOpen(src, pflags, attr, handle)) != SSH2_FX_OK ) {
-        res.text = src.prettyURL();
-        res.code = ERR_CANNOT_OPEN_FOR_READING;
-        return res;
-    }
+class KeyboardInteractiveAuth: public SSHAuthMethod {
+public:
+  KeyboardInteractiveAuth(bool noPaswordQuery = false): mNoPaswordQuery(noPaswordQuery) {}
 
-    // needed for determining mimetype
-    // note: have to emit mimetype before emitting totalsize.
-    TQByteArray buff;
-    TQByteArray mimeBuffer;
-
-    unsigned int oldSize;
-    bool foundMimetype = false;
-
-    // How big should each data packet be? Definitely not bigger than 64kb or
-    // you will overflow the 2 byte size variable in a sftp packet.
-    TQ_UINT32 len = 60*1024;
-    code = SSH2_FX_OK;
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpGet(): offset = " << offset << endl;
-    while( code == SSH2_FX_OK ) {
-        if( (code = sftpRead(handle, offset, len, buff)) == SSH2_FX_OK ) {
-            offset += buff.size();
-
-            // save data for mimetype. Pretty much follows what is in the ftp ioslave
-            if( !foundMimetype ) {
-                oldSize = mimeBuffer.size();
-                mimeBuffer.resize(oldSize + buff.size());
-                memcpy(mimeBuffer.data()+oldSize, buff.data(), buff.size());
-
-                if( mimeBuffer.size() > 1024 ||  offset == fileSize ) {
-                    // determine mimetype
-                    KMimeMagicResult* result =
-                        KMimeMagic::self()->findBufferFileType(mimeBuffer, src.fileName());
-                    kdDebug(TDEIO_SFTP_DB) << "sftpGet(): mimetype is " <<
-                                      result->mimeType() << endl;
-                    mimeType(result->mimeType());
-
-                    // Always send the total size after emitting mime-type...
-                    totalSize(fileSize);
-
-                    if (fd == -1)
-                        data(mimeBuffer);
-                    else
-                    {
-                        if ( (res.code=writeToFile(fd, mimeBuffer.data(), mimeBuffer.size())) != 0 )
-                            return res;
-                    }
-
-                    processedSize(mimeBuffer.size());
-                    mimeBuffer.resize(0);
-                    foundMimetype = true;
-                }
-            }
-            else {
-                if (fd == -1)
-                    data(buff);
-                else
-                {
-                    if ( (res.code= writeToFile(fd, buff.data(), buff.size())) != 0 )
-                        return res;
-                }
-                processedSize(offset);
-            }
-        }
+  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); }
 
-        /*
-          Check if slave was killed.  According to slavebase.h we need to leave
-          the slave methods as soon as possible if the slave is killed. This
-          allows the slave to be cleaned up properly.
-        */
-        if( wasKilled() ) {
-            res.text = i18n("An internal error occurred. Please retry the request again.");
-            res.code = ERR_UNKNOWN;
-            return res;
-        }
-    }
+private:
+  const bool mNoPaswordQuery;
+};
 
-    if( code != SSH2_FX_EOF ) {
-        res.text = src.prettyURL();
-        res.code = ERR_COULD_NOT_READ; // return here or still send empty array to indicate end of read?
-    }
+class PasswordAuth: public SSHAuthMethod {
+public:
+  PasswordAuth(bool noPaswordQuery = false): mNoPaswordQuery(noPaswordQuery) {}
 
-    res.size = offset;
-    sftpClose(handle);
-    processedSize (offset);
-    return res;
+  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" );
+  }
 }
 
-void sftpProtocol::get(const KURL& url) {
-    kdDebug(TDEIO_SFTP_DB) << "get(): " << url << endl ;
-
-    openConnection();
-    if( !mConnected )
-        return;
+TQStringList SSHAuthMethod::bitsetToStr (unsigned m) {
+  TQStringList rv;
 
-    // Get resume offset
-    TQ_UINT64 offset = config()->readUnsignedLongNumEntry("resume");
-    if( offset > 0 ) {
-        canResume();
-        kdDebug(TDEIO_SFTP_DB) << "get(): canResume(), offset = " << offset << endl;
+  for (int i=0; m>>i; i++) {
+    unsigned flag = m & (1 << i);
+    if (flag) {
+      rv.append(flagToStr(flag));
     }
-
-    Status info = sftpGet(url, offset);
-
-    if (info.code != 0)
-    {
-      error(info.code, info.text);
-      return;
-    }
-
-    data(TQByteArray());
-    kdDebug(TDEIO_SFTP_DB) << "get(): emit finished()" << endl;
-    finished();
+  }
+  return rv;
 }
 
 
-void sftpProtocol::setHost (const TQString& h, int port, const TQString& user, const TQString& pass)
+// Public key authentication
+int sftpProtocol::auth_callback(const char *prompt, char *buf, size_t len,
+                                int echo, int verify, void *userdata)
 {
-    kdDebug(TDEIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl;
+  // unused variables
+  (void) echo;
+  (void) verify;
+  (void) userdata;
+  (void) prompt;
 
-    if( mHost != h || mPort != port || user != mUsername || mPassword != pass )
-        closeConnection();
+  Q_ASSERT(len>0);
 
-    mHost = h;
+  kdDebug(TDEIO_SFTP_DB) << "Entering public key authentication callback" << endl;
 
-    if( port > 0 )
-        mPort = port;
-    else {
-        mPort = -1;
-    }
+  int rc=0;
+  bool firstTimeCalled = !mPubKeyAuthData.wasCalled;
+  mPubKeyAuthData.wasCalled = true;
 
-    mUsername = user;
-    mPassword = pass;
+  AuthInfo pubKeyInfo = authInfo();
 
-    if (user.isEmpty())
-    {
-      KUser u;
-      mUsername = u.loginName();
-    }
-}
+  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
 
+  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);
 
-void sftpProtocol::openConnection() {
-
-    if(mConnected)
-      return;
+  if (rc == 0 && ssh_key_file && ssh_key_file[0]) {
+    keyFile = ssh_key_file;
+  }
+  ssh_string_free_char(ssh_key_file);
+#endif
 
-    kdDebug(TDEIO_SFTP_DB) << "openConnection(): " << mUsername << "@"
-                         << mHost << ":" << mPort << endl;
+  bool firstTry = !mPubKeyAuthData.attemptedKeys.contains(keyFile);
 
-    infoMessage( i18n("Opening SFTP connection to host <b>%1:%2</b>").arg(mHost).arg(mPort));
+  if (firstTry) {
+    SlaveBase::s_seqNr = mPubKeyAuthData.current_seqNr;
+  } else {
+    errMsg = i18n("Incorrect or invalid passphrase.").append('\n');
+  }
 
-    if( mHost.isEmpty() ) {
-        kdDebug(TDEIO_SFTP_DB) << "openConnection(): Need hostname..." << endl;
-        error(ERR_UNKNOWN_HOST, i18n("No hostname specified"));
-        return;
-    }
+  // 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.");
+  }
 
-    ////////////////////////////////////////////////////////////////////////////
-    // 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;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Check for cached authentication info if a username AND password were
-    // not specified in setHost().
-    if( mUsername.isEmpty() && mPassword.isEmpty() ) {
-        kdDebug(TDEIO_SFTP_DB) << "openConnection(): checking cache "
-                             << "info.username = " << info.username
-                             << ", info.url = " << info.url.prettyURL() << endl;
-
-        if( checkCachedAuthentication(info) ) {
-            mUsername = info.username;
-            mPassword = info.password;
-        }
-    }
+  // We don't want to clobber with normal passwords in kpasswdserver's cache
+  pubKeyInfo.realmValue = "keyfile passphrase:" + keyFile;
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Now setup our ssh options. If we found a cached username
-    // and password we set the SSH_PASSWORD and SSH_USERNAME
-    // options right away.  Otherwise we wait. The other options are
-    // necessary for running sftp over ssh.
-    KSshProcess::SshOpt opt;   // a ssh option, this can be reused
-    KSshProcess::SshOptList opts; // list of SshOpts
-    KSshProcess::SshOptListIterator passwdIt; // points to the opt in opts that specifies the password
-    KSshProcess::SshOptListIterator usernameIt;
-
-//    opt.opt = KSshProcess::SSH_VERBOSE;
-//    opts.append(opt);
-//    opts.append(opt);
-
-    if( mPort != -1 ) {
-        opt.opt = KSshProcess::SSH_PORT;
-        opt.num = mPort;
-        opts.append(opt);
+  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;
     }
 
-    opt.opt = KSshProcess::SSH_SUBSYSTEM;
-    opt.str = "sftp";
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_FORWARDX11;
-    opt.boolean = false;
-    opts.append(opt);
+    strncpy(buf, pubKeyInfo.password.utf8().data(), len-1);
+    buf[len-1]=0; // Just to be on the safe side
 
-    opt.opt = KSshProcess::SSH_FORWARDAGENT;
-    opt.boolean = false;
-    opts.append(opt);
+    purgeString(pubKeyInfo.password);
 
-    opt.opt = KSshProcess::SSH_PROTOCOL;
-    opt.num = 2;
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_HOST;
-    opt.str = mHost;
-    opts.append(opt);
-
-    opt.opt = KSshProcess::SSH_ESCAPE_CHAR;
-    opt.num = -1; // don't use any escape character
-    opts.append(opt);
-
-    // set the username and password if we have them
-    if( !mUsername.isEmpty()  ) {
-        opt.opt = KSshProcess::SSH_USERNAME;
-        opt.str = mUsername;
-        usernameIt = opts.append(opt);
+    // take a note that we already tried unlocking this keyfile
+    if(firstTry) {
+      mPubKeyAuthData.attemptedKeys.append(keyFile);
     }
 
-    if( !mPassword.isEmpty() ) {
-        opt.opt = KSshProcess::SSH_PASSWD;
-        opt.str = mPassword;
-        passwdIt = opts.append(opt);
+    // 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;
     }
+  }
 
-    ssh.setOptions(opts);
-    ssh.printArgs();
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Start the ssh connection process.
-    //
-
-    int err;           // error code from KSshProcess
-    TQString msg;       // msg for dialog box
-    TQString caption;   // dialog box caption
-    bool firstTime = true;
-    bool dlgResult;
-
-    while( !(mConnected = ssh.connect()) ) {
-        err = ssh.error();
-        kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
-            "Got " << err << " from KSshProcess::connect()" << endl;
-
-        switch(err) {
-        case KSshProcess::ERR_NEED_PASSWD:
-        case KSshProcess::ERR_NEED_PASSPHRASE:
-            // At this point we know that either we didn't set
-            // an username or password in the ssh options list,
-            // or what we did pass did not work. Therefore we
-            // must prompt the user.
-            if( err == KSshProcess::ERR_NEED_PASSPHRASE )
-                info.prompt = i18n("Please enter your username and key passphrase.");
-            else
-                info.prompt = i18n("Please enter your username and password.");
-
-            kdDebug(TDEIO_SFTP_DB) << "openConnection(): info.username = " << info.username
-                                 << ", info.url = " << info.url.prettyURL() << endl;
-
-            if( firstTime )
-                dlgResult = openPassDlg(info);
-            else
-                dlgResult = openPassDlg(info, i18n("Incorrect username or password"));
-
-            if( dlgResult ) {
-               if( info.username.isEmpty() || info.password.isEmpty() ) {
-                    error(ERR_COULD_NOT_AUTHENTICATE,
-                      i18n("Please enter a username and password"));
-                    continue;
-                }
-            }
-            else {
-                // user canceled or dialog failed to open
-                error(ERR_USER_CANCELED, TQString::null);
-                kdDebug(TDEIO_SFTP_DB) << "openConnection(): user canceled, dlgResult = " << dlgResult << endl;
-                closeConnection();
-                return;
-            }
-
-            firstTime = false;
-
-            // Check if the username has changed. SSH only accepts
-            // the username at startup. If the username has changed
-            // we must disconnect ssh, change the SSH_USERNAME
-            // option, and reset the option list. We will also set
-            // the password option so the user is not prompted for
-            // it again.
-            if( mUsername != info.username ) {
-                kdDebug(TDEIO_SFTP_DB) << "openConnection(): Username changed from "
-                                     << mUsername << " to " << info.username << endl;
-
-                ssh.disconnect();
-
-                // if we haven't yet added the username
-                // or password option to the ssh options list then
-                // the iterators will be equal to the empty iterator.
-                // Create the opts now and add them to the opt list.
-                if( usernameIt == KSshProcess::SshOptListIterator() ) {
-                    kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
-                        "Adding username to options list" << endl;
-                    opt.opt = KSshProcess::SSH_USERNAME;
-                    usernameIt = opts.append(opt);
-                }
-
-                if( passwdIt == KSshProcess::SshOptListIterator() ) {
-                    kdDebug(TDEIO_SFTP_DB) << "openConnection(): "
-                        "Adding password to options list" << endl;
-                    opt.opt = KSshProcess::SSH_PASSWD;
-                    passwdIt = opts.append(opt);
-                }
-
-                (*usernameIt).str = info.username;
-                (*passwdIt).str = info.password;
-                ssh.setOptions(opts);
-                ssh.printArgs();
-            }
-            else { // just set the password
-                ssh.setPassword(info.password);
-            }
+  return rc;
+}
 
-            mUsername = info.username;
-            mPassword = info.password;
+void sftpProtocol::log_callback(ssh_session session, int priority,
+    const char *message, void *userdata) {
+  (void) session;
+  (void) userdata;
 
-            break;
+  kdDebug(TDEIO_SFTP_DB) << "[" << priority << "] " << message << endl;
+}
 
-        case KSshProcess::ERR_NEW_HOST_KEY:
-            caption = i18n("Warning: Cannot verify host's identity.");
-            msg = ssh.errorMsg();
-            if( KMessageBox::Yes != messageBox(WarningYesNo, msg, caption) ) {
-                closeConnection();
-                error(ERR_USER_CANCELED, TQString::null);
-                return;
-            }
-            ssh.acceptHostKey(true);
-            break;
-
-        case KSshProcess::ERR_DIFF_HOST_KEY:
-            caption = i18n("Warning: Host's identity changed.");
-            msg = ssh.errorMsg();
-            if( KMessageBox::Yes != messageBox(WarningYesNo, msg, caption) ) {
-                closeConnection();
-                error(ERR_USER_CANCELED, TQString::null);
-                return;
-            }
-            ssh.acceptHostKey(true);
-            break;
-
-        case KSshProcess::ERR_AUTH_FAILED:
-            infoMessage(i18n("Authentication failed."));
-            error(ERR_COULD_NOT_LOGIN, i18n("Authentication failed."));
-            return;
-
-        case KSshProcess::ERR_AUTH_FAILED_NEW_KEY:
-            msg = ssh.errorMsg();
-            error(ERR_COULD_NOT_LOGIN, msg);
-            return;
-
-        case KSshProcess::ERR_AUTH_FAILED_DIFF_KEY:
-            msg = ssh.errorMsg();
-            error(ERR_COULD_NOT_LOGIN, msg);
-            return;
-
-        case KSshProcess::ERR_CLOSED_BY_REMOTE_HOST:
-            infoMessage(i18n("Connection failed."));
-            caption = i18n("Connection closed by remote host.");
-            msg = ssh.errorMsg();
-            messageBox(Information, msg, caption);
-            closeConnection();
-            error(ERR_COULD_NOT_LOGIN, msg);
-            return;
-
-        case KSshProcess::ERR_INTERACT:
-        case KSshProcess::ERR_INTERNAL:
-        case KSshProcess::ERR_UNKNOWN:
-        case KSshProcess::ERR_INVALID_STATE:
-        case KSshProcess::ERR_CANNOT_LAUNCH:
-        case KSshProcess::ERR_HOST_KEY_REJECTED:
-        default:
-            infoMessage(i18n("Connection failed."));
-            caption = i18n("Unexpected SFTP error: %1").arg(err);
-            msg = ssh.errorMsg();
-            messageBox(Information, msg, caption);
-            closeConnection();
-            error(ERR_UNKNOWN, msg);
-            return;
-        }
+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;
     }
+  }
 
-    // catch all in case we did something wrong above
-    if( !mConnected ) {
-        error(ERR_INTERNAL, TQString::null);
-        return;
-    }
+  return rc;
+}
 
-    // Now send init packet.
-    kdDebug(TDEIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl;
-    TQByteArray p;
-    TQDataStream packet(p, IO_WriteOnly);
-    packet << (TQ_UINT32)5;                     // packet length
-    packet << (TQ_UINT8) SSH2_FXP_INIT;         // packet type
-    packet << (TQ_UINT32)SSH2_FILEXFER_VERSION; // client version
-
-    putPacket(p);
-    getPacket(p);
-
-    TQDataStream s(p, IO_ReadOnly);
-    TQ_UINT32 version;
-    TQ_UINT8  type;
-    s >> type;
-    kdDebug(TDEIO_SFTP_DB) << "openConnection(): Got type " << type << endl;
-
-    if( type == SSH2_FXP_VERSION ) {
-        s >> version;
-        kdDebug(TDEIO_SFTP_DB) << "openConnection(): Got server version " << version << endl;
-
-        // XXX Get extensions here
-        sftpVersion = version;
-
-        /* Server should return lowest common version supported by
-         * client and server, but double check just in case.
-         */
-        if( sftpVersion > SSH2_FILEXFER_VERSION ) {
-            error(ERR_UNSUPPORTED_PROTOCOL,
-                i18n("SFTP version %1").arg(version));
-            closeConnection();
-            return;
-        }
-    }
-    else {
-        error(ERR_UNKNOWN, i18n("Protocol error."));
-        closeConnection();
-        return;
-    }
+int sftpProtocol::authenticateKeyboardInteractive(bool noPaswordQuery) {
+  kdDebug(TDEIO_SFTP_DB) << "Entering keyboard interactive function" << endl;
 
-    // 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) << "sftpProtocol(): caching info.username = " << info.username <<
-        ", info.url = " << info.url.prettyURL() << endl;
-    cacheAuthentication(info);
-    mConnected = true;
-    connected();
+  int rc = SSH_AUTH_ERROR;
 
-    mPassword.fill('x');
-    info.password.fill('x');
+  bool retryDenied = false; // a flag to avoid infinite looping
 
-    return;
-}
+  TQString cachablePassword;
+  PasswordPurger cachePurger(cachablePassword);
 
-void sftpProtocol::closeConnection() {
-    kdDebug(TDEIO_SFTP_DB) << "closeConnection()" << endl;
-    ssh.disconnect();
-    mConnected = false;
-}
+  // Different prompts during a single pass should be queried with the same s_seqNr value
+  long current_seqNr = SlaveBase::s_seqNr;
 
-void sftpProtocol::sftpCopyPut(const KURL& src, const KURL& dest, int permissions, bool overwrite) {
+  while (1) {
+    int n = 0;
+    int i = 0;
 
-    KDE_struct_stat buff;
-    TQCString file (TQFile::encodeName(src.path()));
+    rc = ssh_userauth_kbdint(mSession, NULL, NULL);
 
-    if (KDE_lstat(file.data(), &buff) == -1) {
-        error (ERR_DOES_NOT_EXIST, src.prettyURL());
-        return;
+    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;
     }
 
-    if (S_ISDIR (buff.st_mode)) {
-        error (ERR_IS_DIRECTORY, src.prettyURL());
-        return;
-    }
+    // 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);
 
-    int fd = KDE_open (file.data(), O_RDONLY);
-    if (fd == -1) {
-        error (ERR_CANNOT_OPEN_FOR_READING, src.prettyURL());
-        return;
+    if (n>0) {
+      // If there is at least one prompt we will want to retry auth if we fail
+      retryDenied = true;
     }
 
-    totalSize (buff.st_size);
-
-    sftpPut (dest, permissions, false, overwrite, fd);
-
-    // Close the file descriptor...
-    ::close( fd );
-}
-
-void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool overwrite, int fd ) {
+    kdDebug(TDEIO_SFTP_DB) << "name=" << name << " instruction=" << instruction
+      << " prompts:" << n << endl;
 
-    openConnection();
-    if( !mConnected )
-        return;
+    for (i = 0; i < n; ++i) {
+      char echo;
+      bool isPassword=false;
+      TQString answer;
+      TQString errMsg;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpPut(): " << dest
-                         << ", resume=" << resume
-                         << ", overwrite=" << overwrite << endl;
+      // restore the s_seqNr so it would be the same for all the prompts
+      SlaveBase::s_seqNr = current_seqNr;
 
-    KURL origUrl( dest );
-    sftpFileAttr origAttr(remoteEncoding());
-    bool origExists = false;
+      prompt = TQString::fromUtf8(ssh_userauth_kbdint_getprompt(mSession, i, &echo));
+      kdDebug(TDEIO_SFTP_DB) << "prompt=" << prompt << " echo=" << TQString::number(echo) << endl;
 
-    // Stat original (without part ext)  to see if it already exists
-    int code = sftpStat(origUrl, origAttr);
+      TDEIO::AuthInfo infoKbdInt = authInfo();
+      infoKbdInt.realmValue = prompt; // each prompt will be treated on its own by kpasswdserver
+      infoKbdInt.keepPassword = false;
 
-    if( code == SSH2_FX_OK ) {
-        kdDebug(TDEIO_SFTP_DB) << "sftpPut(): <file> already exists" << endl;
+      if (!name.isEmpty()) {
+        infoKbdInt.caption = TQString(i18n("SFTP Login") + " - " + name);
+      }
 
-        // Delete remote file if its size is zero
-        if( origAttr.fileSize() == 0 ) {
-            if( sftpRemove(origUrl, true) != SSH2_FX_OK ) {
-                error(ERR_CANNOT_DELETE_ORIGINAL, origUrl.prettyURL());
-                return;
+      // Those strings might or might not contain some sensitive information
+      PasswordPurger answerPurger{answer};
+      PasswordPurger infoPurger{infoKbdInt.password};
+
+      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)
         }
-        else {
-            origExists = true;
-        }
-    }
-    else if( code != SSH2_FX_NO_SUCH_FILE ) {
-        processStatus(code, origUrl.prettyURL());
-        return;
-    }
-
-    // Do not waste time/resources with more remote stat calls if the file exists
-    // and we weren't instructed to overwrite it...
-    if( origExists && !overwrite ) {
-        error(ERR_FILE_ALREADY_EXIST, origUrl.prettyURL());
-        return;
-    }
-
-    // Stat file with part ext to see if it already exists...
-    KURL partUrl( origUrl );
-    partUrl.setFileName( partUrl.fileName() + ".part" );
-
-    TQ_UINT64 offset = 0;
-    bool partExists = false;
-    bool markPartial = config()->readBoolEntry("MarkPartial", true);
-
-    if( markPartial ) {
-
-        sftpFileAttr partAttr(remoteEncoding());
-        code = sftpStat(partUrl, partAttr);
 
-        if( code == SSH2_FX_OK ) {
-            kdDebug(TDEIO_SFTP_DB) << "sftpPut(): .part file already exists" << endl;
-            partExists = true;
-            offset = partAttr.fileSize();
-
-            // If for some reason, both the original and partial files exist,
-            // skip resumption just like we would if the size of the partial
-            // file is zero...
-            if( origExists || offset == 0 )
-            {
-                if( sftpRemove(partUrl, true) != SSH2_FX_OK ) {
-                    error(ERR_CANNOT_DELETE_PARTIAL, partUrl.prettyURL());
-                    return;
-                }
-
-                if( sftpRename(origUrl, partUrl) != SSH2_FX_OK ) {
-                    error(ERR_CANNOT_RENAME_ORIGINAL, origUrl.prettyURL());
-                    return;
-                }
-
-                offset = 0;
-            }
-            else if( !overwrite && !resume ) {
-                    if (fd != -1)
-                        resume = (KDE_lseek(fd, offset, SEEK_SET) != -1);
-                    else
-                        resume = canResume( offset );
-
-                    kdDebug(TDEIO_SFTP_DB) << "sftpPut(): can resume = " << resume
-                                         << ", offset = " << offset;
-
-                    if( !resume ) {
-                      error(ERR_FILE_ALREADY_EXIST, partUrl.prettyURL());
-                      return;
-                    }
-            }
-            else {
-                offset = 0;
+        if (answer.isNull()) {
+          if (openPassDlg(infoKbdInt, errMsg)) {
+            answer = infoKbdInt.password;
+            kdDebug(TDEIO_SFTP_DB) << "Got the answer from the password dialog" << endl;
+
+            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 if( code == SSH2_FX_NO_SUCH_FILE ) {
-            if( origExists && sftpRename(origUrl, partUrl) != SSH2_FX_OK ) {
-              error(ERR_CANNOT_RENAME_ORIGINAL, origUrl.prettyURL());
-              return;
-            }
-        }
-        else {
-            processStatus(code, partUrl.prettyURL());
-            return;
+      } 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;
 
-    // Determine the url we will actually write to...
-    KURL writeUrl (markPartial ? partUrl:origUrl);
-
-    TQ_UINT32 pflags = 0;
-    if( overwrite && !resume )
-        pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_TRUNC;
-    else if( !overwrite && !resume )
-        pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_EXCL;
-    else if( overwrite && resume )
-        pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT;
-    else if( !overwrite && resume )
-        pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_APPEND;
-
-    sftpFileAttr attr(remoteEncoding());
-    TQByteArray handle;
-
-    // Set the permissions of the file we write to if it didn't already exist
-    // and the permission info is supplied, i.e it is not -1
-    if( !partExists && !origExists && permissions != -1)
-        attr.setPermissions(permissions);
-
-    code = sftpOpen( writeUrl, pflags, attr, handle );
-    if( code != SSH2_FX_OK ) {
-
-        // Rename the file back to its original name if a
-        // put fails due to permissions problems...
-        if( markPartial && overwrite ) {
-            (void) sftpRename(partUrl, origUrl);
-            writeUrl = origUrl;
-        }
+        infoKbdInt.url.setUser(infoKbdInt.username);
+        infoKbdInt.username = TQString::null;
 
-        if( code == SSH2_FX_FAILURE ) { // assume failure means file exists
-            error(ERR_FILE_ALREADY_EXIST, writeUrl.prettyURL());
-            return;
-        }
-        else {
-            processStatus(code, writeUrl.prettyURL());
-            return;
+        infoKbdInt.readOnly = false;
+
+        if (openPassDlg(infoKbdInt)) {
+          answer = infoKbdInt.username;
+          kdDebug(TDEIO_SFTP_DB) << "Got the answer from the password dialog: " << answer << endl;
+        } else {
+          return sftpProtocol::SSH_AUTH_CANCELED;
         }
-    }
+      }
 
-    long nbytes;
-    TQByteArray buff;
+      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 (!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);
+  }
 
-    do {
+  return rc;
+}
 
-        if( fd != -1 ) {
-            buff.resize( 16*1024 );
-            if ( (nbytes = ::read(fd, buff.data(), buff.size())) > -1 )
-                buff.resize( nbytes );
-        }
-        else {
-            dataReq();
-            nbytes = readData( buff );
-        }
+int sftpProtocol::authenticatePassword(bool noPaswordQuery) {
+  kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with password" << endl;
 
-        if( nbytes >= 0 ) {
-            if( (code = sftpWrite(handle, offset, buff)) != SSH2_FX_OK ) {
-                error(ERR_COULD_NOT_WRITE, dest.prettyURL());
-                return;
-            }
+  AuthInfo info = authInfo();
+  info.keepPassword = true;
+  info.prompt = i18n("Please enter your username and password.");
 
-            offset += nbytes;
-            processedSize(offset);
-
-            /* Check if slave was killed.  According to slavebase.h we
-              * need to leave the slave methods as soon as possible if
-              * the slave is killed. This allows the slave to be cleaned
-              * up properly.
-              */
-            if( wasKilled() ) {
-                sftpClose(handle);
-                closeConnection();
-                error(ERR_UNKNOWN, i18n("An internal error occurred. Please try again."));
-                return;
-            }
-        }
+  PasswordPurger pPurger(info.password);
 
-    } while( nbytes > 0 );
+  int rc;
+  do {
+    TQString errMsg;
 
-    if( nbytes < 0 ) {
-        sftpClose(handle);
+    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');
+      }
 
-        if( markPartial ) {
-            // Remove remote file if it smaller than our keep size
-            uint minKeepSize = config()->readNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE);
+      mPasswordWasPrompted = true;
 
-            if( sftpStat(writeUrl, attr) == SSH2_FX_OK ) {
-                if( attr.fileSize() < minKeepSize ) {
-                    sftpRemove(writeUrl, 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;
+      }
 
-        error( ERR_UNKNOWN, i18n("Unknown error was encountered while copying the file "
-                                 "to '%1'. Please try again.").arg(dest.host()) );
-        return;
+      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;
+      }
     }
 
-    if( (code = sftpClose(handle)) != SSH2_FX_OK ) {
-        error(ERR_COULD_NOT_WRITE, writeUrl.prettyURL());
-        return;
-    }
+    rc = ssh_userauth_password(mSession, NULL, info.password.utf8().data());
 
-    // If wrote to a partial file, then remove the part ext
-    if( markPartial ) {
-        if( sftpRename(partUrl, origUrl) != SSH2_FX_OK ) {
-            error(ERR_CANNOT_RENAME_PARTIAL, origUrl.prettyURL());
-            return;
-        }
-    }
+  } while (rc == SSH_AUTH_DENIED && !noPaswordQuery);
 
-    finished();
+  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;
 }
 
-void sftpProtocol::put ( const KURL& url, int permissions, bool overwrite, bool resume ){
-    kdDebug(TDEIO_SFTP_DB) << "put(): " << url << ", overwrite = " << overwrite
-                         << ", resume = " << resume << endl;
-
-    sftpPut( url, permissions, resume, overwrite );
-}
 
-void sftpProtocol::stat ( const KURL& url ){
-    kdDebug(TDEIO_SFTP_DB) << "stat(): " << url << endl;
+TQString sftpProtocol::sshUsername() {
+  int rc;
+  TQString rv;
 
-    openConnection();
-    if( !mConnected )
-        return;
+  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);
 
-    // If the stat URL has no path, do not attempt to determine the real
-    // path and do a redirect. KRun will simply ignore such requests.
-    // Instead, simply return the mime-type as a directory...
-    if( !url.hasPath() ) {
-        UDSEntry entry;
-        UDSAtom atom;
+  return rv;
+}
 
-        atom.m_uds = TDEIO::UDS_NAME;
-        atom.m_str = TQString::null;
-        entry.append( atom );
 
-        atom.m_uds = TDEIO::UDS_FILE_TYPE;
-        atom.m_long = S_IFDIR;
-        entry.append( atom );
+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;
+}
 
-        atom.m_uds = TDEIO::UDS_ACCESS;
-        atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
-        entry.append( atom );
+TDEIO::AuthInfo sftpProtocol::authInfo() {
+  TDEIO::AuthInfo rv;
 
-        atom.m_uds = TDEIO::UDS_USER;
-        atom.m_str = mUsername;
-        entry.append( atom );
-        atom.m_uds = TDEIO::UDS_GROUP;
-        entry.append( atom );
+  rv.url.setProtocol("sftp");
+  rv.url.setHost(mHost);
+  rv.url.setPort(mPort);
+  rv.url.setUser(mUsername);
 
-        // no size
-        statEntry( entry );
-        finished();
-        return;
-    }
+  rv.caption = i18n("SFTP Login");
+  rv.comment = "sftp://" + mHost + ':' + TQString::number(mPort);
+  rv.commentLabel = i18n("site:");
 
-    int code;
-    sftpFileAttr attr(remoteEncoding());
-    if( (code = sftpStat(url, attr)) != SSH2_FX_OK ) {
-        processStatus(code, url.prettyURL());
-        return;
-    }
-    else {
-        //kdDebug() << "We sent and received stat packet ok" << endl;
-        attr.setFilename(url.fileName());
-        statEntry(attr.entry());
-    }
+  if(!mUsername.isEmpty()) {
+    rv.username = mUsername;
+  } if(!mCachedUsername.isEmpty()) {
+    rv.username = mCachedUsername;
+  } else if (mSession) {
+    rv.username = sshUsername();
+  }
 
-    finished();
+  // if username was specified in the address string it shouldn't be changed
+  if (!mUsername.isEmpty()) {
+    rv.readOnly = true;
+  }
 
-    kdDebug(TDEIO_SFTP_DB) << "stat: END" << endl;
-    return;
+  return rv;
 }
 
+void sftpProtocol::reportError(const KURL &url, const int err) {
+  kdDebug(TDEIO_SFTP_DB) << "url = " << url.url() << " - err=" << err << endl;
 
-void sftpProtocol::mimetype ( const KURL& url ){
-    kdDebug(TDEIO_SFTP_DB) << "mimetype(): " << url << endl;
+  switch (err) {
+    case SSH_FX_OK:
+      break;
+    case SSH_FX_NO_SUCH_FILE:
+    case SSH_FX_NO_SUCH_PATH:
+      error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+      break;
+    case SSH_FX_PERMISSION_DENIED:
+      error(TDEIO::ERR_ACCESS_DENIED, url.prettyURL());
+      break;
+    case SSH_FX_FILE_ALREADY_EXISTS:
+      error(TDEIO::ERR_FILE_ALREADY_EXIST, url.prettyURL());
+      break;
+    case SSH_FX_INVALID_HANDLE:
+      error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
+      break;
+    case SSH_FX_OP_UNSUPPORTED:
+      error(TDEIO::ERR_UNSUPPORTED_ACTION, url.prettyURL());
+      break;
+    case SSH_FX_BAD_MESSAGE:
+      error(TDEIO::ERR_UNKNOWN, url.prettyURL());
+      break;
+    default:
+      error(TDEIO::ERR_INTERNAL, url.prettyURL());
+      break;
+  }
+}
 
-    openConnection();
-    if( !mConnected )
-        return;
+bool sftpProtocol::createUDSEntry(const TQString &filename, const TQByteArray &path,
+      UDSEntry &entry, short int details) {
+  mode_t type;
+  mode_t access;
+  char *link;
 
-    TQ_UINT32 pflags = SSH2_FXF_READ;
-    TQByteArray handle, mydata;
-    sftpFileAttr attr(remoteEncoding());
-    int code;
-    if( (code = sftpOpen(url, pflags, attr, handle)) != SSH2_FX_OK ) {
-        error(ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
-        return;
-    }
+  Q_ASSERT(entry.count() == 0);
 
-    TQ_UINT32 len = 1024; // Get first 1k for determining mimetype
-    TQ_UINT64 offset = 0;
-    code = SSH2_FX_OK;
-    while( offset < len && code == SSH2_FX_OK ) {
-        if( (code = sftpRead(handle, offset, len, mydata)) == SSH2_FX_OK ) {
-            data(mydata);
-            offset += mydata.size();
-            processedSize(offset);
+  sftp_attributes sb = sftp_lstat(mSftp, path.data());
+  if (sb == NULL) {
+    return false;
+  }
 
-            kdDebug(TDEIO_SFTP_DB) << "mimetype(): offset = " << offset << endl;
-        }
+  UDSAtom atom;
+  atom.m_uds = UDS_NAME;
+  atom.m_str = filename;
+  entry.append(atom);
+
+  if (sb->type == SSH_FILEXFER_TYPE_SYMLINK) {
+    atom.m_uds = UDS_FILE_TYPE;
+    atom.m_long = S_IFREG;
+    entry.append(atom);
+    link = sftp_readlink(mSftp, path.data());
+    if (link == NULL) {
+      sftp_attributes_free(sb);
+      return false;
+    }
+    atom.m_uds = UDS_LINK_DEST;
+    atom.m_str = TQFile::decodeName(link);
+    entry.append(atom);
+    delete link;
+    // A symlink -> follow it only if details > 1
+    if (details > 1) {
+      sftp_attributes sb2 = sftp_stat(mSftp, path.data());
+      if (sb2 == NULL) {
+        // It is a link pointing to nowhere
+        type = S_IFMT - 1;
+        access = S_IRWXU | S_IRWXG | S_IRWXO;
+        atom.m_uds = UDS_FILE_TYPE;
+        atom.m_long = type;
+        entry.append(atom);
+
+        atom.m_uds = UDS_ACCESS;
+        atom.m_long = access;
+        entry.append(atom);
+
+        atom.m_uds = UDS_SIZE;
+        atom.m_long = 0LL;
+        entry.append(atom);
+
+        goto notype;
+      }
+      sftp_attributes_free(sb);
+      sb = sb2;
     }
+  }
 
+  switch (sb->type) {
+    case SSH_FILEXFER_TYPE_REGULAR:
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFREG;
+      entry.append(atom);
+      break;
+    case SSH_FILEXFER_TYPE_DIRECTORY:
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFDIR;
+      entry.append(atom);
+      break;
+    case SSH_FILEXFER_TYPE_SYMLINK:
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFLNK;
+      entry.append(atom);
+      break;
+    case SSH_FILEXFER_TYPE_SPECIAL:
+    case SSH_FILEXFER_TYPE_UNKNOWN:
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFMT - 1;
+      entry.append(atom);
+      break;
+  }
 
-    data(TQByteArray());
-    processedSize(offset);
-    sftpClose(handle);
-    finished();
-    kdDebug(TDEIO_SFTP_DB) << "mimetype(): END" << endl;
-}
-
-
-void sftpProtocol::listDir(const KURL& url) {
-    kdDebug(TDEIO_SFTP_DB) << "listDir(): " << url << endl;
+  access = sb->permissions & 07777;
+  atom.m_uds = UDS_ACCESS;
+  atom.m_long = access;
+  entry.append(atom);
+
+  atom.m_uds = UDS_SIZE;
+  atom.m_long = sb->size;
+  entry.append(atom);
+
+notype:
+  if (details > 0) {
+    if (sb->owner) {
+      atom.m_uds = UDS_USER;
+      atom.m_str = TQString::fromUtf8(sb->owner);
+      entry.append(atom);
+    } else {
+      atom.m_uds = UDS_USER;
+      atom.m_str = TQString::number(sb->uid);
+      entry.append(atom);
+    }
+
+    if (sb->group) {
+      atom.m_uds = UDS_GROUP;
+      atom.m_str = TQString::fromUtf8(sb->group);
+      entry.append(atom);
+    } else {
+      atom.m_uds = UDS_GROUP;
+      atom.m_str = TQString::number(sb->gid);
+      entry.append(atom);
+    }
+    atom.m_uds = UDS_ACCESS_TIME;
+    atom.m_long = sb->atime;
+    entry.append(atom);
+
+    atom.m_uds = UDS_MODIFICATION_TIME;
+    atom.m_long = sb->mtime;
+    entry.append(atom);
+
+    atom.m_uds = UDS_MODIFICATION_TIME;
+    atom.m_long = sb->createtime;
+    entry.append(atom);
+  }
 
-    openConnection();
-    if( !mConnected )
-        return;
+  sftp_attributes_free(sb);
 
-    if( !url.hasPath() ) {
-        KURL newUrl ( url );
-        if( sftpRealPath(url, newUrl) == SSH2_FX_OK ) {
-            kdDebug(TDEIO_SFTP_DB) << "listDir: Redirecting to " << newUrl << endl;
-            redirection(newUrl);
-            finished();
-            return;
-        }
-    }
+  return true;
+}
 
-    int code;
-    TQByteArray handle;
+TQString sftpProtocol::canonicalizePath(const TQString &path) {
+  kdDebug(TDEIO_SFTP_DB) << "Path to canonicalize: " << path << endl;
+  TQString cPath;
+  char *sPath = NULL;
 
-    if( (code = sftpOpenDirectory(url, handle)) != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "listDir(): open directory failed" << endl;
-        processStatus(code, url.prettyURL());
-        return;
-    }
+  if (path.isEmpty()) {
+    return cPath;
+  }
 
+  sPath = sftp_canonicalize_path(mSftp, path.utf8().data());
+  if (sPath == NULL) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not canonicalize path: " << path << endl;
+    return cPath;
+  }
 
-    code = SSH2_FX_OK;
-    while( code == SSH2_FX_OK ) {
-        code = sftpReadDir(handle, url);
-        if( code != SSH2_FX_OK && code != SSH2_FX_EOF )
-            processStatus(code, url.prettyURL());
-        kdDebug(TDEIO_SFTP_DB) << "listDir(): return code = " << code << endl;
-    }
+  cPath = TQFile::decodeName(sPath);
+  delete sPath;
 
-    if( (code = sftpClose(handle)) != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "listdir(): closing of directory failed" << endl;
-        processStatus(code, url.prettyURL());
-        return;
-    }
+  kdDebug(TDEIO_SFTP_DB) << "Canonicalized path: " << cPath << endl;
 
-    finished();
-    kdDebug(TDEIO_SFTP_DB) << "listDir(): END" << endl;
+  return cPath;
 }
 
-/** Make a directory.
-    OpenSSH does not follow the internet draft for sftp in this case.
-    The format of the mkdir request expected by OpenSSH sftp server is:
-        uint32 id
-        string path
-        ATTR   attr
- */
-void sftpProtocol::mkdir(const KURL&url, int permissions){
+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 TQ_WS_WIN
+  kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
 
-    kdDebug(TDEIO_SFTP_DB) << "mkdir() creating dir: " << url.path() << endl;
+  kdDebug(TDEIO_SFTP_DB) << "debug = " << getenv("TDEIO_SFTP_LOG_VERBOSITY") << endl;
+#endif
 
-    openConnection();
-    if( !mConnected )
-        return;
+  mCallbacks = (ssh_callbacks) malloc(sizeof(struct ssh_callbacks_struct));
+  if (mCallbacks == NULL) {
+    error(TDEIO::ERR_OUT_OF_MEMORY, i18n("Could not allocate callbacks"));
+    return;
+  }
+  ZERO_STRUCTP(mCallbacks);
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+  mCallbacks->userdata = this;
+  mCallbacks->auth_function = ::auth_callback;
+  if (getenv("TDEIO_SFTP_LOG_VERBOSITY")) {
+    mCallbacks->log_function = ::log_callback;
+  }
 
-    sftpFileAttr attr(remoteEncoding());
+  ssh_callbacks_init(mCallbacks);
+}
 
-    if (permissions != -1)
-      attr.setPermissions(permissions);
+sftpProtocol::~sftpProtocol() {
+#ifndef TQ_WS_WIN
+  kdDebug(TDEIO_SFTP_DB) << "pid = " << getpid() << endl;
+#endif
+  closeConnection();
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  free(mCallbacks);
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << TQ_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size());
-    s << (TQ_UINT8)SSH2_FXP_MKDIR;
-    s << id;
-    s.writeBytes(path.data(), len);
-    s << attr;
+  /* cleanup and shut down cryto stuff */
+  ssh_finalize();
 
-    kdDebug(TDEIO_SFTP_DB) << "mkdir(): packet size is " << p.size() << endl;
+  purgeString(mPassword);
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::setHost(const TQString& h, int port, const TQString& user, const TQString& pass) {
+  kdDebug(TDEIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl;
 
-    TQ_UINT8 type;
-    TQDataStream r(p, IO_ReadOnly);
+  if (mConnected) {
+    closeConnection();
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "mkdir: sftp packet id mismatch" << endl;
-        error(ERR_COULD_NOT_MKDIR, path);
-        finished();
-        return;
-    }
+  mHost = h;
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "mkdir(): unexpected packet type of " << type << endl;
-        error(ERR_COULD_NOT_MKDIR, path);
-        finished();
-        return;
+  if (port > 0) {
+    mPort = port;
+  } else {
+    struct servent *pse;
+    if ((pse = getservbyname("ssh", "tcp") ) == NULL) {
+      mPort = 22;
+    } else {
+      mPort = ntohs(pse->s_port);
     }
+  }
 
-    int code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "mkdir(): failed with code " << code << endl;
-
-        // Check if mkdir failed because the directory already exists so that
-        // we can return the appropriate message...
-        sftpFileAttr dirAttr(remoteEncoding());
-        if ( sftpStat(url, dirAttr) == SSH2_FX_OK )
-        {
-          error( ERR_DIR_ALREADY_EXIST, url.prettyURL() );
-          return;
-        }
-
-        error(ERR_COULD_NOT_MKDIR, path);
-    }
+  kdDebug(TDEIO_SFTP_DB) << "setHost(): mPort=" << mPort << endl;
 
-    finished();
+  mUsername = user;
+  mPassword = pass;
+  mCachedUsername = TQString::null;
 }
 
-void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){
-    kdDebug(TDEIO_SFTP_DB) << "rename(" << src << " -> " << dest << ")" << endl;
-
-    if (!isSupportedOperation(SSH2_FXP_RENAME)) {
-      error(ERR_UNSUPPORTED_ACTION,
-          i18n("The remote host does not support renaming files."));
-      return;
-    }
 
-    openConnection();
-    if( !mConnected )
-        return;
+int sftpProtocol::initializeConnection() {
+  unsigned char *hash = NULL; // the server hash
+  char *hexa;
+  char *verbosity;
+  int rc, state;
+  int timeout_sec = 30, timeout_usec = 0;
 
-    // Always stat the destination before attempting to rename
-    // a file or a directory...
-    sftpFileAttr attr(remoteEncoding());
-    int code = sftpStat(dest, attr);
+  mSession = ssh_new();
+  if (mSession == NULL) {
+    error(TDEIO::ERR_INTERNAL, i18n("Could not create a new SSH session."));
+    return SSH_ERROR;
+  }
 
-    // If the destination directory, exists tell it to the job
-    // so it the proper action can be presented to the user...
-    if( code == SSH2_FX_OK )
-    {
-      if (!overwrite)
-      {
-        if ( S_ISDIR(attr.permissions()) )
-          error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.url() );
-        else
-          error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.url() );
-        return;
-        }
+  kdDebug(TDEIO_SFTP_DB) << "Creating the SSH session and setting options" << endl;
 
-      // If overwrite is specified, then simply remove the existing file/dir first...
-      if( (code = sftpRemove( dest, !S_ISDIR(attr.permissions()) )) != SSH2_FX_OK )
-      {
-        processStatus(code);
-            return;
-        }
-    }
+  // Set timeout
+  rc = ssh_options_set(mSession, SSH_OPTIONS_TIMEOUT, &timeout_sec);
+  if (rc < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not set a timeout.";
+  }
+  rc = ssh_options_set(mSession, SSH_OPTIONS_TIMEOUT_USEC, &timeout_usec);
+  if (rc < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not set a timeout in usec.";
+  }
 
-    // Do the renaming...
-    if( (code = sftpRename(src, dest)) != SSH2_FX_OK ) {
-        processStatus(code);
-        return;
-    }
+  // Don't use any compression
+  rc = ssh_options_set(mSession, SSH_OPTIONS_COMPRESSION_C_S, "none");
+  if (rc < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not set compression client <- server.";
+  }
 
-    finished();
-    kdDebug(TDEIO_SFTP_DB) << "rename(): END" << endl;
-}
+  rc = ssh_options_set(mSession, SSH_OPTIONS_COMPRESSION_S_C, "none");
+  if (rc < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not set compression server -> client.";
+  }
 
-void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwrite){
-    kdDebug(TDEIO_SFTP_DB) << "symlink()" << endl;
+  // Set host and port
+  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 SSH_ERROR;
+  }
 
-    if (!isSupportedOperation(SSH2_FXP_SYMLINK)) {
-      error(ERR_UNSUPPORTED_ACTION,
-          i18n("The remote host does not support creating symbolic links."));
-      return;
+  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 SSH_ERROR;
     }
+  }
 
-    openConnection();
-    if( !mConnected )
-        return;
-
-    int code;
-    bool failed = false;
-    if( (code = sftpSymLink(target, dest)) != SSH2_FX_OK ) {
-        if( overwrite ) { // try to delete the destination
-            sftpFileAttr attr(remoteEncoding());
-            if( (code = sftpStat(dest, attr)) != SSH2_FX_OK ) {
-                failed = true;
-            }
-            else {
-                if( (code = sftpRemove(dest, !S_ISDIR(attr.permissions())) ) != SSH2_FX_OK ) {
-                    failed = true;
-                }
-                else {
-                    // XXX what if rename fails again? We have lost the file.
-                    // Maybe rename dest to a temporary name first? If rename is
-                    // successful, then delete?
-                    if( (code = sftpSymLink(target, dest)) != SSH2_FX_OK )
-                        failed = true;
-                }
-            }
-        }
-        else if( code == SSH2_FX_FAILURE ) {
-            error(ERR_FILE_ALREADY_EXIST, dest.prettyURL());
-            return;
-        }
-        else
-            failed = true;
+  // Set the username
+  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 rc;
     }
+  }
 
-    // What error code do we return? Code for the original symlink command
-    // or for the last command or for both? The second one is implemented here.
-    if( failed )
-        processStatus(code);
+  verbosity = getenv("TDEIO_SFTP_LOG_VERBOSITY");
+  if (verbosity) {
+    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 rc;
+    }
+  }
 
-    finished();
-}
+  // Read ~/.ssh/config
+  rc = ssh_options_parse_config(mSession, NULL);
+  if (rc < 0) {
+    error(TDEIO::ERR_INTERNAL, i18n("Could not parse the config file."));
+    return rc;
+  }
 
-void sftpProtocol::chmod(const KURL& url, int permissions){
-    TQString perms;
-    perms.setNum(permissions, 8);
-    kdDebug(TDEIO_SFTP_DB) << "chmod(" << url << ", " << perms << ")" << endl;
+  ssh_set_callbacks(mSession, mCallbacks);
 
-    openConnection();
-    if( !mConnected )
-        return;
+  kdDebug(TDEIO_SFTP_DB) << "Trying to connect to the SSH server" << endl;
 
-    sftpFileAttr attr(remoteEncoding());
+  /* try to connect */
+  rc = ssh_connect(mSession);
+  if (rc < 0) {
+    error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+    return rc;
+  }
 
-    if (permissions != -1)
-      attr.setPermissions(permissions);
+  kdDebug(TDEIO_SFTP_DB) << "Getting the SSH server hash" << endl;
 
-    int code;
-    if( (code = sftpSetStat(url, attr)) != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "chmod(): sftpSetStat failed with error " << code << endl;
-        if( code == SSH2_FX_FAILURE )
-            error(ERR_CANNOT_CHMOD, TQString::null);
-        else
-            processStatus(code, url.prettyURL());
-    }
-    finished();
-}
+  /* get the hash */
+  ssh_key serverKey;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+  rc = ssh_get_publickey(mSession, &serverKey);
+#else
+  rc = ssh_get_server_publickey(mSession, &serverKey);
+#endif
+  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)
+  rc = ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_MD5, &hash, &hlen);
+#else
+  rc = ssh_get_publickey_hash(serverKey, SSH_PUBLICKEY_HASH_SHA256, &hash, &hlen);
+#endif
+  if (rc<0) {
+    error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+    return rc;
+  }
 
-void sftpProtocol::del(const KURL &url, bool isfile){
-    kdDebug(TDEIO_SFTP_DB) << "del(" << url << ", " << (isfile?"file":"dir") << ")" << endl;
+  kdDebug(TDEIO_SFTP_DB) << "Checking if the SSH server is known" << endl;
 
-    openConnection();
-    if( !mConnected )
-        return;
+  /* check the server public key hash */
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+  state = ssh_is_server_known(mSession);
+#else
+  state = ssh_session_is_known_server(mSession);
+#endif
+  switch (state) {
+    case TDEIO_SSH_KNOWN_HOSTS_OK:
+      break;
+    case TDEIO_SSH_KNOWN_HOSTS_OTHER:
+      delete hash;
+      error(TDEIO::ERR_CONNECTION_BROKEN, i18n("The host key for this server was "
+            "not found, but another type of key exists.\n"
+            "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))));
+      return SSH_ERROR;
+    case TDEIO_SSH_KNOWN_HOSTS_CHANGED:
+      hexa = ssh_get_hexa(hash, hlen);
+      delete hash;
+      /* TODO print known_hosts file, port? */
+      error(TDEIO::ERR_CONNECTION_BROKEN, i18n("The host key for the server %1 has changed.\n"
+          "This could either mean that DNS SPOOFING is happening or the IP "
+          "address for the host and its host key have changed at the same time.\n"
+          "The fingerprint for the key sent by the remote host is:\n %2\n"
+          "Please contact your system administrator.\n%3").arg(
+          mHost).arg(TQString::fromUtf8(hexa)).arg(TQString::fromUtf8(ssh_get_error(mSession))));
+      delete hexa;
+      return SSH_ERROR;
+    case TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND:
+    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.");
+      msg = i18n("The authenticity of host %1 cannot be established.\n"
+        "The key fingerprint is: %2\n"
+        "Are you sure you want to continue connecting?").arg(mHost).arg(hexa);
+      delete hexa;
+
+      if (KMessageBox::Yes != messageBox(WarningYesNo, msg, caption)) {
+        error(TDEIO::ERR_USER_CANCELED, TQString());
+        return SSH_ERROR;
+      }
 
-    int code;
-    if( (code = sftpRemove(url, isfile)) != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "del(): sftpRemove failed with error code " << code << endl;
-        processStatus(code, url.prettyURL());
+      /* write the known_hosts file */
+      kdDebug(TDEIO_SFTP_DB) << "Adding server to known_hosts file." << endl;
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+      if (ssh_write_knownhost(mSession) != SSH_OK) {
+#else
+      if (ssh_session_update_known_hosts(mSession) != SSH_OK) {
+#endif
+        error(TDEIO::ERR_USER_CANCELED, sshError());
+        return SSH_ERROR;
+      }
+      break;
     }
-    finished();
-}
+    case TDEIO_SSH_KNOWN_HOSTS_ERROR:
+      delete hash;
+      error(TDEIO::ERR_COULD_NOT_CONNECT, sshError());
+      return SSH_ERROR;
+  }
 
-void sftpProtocol::slave_status() {
-    kdDebug(TDEIO_SFTP_DB) << "slave_status(): connected to "
-                         <<  mHost << "? " << mConnected << endl;
+  kdDebug(TDEIO_SFTP_DB) << "Trying to authenticate with the server" << endl;
 
-    slaveStatus ((mConnected ? mHost : TQString::null), mConnected);
+  return SSH_OK;
 }
 
-bool sftpProtocol::getPacket(TQByteArray& msg) {
-    TQByteArray buf(4096);
-
-    // Get the message length...
-    ssize_t len = atomicio(ssh.stdioFd(), buf.data(), 4, true /*read*/);
 
-    if( len == 0 || len == -1 ) {
-        kdDebug(TDEIO_SFTP_DB) << "getPacket(): read of packet length failed, ret = "
-                             << len << ", error =" << strerror(errno) << endl;
-        closeConnection();
-        error( ERR_CONNECTION_BROKEN, mHost);
-        msg.resize(0);
-        return false;
-    }
-
-    uint msgLen;
-    TQDataStream s(buf, IO_ReadOnly);
-    s >> msgLen;
+void sftpProtocol::openConnection() {
 
-    //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Message size = " << msgLen << endl;
+  if (mConnected) {
+    return;
+  }
 
-    msg.resize(0);
+  kdDebug(TDEIO_SFTP_DB) << "username=" << mUsername << ", host=" << mHost << ", port=" << mPort << endl;
 
-    TQBuffer b( msg );
-    b.open( IO_WriteOnly );
+  infoMessage(i18n("Opening SFTP connection to host %1:%2").arg(mHost).arg(mPort));
 
-    while( msgLen ) {
-        len = atomicio(ssh.stdioFd(), buf.data(), kMin((uint)buf.size(), msgLen), true /*read*/);
+  if (mHost.isEmpty()) {
+    kdDebug(TDEIO_SFTP_DB) << "openConnection(): Need hostname..." << endl;
+    error(TDEIO::ERR_UNKNOWN_HOST, i18n("No hostname specified."));
+    return;
+  }
 
-        if( len == 0 || len == -1) {
-            TQString errmsg;
-            if (len == 0)
-              errmsg = i18n("Connection closed");
-            else
-              errmsg = i18n("Could not read SFTP packet");
-            kdDebug(TDEIO_SFTP_DB) << "getPacket(): nothing to read, ret = " <<
-                len << ", error =" << strerror(errno) << endl;
-            closeConnection();
-            error(ERR_CONNECTION_BROKEN, errmsg);
-            b.close();
-            return false;
-        }
+  // Check for cached authentication info if no password is specified...
+  if (mPassword.isEmpty()) {
+    AuthInfo info = authInfo();
 
-        b.writeBlock(buf.data(), len);
+    kdDebug(TDEIO_SFTP_DB) << "checking cache: info.username = " << info.username
+      << ", info.url = " << info.url.prettyURL() << endl;
 
-        //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Read Message size = " << len << endl;
-        //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Copy Message size = " << msg.size() << endl;
+    if (checkCachedAuthentication(info)) {
+      kdDebug() << "using cached" << endl;
+      mCachedUsername = info.username;
+      mPassword = info.password;
 
-        msgLen -= len;
+      purgeString(info.password); //< not really necessary because of Qt's implicit data sharing
     }
+  }
 
-    b.close();
+  mPasswordWasPrompted = false;
+  PasswordPurger pwPurger{mPassword};
 
-    return true;
-}
+  int rc;
+  ExitGuard connectionCloser([this](){ closeConnection(); });
 
-/** Send an sftp packet to stdin of the ssh process. */
-bool sftpProtocol::putPacket(TQByteArray& p){
-//    kdDebug(TDEIO_SFTP_DB) << "putPacket(): size == " << p.size() << endl;
-    int ret;
-    ret = atomicio(ssh.stdioFd(), p.data(), p.size(), false /*write*/);
-    if( ret <= 0 ) {
-        kdDebug(TDEIO_SFTP_DB) << "putPacket(): write failed, ret =" << ret <<
-            ", error = " << strerror(errno) << endl;
-        return false;
+  do { // A loop to restart connection when needed
+    // Start the ssh connection.
+    if (initializeConnection() < 0) {
+      return;
     }
 
-    return true;
-}
-
-/** Used to have the server canonicalize any given path name to an absolute path.
-This is useful for converting path names containing ".." components or relative
-pathnames without a leading slash into absolute paths.
-Returns the canonicalized url. */
-int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpRealPath(" << url << ", newUrl)" << endl;
+    // 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;
+    }
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+    // 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;
+      }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+      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;
+      }
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << TQ_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)SSH2_FXP_REALPATH;
-    s << id;
-    s.writeBytes(path.data(), len);
+      // 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_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;
+        }
+      }
 
-    putPacket(p);
-    getPacket(p);
+      // 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);
 
-    TQ_UINT8 type;
-    TQDataStream r(p, IO_ReadOnly);
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRealPath: sftp packet id mismatch" << endl;
-        return -1;
-    }
+  // start sftp session
+  kdDebug(TDEIO_SFTP_DB) << "Trying to request the sftp session" << endl;
+  mSftp = sftp_new(mSession);
+  if (mSftp == NULL) {
+    error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Unable to request the SFTP subsystem. "
+          "Make sure SFTP is enabled on the server."));
+    return;
+  }
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 code;
-        r >> code;
-        return code;
-    }
+  kdDebug(TDEIO_SFTP_DB) << "Trying to initialize the sftp session" << endl;
+  if (sftp_init(mSftp) < 0) {
+    error(TDEIO::ERR_COULD_NOT_LOGIN, i18n("Could not initialize the SFTP session."));
+    return;
+  }
 
-    if( type != SSH2_FXP_NAME ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRealPath(): unexpected packet type of " << type << endl;
-        return -1;
-    }
+  // Login succeeded!
+  infoMessage(i18n("Successfully connected to %1").arg(mHost));
 
-    TQ_UINT32 count;
-    r >> count;
-    if( count != 1 ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl;
-        return -1;
-    }
+  //setTimeoutSpecialCommand(TDEIO_SFTP_SPECIAL_TIMEOUT);
 
-    TQCString newPath;
-    r >> newPath;
+  mConnected = true;
+  connectionCloser.abort();
 
-    newPath.truncate(newPath.size());
-    if (newPath.isEmpty())
-      newPath = "/";
-    newUrl.setPath(newPath);
+  connected();
 
-    return SSH2_FX_OK;
+  return;
 }
 
-sftpProtocol::Status sftpProtocol::doProcessStatus(TQ_UINT8 code, const TQString& message)
-{
-    Status res;
-    res.code = 0;
-    res.size = 0;
-    res.text = message;
+void sftpProtocol::closeConnection() {
+  kdDebug(TDEIO_SFTP_DB) << "closeConnection()" << endl;
 
-    switch(code)
-    {
-      case SSH2_FX_OK:
-      case SSH2_FX_EOF:
-          break;
-      case SSH2_FX_NO_SUCH_FILE:
-          res.code = ERR_DOES_NOT_EXIST;
-          break;
-      case SSH2_FX_PERMISSION_DENIED:
-          res.code = ERR_ACCESS_DENIED;
-          break;
-      case SSH2_FX_FAILURE:
-          res.text = i18n("SFTP command failed for an unknown reason.");
-          res.code = ERR_UNKNOWN;
-          break;
-      case SSH2_FX_BAD_MESSAGE:
-          res.text = i18n("The SFTP server received a bad message.");
-          res.code = ERR_UNKNOWN;
-          break;
-      case SSH2_FX_OP_UNSUPPORTED:
-          res.text = i18n("You attempted an operation unsupported by the SFTP server.");
-          res.code = ERR_UNKNOWN;
-          break;
-      default:
-          res.text = i18n("Error code: %1").arg(code);
-          res.code = ERR_UNKNOWN;
-    }
+  sftp_free(mSftp);
+  mSftp = NULL;
 
-    return res;
-}
+  ssh_disconnect(mSession);
+  mSession = NULL;
 
-/** Process SSH_FXP_STATUS packets. */
-void sftpProtocol::processStatus(TQ_UINT8 code, const TQString& message){
-    Status st = doProcessStatus( code, message );
-    if( st.code != 0 )
-        error( st.code, st.text );
+  mConnected = false;
 }
 
-/** Opens a directory handle for url.path. Returns true if succeeds. */
-int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpOpenDirectory(" << url << ", handle)" << endl;
-
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+#if 0
+void sftpProtocol::special(const TQByteArray &data) {
+    int rc;
+    kdDebug(TDEIO_SFTP_DB) << "special(): polling";
+
+    /*
+     * channel_poll() returns the number of bytes that may be read on the
+     * channel. It does so by checking the input buffer and eventually the
+     * network socket for data to read. If the input buffer is not empty, it
+     * will not probe the network (and such not read packets nor reply to
+     * keepalives).
+     *
+     * As channel_poll can act on two specific buffers (a channel has two
+     * different stream: stdio and stderr), polling for data on the stderr
+     * stream has more chance of not being in the problematic case (data left
+     * in the buffer). Checking the return value (for >0) would be a good idea
+     * to debug the problem.
+     */
+    rc = channel_poll(mSftp->channel, 0);
+    if (rc > 0) {
+        rc = channel_poll(mSftp->channel, 1);
+    }
+
+    if (rc < 0) {
+        kdDebug(TDEIO_SFTP_DB) << "channel_poll failed: " << ssh_get_error(mSession) << endl;
+    }
+
+    setTimeoutSpecialCommand(TDEIO_SFTP_SPECIAL_TIMEOUT);
+}
+#endif
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+void sftpProtocol::statMime(const KURL &url) {
+  kdDebug(TDEIO_SFTP_DB) << "stat: " << url.url() << endl;
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)SSH2_FXP_OPENDIR;
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
+  openConnection();
+  if (!mConnected) {
+    error(TDEIO::ERR_CONNECTION_BROKEN, url.prettyURL());
+    return;
+  }
 
-    putPacket(p);
-    getPacket(p);
+  const TQString path = url.path();
+  const TQByteArray path_c = path.utf8();
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  sftp_attributes sb = sftp_lstat(mSftp, path_c.data());
+  if (sb == NULL) {
+    reportError(url, sftp_get_error(mSftp));
+    return;
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: sftp packet id mismatch: " <<
-            "expected " << expectedId << ", got " << id << endl;
-        return -1;
-    }
+  switch (sb->type) {
+    case SSH_FILEXFER_TYPE_DIRECTORY:
+      sftp_attributes_free(sb);
+      emit mimeType("inode/directory");
+      return;
+    case SSH_FILEXFER_TYPE_SPECIAL:
+    case SSH_FILEXFER_TYPE_UNKNOWN:
+      error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+      sftp_attributes_free(sb);
+      return;
+    case SSH_FILEXFER_TYPE_SYMLINK:
+    case SSH_FILEXFER_TYPE_REGULAR:
+      break;
+  }
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 errCode;
-        r >> errCode;
-        return errCode;
-    }
+  size_t fileSize = sb->size;
+  sftp_attributes_free(sb);
 
-    if( type != SSH2_FXP_HANDLE ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: unexpected message type of " << type << endl;
-        return -1;
-    }
+  int flags = 0;
 
-    r >> handle;
-    if( handle.size() > 256 ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: handle exceeds max length" << endl;
-        return -1;
-    }
+  flags = O_RDONLY;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpOpenDirectory: handle (" << handle.size() << "): [" << handle << "]" << endl;
-    return SSH2_FX_OK;
-}
+  mOpenFile = sftp_open(mSftp, path_c.data(), flags, 0);
 
-/** Closes a directory or file handle. */
-int sftpProtocol::sftpClose(const TQByteArray& handle){
+  if (mOpenFile == NULL) {
+    error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, path);
+    return;
+  }
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpClose()" << endl;
+  // Determine the mimetype of the file to be retrieved, and emit it.
+  // This is mandatory in all slaves (for KRun/BrowserRun to work).
+  // If we're not opening the file ReadOnly or ReadWrite, don't attempt to
+  // read the file and send the mimetype.
+  size_t bytesRequested = 1024;
+  ssize_t bytesRead = 0;
+  TQByteArray buffer(bytesRequested);
+
+  bytesRead = sftp_read(mOpenFile, buffer.data(), bytesRequested);
+  if (bytesRead < 0) {
+      error(TDEIO::ERR_COULD_NOT_READ, mOpenUrl.prettyURL());
+      closeFile();
+      return;
+  } else {
+      TQByteArray fileData;
+      fileData.setRawData(buffer.data(), bytesRead);
+      KMimeMagicResult *p_mimeType = KMimeMagic::self()->findBufferFileType(fileData, mOpenUrl.fileName());
+      emit mimeType(p_mimeType->mimeType());
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  sftp_close(mOpenFile);
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size());
-    s << (TQ_UINT8)SSH2_FXP_CLOSE;
-    s << (TQ_UINT32)id;
-    s << handle;
+  mOpenFile = NULL;
+}
 
-    putPacket(p);
-    getPacket(p);
+#if 0
+void sftpProtocol::read(TDEIO::filesize_t bytes) {
+  kdDebug(TDEIO_SFTP_DB) << "read, offset = " << openOffset << ", bytes = " << bytes;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  Q_ASSERT(mOpenFile != NULL);
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpClose: sftp packet id mismatch" << endl;
-        return -1;
-    }
+  TQVarLengthArray<char> buffer(bytes);
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpClose: unexpected message type of " << type << endl;
-        return -1;
-    }
+  ssize_t bytesRead = sftp_read(mOpenFile, buffer.data(), bytes);
+  Q_ASSERT(bytesRead <= static_cast<ssize_t>(bytes));
 
-    TQ_UINT32 code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl;
-    }
+  if (bytesRead < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not read " << mOpenUrl;
+    error(TDEIO::ERR_COULD_NOT_READ, mOpenUrl.prettyURL());
+    close();
+    return;
+  }
 
-    return code;
+  TQByteArray fileData = TQByteArray::fromRawData(buffer.data(), bytesRead);
+  data(fileData);
 }
 
-/** Set a files attributes. */
-int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){
+void sftpProtocol::write(const TQByteArray &data) {
+  kdDebug(TDEIO_SFTP_DB) << "write, offset = " << openOffset << ", bytes = " << data.size();
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpSetStat(" << url << ", attr)" << endl;
+  Q_ASSERT(mOpenFile != NULL);
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
-
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  ssize_t bytesWritten = sftp_write(mOpenFile, data.data(), data.size());
+  if (bytesWritten < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Could not write to " << mOpenUrl;
+    error(TDEIO::ERR_COULD_NOT_WRITE, mOpenUrl.prettyURL());
+    close();
+    return;
+  }
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size());
-    s << (TQ_UINT8)SSH2_FXP_SETSTAT;
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
-    s << attr;
+  written(bytesWritten);
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::seek(TDEIO::filesize_t offset) {
+  kdDebug(TDEIO_SFTP_DB) << "seek, offset = " << offset;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  Q_ASSERT(mOpenFile != NULL);
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSetStat(): sftp packet id mismatch" << endl;
-        return -1;
-        // XXX How do we do a fatal error?
-    }
+  if (sftp_seek64(mOpenFile, static_cast<uint64_t>(offset)) < 0) {
+    error(TDEIO::ERR_COULD_NOT_SEEK, mOpenUrl.path());
+    close();
+  }
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSetStat(): unexpected message type of " << type << endl;
-        return -1;
-    }
+  position(sftp_tell64(mOpenFile));
+}
+#endif
 
-    TQ_UINT32 code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl;
-    }
+void sftpProtocol::closeFile() {
+  if (mOpenFile) {
+    sftp_close(mOpenFile);
 
-    return code;
+    mOpenFile = NULL;
+    finished();
+  }
 }
 
-/** Sends a sftp command to remove a file or directory. */
-int sftpProtocol::sftpRemove(const KURL& url, bool isfile){
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpRemove(): " << url << ", isFile ? " << isfile << endl;
+void sftpProtocol::get(const KURL& url) {
+  kdDebug(TDEIO_SFTP_DB) << "get(): " << url.url() << endl;
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  TQByteArray path = url.path().utf8();
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)(isfile ? SSH2_FXP_REMOVE : SSH2_FXP_RMDIR);
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
+  char buf[MAX_XFER_BUF_SIZE] = {0};
+  sftp_file file = NULL;
+  ssize_t bytesread = 0;
+  // time_t curtime = 0;
+  time_t lasttime = 0;
+  time_t starttime = 0;
+  ssize_t totalbytesread  = 0;
 
-    putPacket(p);
-    getPacket(p);
+  sftp_attributes sb = sftp_lstat(mSftp, path.data());
+  if (sb == NULL) {
+    reportError(url, sftp_get_error(mSftp));
+    return;
+  }
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  switch (sb->type) {
+    case SSH_FILEXFER_TYPE_DIRECTORY:
+      error(TDEIO::ERR_IS_DIRECTORY, url.prettyURL());
+      sftp_attributes_free(sb);
+      return;
+    case SSH_FILEXFER_TYPE_SPECIAL:
+    case SSH_FILEXFER_TYPE_UNKNOWN:
+    error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+      sftp_attributes_free(sb);
+      return;
+    case SSH_FILEXFER_TYPE_SYMLINK:
+    case SSH_FILEXFER_TYPE_REGULAR:
+      break;
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "del(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+  // Open file
+  file = sftp_open(mSftp, path.data(), O_RDONLY, 0);
+  if (file == NULL) {
+    error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL());
+    sftp_attributes_free(sb);
+    return;
+  }
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "del(): unexpected message type of " << type << endl;
-        return -1;
+  // Determine the mimetype of the file to be retrieved, and emit it.
+  // This is mandatory in all slaves (for KRun/BrowserRun to work)
+  // In real "remote" slaves, this is usually done using findByNameAndContent
+  // after receiving some data. But we don't know how much data the mimemagic rules
+  // need, so for local files, better use findByUrl with localUrl=true.
+  KMimeType::Ptr mt = KMimeType::findByURL( url, sb->permissions, false /* remote URL */ );
+  emit mimeType( mt->name() ); // FIXME test me
+
+  kdDebug(TDEIO_SFTP_DB) << "Total size: " << TQString::number(sb->size) << endl;
+  // Set the total size
+  totalSize(sb->size);
+
+  const TQString resumeOffset = metaData(TQString("resume"));
+  if (!resumeOffset.isEmpty()) {
+    bool ok;
+    ssize_t offset = resumeOffset.toLong(&ok);
+    if (ok && (offset > 0) && ((unsigned long long) offset < sb->size))
+    {
+      if (sftp_seek64(file, offset) == 0) {
+        canResume();
+        totalbytesread = offset;
+        kdDebug(TDEIO_SFTP_DB) << "Resume offset: " << TQString::number(offset) << endl;
+      }
     }
+  }
 
-    TQ_UINT32 code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "del(): del failed with err code " << code << endl;
-    }
+  if (file != NULL) {
+    bool isFirstPacket = true;
+    lasttime = starttime = time(NULL);
+
+    for (;;) {
+      bytesread = sftp_read(file, buf, MAX_XFER_BUF_SIZE);
+      kdDebug(TDEIO_SFTP_DB) << "bytesread=" << TQString::number(bytesread) << endl;
+      if (bytesread == 0) {
+        // All done reading
+        break;
+      } else if (bytesread < 0) {
+        kdDebug(TDEIO_SFTP_DB) << "Failed to read";
+        error(TDEIO::ERR_COULD_NOT_READ, url.prettyURL());
+        sftp_attributes_free(sb);
+        return;
+      }
 
-    return code;
-}
+      TQByteArray  filedata;
+      filedata.setRawData(buf, bytesread);
+      if (isFirstPacket) {
+        KMimeMagicResult *p_mimeType = KMimeMagic::self()->findBufferFileType(filedata, mOpenUrl.fileName());
+        mimeType(p_mimeType->mimeType());
+        kdDebug(TDEIO_SFTP_DB) << "mimetype=" << p_mimeType->mimeType() << endl;
+        isFirstPacket = false;
+      }
+      data(filedata);
+      filedata.resetRawData(buf, bytesread);
 
-/** Send a sftp command to rename a file or directoy. */
-int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){
+      // increment total bytes read
+      totalbytesread += bytesread;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpRename(" << src << " -> " << dest << ")" << endl;
+      processedSize(totalbytesread);
+    }
 
-    TQCString srcPath = remoteEncoding()->encode(src.path());
-    TQCString destPath = remoteEncoding()->encode(dest.path());
+    kdDebug(TDEIO_SFTP_DB) << "size processed=" << totalbytesread << endl;
+    sftp_close(file);
+    //data(TQByteArray());
+    processedSize((sb->size));
+  }
 
-    uint slen = srcPath.length();
-    uint dlen = destPath.length();
+  sftp_attributes_free(sb);
+  finished();
+}
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+void sftpProtocol::put(const KURL& url, int permissions, bool overwrite, bool resume) {
+  kdDebug(TDEIO_SFTP_DB) << "put(): " << url.url()
+                      << " , permissions = " << TQString::number(permissions)
+                      << ", overwrite = " << overwrite
+                      << ", resume = " << resume << endl;
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + slen +
-                    4 /*str length*/ + dlen);
-    s << (TQ_UINT8)SSH2_FXP_RENAME;
-    s << (TQ_UINT32)id;
-    s.writeBytes(srcPath.data(), slen);
-    s.writeBytes(destPath.data(), dlen);
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    putPacket(p);
-    getPacket(p);
+  const TQString dest_orig = url.path();
+  const TQByteArray dest_orig_c = dest_orig.utf8();
+  const TQString dest_part = dest_orig + ".part";
+  const TQByteArray dest_part_c = dest_part.utf8();
+  uid_t owner = 0;
+  gid_t group = 0;
+
+  sftp_attributes sb = sftp_lstat(mSftp, dest_orig_c.data());
+  const bool bOrigExists = (sb != NULL);
+  bool bPartExists = false;
+  const bool bMarkPartial = config()->readEntry("MarkPartial", "true") == "true";
+
+  // Don't change permissions of the original file
+  if (bOrigExists) {
+      permissions = sb->permissions;
+      owner = sb->uid;
+      group = sb->gid;
+  }
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  if (bMarkPartial) {
+    sftp_attributes sbPart = sftp_lstat(mSftp, dest_part_c.data());
+    bPartExists = (sbPart != NULL);
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRename(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+    if (bPartExists && !resume && !overwrite &&
+        sbPart->size > 0 && sbPart->type == SSH_FILEXFER_TYPE_REGULAR) {
+      kdDebug(TDEIO_SFTP_DB) << "put : calling canResume with "
+        << TQString::number(sbPart->size) << endl;
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRename(): unexpected message type of " << type << endl;
-        return -1;
-    }
+      // Maybe we can use this partial file for resuming
+      // Tell about the size we have, and the app will tell us
+      // if it's ok to resume or not.
+      if (canResume(sbPart->size)) {
+          resume = true;
+      }
 
-    int code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRename(): rename failed with err code " << code << endl;
-    }
+      kdDebug(TDEIO_SFTP_DB) << "put got answer " << resume << endl;
 
-    return code;
-}
-/** Get directory listings. */
-int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){
-    // url is needed so we can lookup the link destination
-    kdDebug(TDEIO_SFTP_DB) << "sftpReadDir(): " << url << endl;
-
-    TQ_UINT32 id, expectedId, count;
-    TQ_UINT8 type;
-
-    sftpFileAttr attr (remoteEncoding());
-    attr.setDirAttrsFlag(true);
-
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    id = expectedId = mMsgId++;
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size());
-    s << (TQ_UINT8)SSH2_FXP_READDIR;
-    s << (TQ_UINT32)id;
-    s << handle;
-
-    putPacket(p);
-    getPacket(p);
-
-    TQDataStream r(p, IO_ReadOnly);
-    r >> type >> id;
-
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpReadDir(): sftp packet id mismatch" << endl;
-        return -1;
+      delete sbPart;
     }
+  }
 
-    int code;
-    if( type == SSH2_FXP_STATUS ) {
-        r >> code;
-        return code;
+  if (bOrigExists && !(overwrite) && !(resume)) {
+    if (sb->type == SSH_FILEXFER_TYPE_DIRECTORY) {
+      error(TDEIO::ERR_DIR_ALREADY_EXIST, dest_orig);
+    } else {
+      error(TDEIO::ERR_FILE_ALREADY_EXIST, dest_orig);
     }
+    sftp_attributes_free(sb);
+    return;
+  }
 
-    if( type != SSH2_FXP_NAME ) {
-        kdError(TDEIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl;
-        return -1;
+  int result;
+  TQByteArray dest;
+  sftp_file file = NULL;
+
+  // Loop until we got 0 (end of data)
+  do {
+    TQByteArray buffer;
+    dataReq(); // Request for data
+    result = readData(buffer);
+
+    if (result >= 0 && buffer.size()) {
+      kdDebug(TDEIO_SFTP_DB) << TQString("Got %1 bytes of data").arg(buffer.size()) << endl;
+      if (dest.isEmpty()) {
+        if (bMarkPartial) {
+          kdDebug(TDEIO_SFTP_DB) << "Appending .part extension to " << dest_orig << endl;
+          dest = dest_part_c;
+          if (bPartExists && !(resume)) {
+            kdDebug(TDEIO_SFTP_DB) << "Deleting partial file " << dest_part << endl;
+            sftp_unlink(mSftp, dest_part_c.data());
+            // Catch errors when we try to open the file.
+          }
+        } else {
+          dest = dest_orig_c;
+          if (bOrigExists && !(resume)) {
+            kdDebug(TDEIO_SFTP_DB) << "Deleting destination file " << dest_orig << endl;
+            sftp_unlink(mSftp, dest_orig_c.data());
+            // Catch errors when we try to open the file.
+          }
+        } // bMarkPartial
+
+        if ((resume)) {
+          sftp_attributes fstat;
+
+          kdDebug(TDEIO_SFTP_DB) << "Trying to append: " << dest.data() << endl;
+          file = sftp_open(mSftp, dest.data(), O_RDWR, 0);  // append if resuming
+          if (file) {
+             fstat = sftp_fstat(file);
+             if (fstat) {
+                sftp_seek64(file, fstat->size); // Seek to end TODO
+                sftp_attributes_free(fstat);
+             }
+          }
+        } else {
+          mode_t initialMode;
+
+          if (permissions != -1) {
+            initialMode = permissions | S_IWUSR | S_IRUSR;
+          } else {
+            initialMode = 0644;
+          }
+
+          kdDebug(TDEIO_SFTP_DB) << "Trying to open: " << dest.data() << ", mode=" << TQString::number(initialMode) << endl;
+          file = sftp_open(mSftp, dest.data(), O_CREAT | O_TRUNC | O_WRONLY, initialMode);
+        } // resume
+
+        if (file == NULL) {
+          kdDebug(TDEIO_SFTP_DB) << "COULD NOT WRITE " << dest.data()
+                              << " permissions=" << permissions
+                              << " error=" << ssh_get_error(mSession) << endl;
+          if (sftp_get_error(mSftp) == SSH_FX_PERMISSION_DENIED) {
+            error(TDEIO::ERR_WRITE_ACCESS_DENIED, TQString::fromUtf8(dest));
+          } else {
+            error(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, TQString::fromUtf8(dest));
+          }
+          sftp_attributes_free(sb);
+          finished();
+          return;
+        } // file
+      } // dest.isEmpty
+
+      ssize_t bytesWritten = sftp_write(file, buffer.data(), buffer.size());
+      kdDebug(TDEIO_SFTP_DB) << TQString("Written %1 bytes").arg(bytesWritten) << endl;
+      if (bytesWritten < 0) {
+        error(TDEIO::ERR_COULD_NOT_WRITE, dest_orig);
+        result = -1;
+      }
+    } // result
+  } while (result > 0);
+  sftp_attributes_free(sb);
+
+  // An error occurred deal with it.
+  if (result < 0) {
+    kdDebug(TDEIO_SFTP_DB) << "Error during 'put'. Aborting." << endl;
+
+    if (file != NULL) {
+      sftp_close(file);
+
+      sftp_attributes attr = sftp_stat(mSftp, dest.data());
+      if (bMarkPartial && attr != NULL) {
+        size_t size = config()->readLongNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE);
+        if (attr->size < size) {
+          sftp_unlink(mSftp, dest.data());
+        }
+      }
+      delete attr;
+      sftp_attributes_free(attr);
     }
 
-    r >> count;
-    kdDebug(TDEIO_SFTP_DB) << "sftpReadDir(): got " << count << " entries" << endl;
+    //::exit(255);
+    finished();
+    return;
+  }
 
-    while(count--) {
-        r >> attr;
+  if (file == NULL) { // we got nothing to write out, so we never opened the file
+    finished();
+    return;
+  }
 
-        if( S_ISLNK(attr.permissions()) ) {
-             KURL myurl ( url );
-             myurl.addPath(attr.filename());
+  if (sftp_close(file) < 0) {
+    kdWarning(TDEIO_SFTP_DB) << "Error when closing file descriptor" << endl;
+    error(TDEIO::ERR_COULD_NOT_WRITE, dest_orig);
+    return;
+  }
 
-             // Stat the symlink to find out its type...
-             sftpFileAttr attr2 (remoteEncoding());
-             (void) sftpStat(myurl, attr2);
+  // after full download rename the file back to original name
+  if (bMarkPartial) {
+    // If the original URL is a symlink and we were asked to overwrite it,
+    // remove the symlink first. This ensures that we do not overwrite the
+    // current source if the symlink points to it.
+    if ((overwrite)) {
+      sftp_unlink(mSftp, dest_orig_c.data());
+    }
 
-             attr.setLinkType(attr2.linkType());
-             attr.setLinkDestination(attr2.linkDestination());
-        }
+    if (sftp_rename(mSftp, dest.data(), dest_orig_c.data()) < 0) {
+      kdWarning(TDEIO_SFTP_DB) << " Couldn't rename " << dest.data() << " to " << dest_orig << endl;
+      error(TDEIO::ERR_CANNOT_RENAME_PARTIAL, dest_orig);
+      return;
+    }
+  }
 
-        listEntry(attr.entry(), false);
+  // set final permissions
+  if (permissions != -1 && !(resume)) {
+    kdDebug(TDEIO_SFTP_DB) << "Trying to set final permissions of " << dest_orig << " to " << TQString::number(permissions) << endl;
+    if (sftp_chmod(mSftp, dest_orig_c.data(), permissions) < 0) {
+      warning(i18n( "Could not change permissions for\n%1").arg(dest_orig));
     }
+  }
 
-    listEntry(attr.entry(), true);
+  // set original owner and group
+  if (bOrigExists) {
+      kdDebug(TDEIO_SFTP_DB) << "Trying to restore original owner and group of " << dest_orig << endl;
+      if (sftp_chown(mSftp, dest_orig_c.data(), owner, group) < 0) {
+          // warning(i18n( "Could not change owner and group for\n%1", dest_orig));
+      }
+  }
 
-    return SSH2_FX_OK;
+  // set modification time
+#if 0
+  const TQString mtimeStr = metaData("modified");
+  if (!mtimeStr.isEmpty()) {
+    TQDateTime dt = TQDateTime::fromString(mtimeStr, TQt::ISODate);
+    if (dt.isValid()) {
+      struct timeval times[2];
+
+      sftp_attributes attr = sftp_lstat(mSftp, dest_orig_c.data());
+      if (attr != NULL) {
+        times[0].tv_sec = attr->atime; //// access time, unchanged
+        times[1].tv_sec =  dt.toTime_t(); // modification time
+        times[0].tv_usec = times[1].tv_usec = 0;
+
+        sftp_utimes(mSftp, dest_orig_c.data(), times);
+        sftp_attributes_free(attr);
+      }
+    }
+  }
+#endif
+  // We have done our job => finish
+  finished();
 }
 
-int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){
-
-    kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): " << url << endl;
-
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
-
-    //kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl;
-    //kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len << endl;
-
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool overwrite)
+{
+  kdDebug(TDEIO_SFTP_DB) << src.url() << " -> " << dest.url() << " , permissions = " << TQString::number(permissions)
+                                      << ", overwrite = " << overwrite << endl;
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)SSH2_FXP_READLINK;
-    s << id;
-    s.writeBytes(path.data(), len);
+  error(TDEIO::ERR_UNSUPPORTED_ACTION, TQString());
+}
 
+void sftpProtocol::stat(const KURL& url) {
+  kdDebug(TDEIO_SFTP_DB) << url.url() << endl;
 
-    putPacket(p);
-    getPacket(p);
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQ_UINT8 type;
-    TQDataStream r(p, IO_ReadOnly);
+  if (! url.hasPath() || TQDir::isRelativePath(url.path()) ||
+      url.path().contains("/./") || url.path().contains("/../")) {
+    TQString cPath;
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpReadLink(): sftp packet id mismatch" << endl;
-        return -1;
+    if (url.hasPath()) {
+      cPath = canonicalizePath(url.path());
+    } else {
+      cPath = canonicalizePath(TQString("."));
     }
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 code;
-        r >> code;
-        kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code << endl;
-        return code;
+    if (cPath.isEmpty()) {
+      error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
+      return;
     }
+    KURL redir(url);
+    redir.setPath(cPath);
+    redirection(redir);
 
-    if( type != SSH2_FXP_NAME ) {
-        kdError(TDEIO_SFTP_DB) << "sftpReadLink(): unexpected packet type of " << type << endl;
-        return -1;
-    }
+    kdDebug(TDEIO_SFTP_DB) << "redirecting to " << redir.url() << endl;
 
-    TQ_UINT32 count;
-    r >> count;
-    if( count != 1 ) {
-        kdError(TDEIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl;
-        return -1;
-    }
+    finished();
+    return;
+  }
 
-    TQCString linkAddress;
-    r >> linkAddress;
+  TQByteArray path = url.path().utf8();
 
-    linkAddress.truncate(linkAddress.size());
-    kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Link address: " << linkAddress << endl;
+  const TQString sDetails = metaData(TQString("details"));
+  const int details = sDetails.isEmpty() ? 2 : sDetails.toInt();
 
-    target = remoteEncoding()->decode(linkAddress);
+  UDSEntry entry;
+  entry.clear();
+  if (!createUDSEntry(url.fileName(), path, entry, details)) {
+    error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL());
+    return;
+  }
 
-    return SSH2_FX_OK;
-}
+  statEntry(entry);
 
-int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){
+  finished();
+}
 
-    TQCString destPath = remoteEncoding()->encode(dest.path());
-    TQCString target = remoteEncoding()->encode(_target);
-    uint dlen = destPath.length();
-    uint tlen = target.length();
+void sftpProtocol::mimetype(const KURL& url){
+  kdDebug(TDEIO_SFTP_DB) << url.url() << endl;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")" << endl;
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  // stat() feeds the mimetype
+  statMime(url);
+  closeFile();
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + tlen +
-                    4 /*str length*/ + dlen);
-    s << (TQ_UINT8)SSH2_FXP_SYMLINK;
-    s << (TQ_UINT32)id;
-    s.writeBytes(target.data(), tlen);
-    s.writeBytes(destPath.data(), dlen);
+  finished();
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::listDir(const KURL& url) {
+  kdDebug(TDEIO_SFTP_DB) << "list directory: " << url.url() << endl;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSymLink(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+  if (! url.hasPath() || TQDir::isRelativePath(url.path()) ||
+      url.path().contains("/./") || url.path().contains("/../")) {
+    TQString cPath;
 
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSymLink(): unexpected message type of " << type << endl;
-        return -1;
+    if (url.hasPath()) {
+      cPath = canonicalizePath(url.path());
+    } else {
+      cPath = canonicalizePath(TQString("."));
     }
 
-    TQ_UINT32 code;
-    r >> code;
-    if( code != SSH2_FX_OK ) {
-        kdError(TDEIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl;
+    if (cPath.isEmpty()) {
+      error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
+      return;
     }
+    KURL redir(url);
+    redir.setPath(cPath);
+    redirection(redir);
 
-    return code;
-}
-
-/** Stats a file. */
-int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) {
+    kdDebug(TDEIO_SFTP_DB) << "redirecting to " << redir.url() << endl;
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpStat(): " << url << endl;
-
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+    finished();
+    return;
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  TQByteArray path = url.path().utf8();
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len);
-    s << (TQ_UINT8)SSH2_FXP_LSTAT;
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
+  sftp_dir dp = sftp_opendir(mSftp, path.data());
+  if (dp == NULL) {
+    reportError(url, sftp_get_error(mSftp));
+    return;
+  }
 
-    putPacket(p);
-    getPacket(p);
+  sftp_attributes dirent = NULL;
+  const TQString sDetails = metaData(TQString("details"));
+  const int details = sDetails.isEmpty() ? 2 : sDetails.toInt();
+  TQValueList<TQByteArray> entryNames;
+  UDSEntry entry;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  kdDebug(TDEIO_SFTP_DB) << "readdir: " << path.data() << ", details: " << TQString::number(details) << endl;
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpStat(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+  UDSAtom atom;
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 errCode;
-        r >> errCode;
-        kdError(TDEIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl;
-        return errCode;
-    }
+  for (;;) {
+    mode_t access;
+    mode_t type;
+    char *link;
 
-    if( type != SSH2_FXP_ATTRS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpStat(): unexpected message type of " << type << endl;
-        return -1;
+    dirent = sftp_readdir(mSftp, dp);
+    if (dirent == NULL) {
+      break;
     }
 
-    r >> attr;
-    attr.setFilename(url.fileName());
-    kdDebug(TDEIO_SFTP_DB) << "sftpStat(): " << attr << endl;
+    entry.clear();
+    atom.m_uds = UDS_NAME;
+    atom.m_str = TQFile::decodeName(dirent->name);
+    entry.append(atom);
 
-    // If the stat'ed resource is a symlink, perform a recursive stat
-    // to determine the actual destination's type (file/dir).
-    if( S_ISLNK(attr.permissions()) && isSupportedOperation(SSH2_FXP_READLINK) ) {
+    if (dirent->type == SSH_FILEXFER_TYPE_SYMLINK) {
+      TQCString file = (TQString::fromUtf8(path) + "/" + TQFile::decodeName(dirent->name)).utf8().data();
 
-        TQString target;
-        int code = sftpReadLink( url, target );
+      atom.m_uds = UDS_FILE_TYPE;
+      atom.m_long = S_IFREG;
+      entry.append(atom);
 
-        if ( code != SSH2_FX_OK ) {
-            kdError(TDEIO_SFTP_DB) << "sftpStat(): Unable to stat symlink destination" << endl;
-            return -1;
+      link = sftp_readlink(mSftp, file.data());
+      if (link == NULL) {
+        sftp_attributes_free(dirent);
+        error(TDEIO::ERR_INTERNAL, i18n("Could not read link: %1").arg(TQString::fromUtf8(file)));
+        return;
+      }
+      atom.m_uds = UDS_LINK_DEST;
+      atom.m_str = TQFile::decodeName(link);
+      entry.append(atom);
+      delete link;
+      // A symlink -> follow it only if details > 1
+      if (details > 1) {
+        sftp_attributes sb = sftp_stat(mSftp, file.data());
+        if (sb == NULL) {
+          // It is a link pointing to nowhere
+          type = S_IFMT - 1;
+          access = S_IRWXU | S_IRWXG | S_IRWXO;
+          atom.m_uds = UDS_FILE_TYPE;
+          atom.m_long = type;
+          entry.append(atom);
+          atom.m_uds = UDS_ACCESS;
+          atom.m_long = access;
+          entry.append(atom);
+          atom.m_uds = UDS_SIZE;
+          atom.m_long = 0;
+          entry.append(atom);
+
+          goto notype;
         }
+        sftp_attributes_free(dirent);
+        dirent = sb;
+      }
+    }
 
-        kdDebug(TDEIO_SFTP_DB) << "sftpStat(): Resource is a symlink to -> " << target << endl;
+    switch (dirent->type) {
+      case SSH_FILEXFER_TYPE_REGULAR:
+        atom.m_uds = UDS_FILE_TYPE;
+        atom.m_long = S_IFREG;
+        entry.append(atom);
+        break;
+      case SSH_FILEXFER_TYPE_DIRECTORY:
+        atom.m_uds = UDS_FILE_TYPE;
+        atom.m_long = S_IFDIR;
+        entry.append(atom);
+        break;
+      case SSH_FILEXFER_TYPE_SYMLINK:
+        atom.m_uds = UDS_FILE_TYPE;
+        atom.m_long = S_IFLNK;
+        entry.append(atom);
+        break;
+      case SSH_FILEXFER_TYPE_SPECIAL:
+      case SSH_FILEXFER_TYPE_UNKNOWN:
+        break;
+    }
+
+    access = dirent->permissions & 07777;
+    atom.m_uds = UDS_ACCESS;
+    atom.m_long = access;
+    entry.append(atom);
+
+    atom.m_uds = UDS_SIZE;
+    atom.m_long = dirent->size;
+    entry.append(atom);
+
+notype:
+    if (details > 0) {
+      atom.m_uds = UDS_USER;
+      if (dirent->owner) {
+          atom.m_str = TQString::fromUtf8(dirent->owner);
+      } else {
+          atom.m_str = TQString::number(dirent->uid);
+      }
+      entry.append(atom);
 
-        KURL dest( url );
-        if( target[0] == '/' )
-            dest.setPath(target);
-        else
-            dest.setFileName(target);
+      atom.m_uds = UDS_GROUP;
+      if (dirent->group) {
+          atom.m_str = TQString::fromUtf8(dirent->group);
+      } else {
+          atom.m_str = TQString::number(dirent->gid);
+      }
+      entry.append(atom);
 
-        dest.cleanPath();
+      atom.m_uds = UDS_ACCESS_TIME;
+      atom.m_long = dirent->atime;
+      entry.append(atom);
 
-        // Ignore symlinks that point to themselves...
-        if ( dest != url ) {
+      atom.m_uds = UDS_MODIFICATION_TIME;
+      atom.m_long = dirent->mtime;
+      entry.append(atom);
 
-            sftpFileAttr attr2 (remoteEncoding());
-            (void) sftpStat(dest, attr2);
+      atom.m_uds = UDS_MODIFICATION_TIME;
+      atom.m_long = dirent->createtime;
+      entry.append(atom);
+    }
 
-            if (attr2.linkType() == 0)
-                attr.setLinkType(attr2.fileType());
-            else
-                attr.setLinkType(attr2.linkType());
+    sftp_attributes_free(dirent);
+    listEntry(entry, false);
+  } // for ever
+  sftp_closedir(dp);
+  listEntry(entry, true); // ready
 
-            attr.setLinkDestination(target);
+  finished();
+}
 
-            kdDebug(TDEIO_SFTP_DB) << "sftpStat(): File type: " << attr.fileType() << endl;
-        }
-    }
+void sftpProtocol::mkdir(const KURL &url, int permissions) {
+  kdDebug(TDEIO_SFTP_DB) << "create directory: " << url.url() << endl;
 
-    return SSH2_FX_OK;
-}
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
+  if (url.path().isEmpty()) {
+    error(TDEIO::ERR_MALFORMED_URL, url.prettyURL());
+    return;
+  }
+  const TQString path = url.path();
+  const TQByteArray path_c = path.utf8();
 
-int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags,
-                           const sftpFileAttr& attr, TQByteArray& handle) {
-    kdDebug(TDEIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl;
+  // Remove existing file or symlink, if requested.
+  if (metaData(TQString("overwrite")) == TQString("true")) {
+    kdDebug(TDEIO_SFTP_DB) << "overwrite set, remove existing file or symlink: " << url.url() << endl;
+    sftp_unlink(mSftp, path_c.data());
+  }
 
-    TQCString path = remoteEncoding()->encode(url.path());
-    uint len = path.length();
+  kdDebug(TDEIO_SFTP_DB) << "Trying to create directory: " << path << endl;
+  sftp_attributes sb = sftp_lstat(mSftp, path_c.data());
+  if (sb == NULL) {
+    if (sftp_mkdir(mSftp, path_c.data(), 0777) < 0) {
+      reportError(url, sftp_get_error(mSftp));
+      sftp_attributes_free(sb);
+      return;
+    } else {
+      kdDebug(TDEIO_SFTP_DB) << "Successfully created directory: " << url.url() << endl;
+      if (permissions != -1) {
+        chmod(url, permissions);
+      } else {
+        finished();
+      }
+      sftp_attributes_free(sb);
+      return;
+    }
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
+  if (sb->type == SSH_FILEXFER_TYPE_DIRECTORY) {
+    error(TDEIO::ERR_DIR_ALREADY_EXIST, path);
+  } else {
+    error(TDEIO::ERR_FILE_ALREADY_EXIST, path);
+  }
 
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + len +
-                    4 /*pflags*/ + attr.size());
-    s << (TQ_UINT8)SSH2_FXP_OPEN;
-    s << (TQ_UINT32)id;
-    s.writeBytes(path.data(), len);
-    s << pflags;
-    s << attr;
+  sftp_attributes_free(sb);
+  return;
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite) {
+  kdDebug(TDEIO_SFTP_DB) << "rename " << src.url() << " to " << dest.url() << endl;
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpen(): sftp packet id mismatch" << endl;
-        return -1;
-    }
+  TQByteArray qsrc = src.path().utf8();
+  TQByteArray qdest = dest.path().utf8();
 
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 errCode;
-        r >> errCode;
-        return errCode;
+  sftp_attributes sb = sftp_lstat(mSftp, qdest.data());
+  if (sb != NULL) {
+    if (!overwrite) {
+      if (sb->type == SSH_FILEXFER_TYPE_DIRECTORY) {
+        error(TDEIO::ERR_DIR_ALREADY_EXIST, dest.url());
+      } else {
+        error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.url());
+      }
+      sftp_attributes_free(sb);
+      return;
     }
 
-    if( type != SSH2_FXP_HANDLE ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpen(): unexpected message type of " << type << endl;
-        return -1;
-    }
+    del(dest, sb->type == SSH_FILEXFER_TYPE_DIRECTORY ? true : false);
+  }
+  sftp_attributes_free(sb);
 
-    r >> handle;
-    if( handle.size() > 256 ) {
-        kdError(TDEIO_SFTP_DB) << "sftpOpen(): handle exceeds max length" << endl;
-        return -1;
-    }
+  if (sftp_rename(mSftp, qsrc.data(), qdest.data()) < 0) {
+    reportError(dest, sftp_get_error(mSftp));
+    return;
+  }
 
-    kdDebug(TDEIO_SFTP_DB) << "sftpOpen(): handle (" << handle.size() << "): [" << handle << "]" << endl;
-    return SSH2_FX_OK;
+  finished();
 }
 
+void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwrite) {
+  kdDebug(TDEIO_SFTP_DB) << "link " << target << "->" << dest.url()
+                      << ", overwrite = " << overwrite << endl;
 
-int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data)
-{
- //   kdDebug(TDEIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl;
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
-
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + handle.size() +
-                    8 /*offset*/ + 4 /*length*/);
-    s << (TQ_UINT8)SSH2_FXP_READ;
-    s << (TQ_UINT32)id;
-    s << handle;
-    s << offset; // we don't have a convienient 64 bit int so set upper int to zero
-    s << len;
-
-    putPacket(p);
-    getPacket(p);
-
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
-
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRead: sftp packet id mismatch" << endl;
-        return -1;
-    }
-
-    if( type == SSH2_FXP_STATUS ) {
-        TQ_UINT32 errCode;
-        r >> errCode;
-        kdError(TDEIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl;
-        return errCode;
-    }
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    if( type != SSH2_FXP_DATA ) {
-        kdError(TDEIO_SFTP_DB) << "sftpRead: unexpected message type of " << type << endl;
-        return -1;
+  TQByteArray t = target.utf8();
+  TQByteArray d = dest.path().utf8();
+
+  bool failed = false;
+  if (sftp_symlink(mSftp, t.data(), d.data()) < 0) {
+    if (overwrite) {
+      sftp_attributes sb = sftp_lstat(mSftp, d.data());
+      if (sb == NULL) {
+        failed = true;
+      } else {
+        if (sftp_unlink(mSftp, d.data()) < 0) {
+          failed = true;
+        } else {
+          if (sftp_symlink(mSftp, t.data(), d.data()) < 0) {
+            failed = true;
+          }
+        }
+      }
+      sftp_attributes_free(sb);
     }
+  }
 
-    r >> data;
+  if (failed) {
+    reportError(dest, sftp_get_error(mSftp));
+    return;
+  }
 
-    return SSH2_FX_OK;
+  finished();
 }
 
+void sftpProtocol::chmod(const KURL& url, int permissions) {
+  kdDebug(TDEIO_SFTP_DB) << "change permission of " << url.url() << " to " << TQString::number(permissions) << endl;
 
-int sftpProtocol::sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, const TQByteArray& data){
-//    kdDebug(TDEIO_SFTP_DB) << "sftpWrite( offset = " << offset <<
-//        ", data sz = " << data.size() << ")" << endl;
-    TQByteArray p;
-    TQDataStream s(p, IO_WriteOnly);
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQ_UINT32 id, expectedId;
-    id = expectedId = mMsgId++;
-    s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ +
-                    4 /*str length*/ + handle.size() +
-                    8 /*offset*/ +
-                    4 /* data size */ + data.size());
-    s << (TQ_UINT8)SSH2_FXP_WRITE;
-    s << (TQ_UINT32)id;
-    s << handle;
-    s << offset; // we don't have a convienient 64 bit int so set upper int to zero
-    s << data;
+  TQByteArray path = url.path().utf8();
 
-//    kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): SSH2_FXP_WRITE, id:"
-//        << id << ", handle:" << handle << ", offset:" << offset << ", some data" << endl;
+  if (sftp_chmod(mSftp, path.data(), permissions) < 0) {
+    reportError(url, sftp_get_error(mSftp));
+    return;
+  }
 
-//    kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): send packet [" << p << "]" << endl;
+  finished();
+}
 
-    putPacket(p);
-    getPacket(p);
+void sftpProtocol::del(const KURL &url, bool isfile){
+  kdDebug(TDEIO_SFTP_DB) << "deleting " << (isfile ? "file: " : "directory: ") << url.url() << endl;
 
-//    kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl;
+  openConnection();
+  if (!mConnected) {
+    return;
+  }
 
-    TQDataStream r(p, IO_ReadOnly);
-    TQ_UINT8 type;
+  TQByteArray path = url.path().utf8();
 
-    r >> type >> id;
-    if( id != expectedId ) {
-        kdError(TDEIO_SFTP_DB) << "sftpWrite(): sftp packet id mismatch, got "
-            << id << ", expected " << expectedId << endl;
-        return -1;
+  if (isfile) {
+    if (sftp_unlink(mSftp, path.data()) < 0) {
+      reportError(url, sftp_get_error(mSftp));
+      return;
     }
-
-    if( type != SSH2_FXP_STATUS ) {
-        kdError(TDEIO_SFTP_DB) << "sftpWrite(): unexpected message type of " << type << endl;
-        return -1;
+  } else {
+    if (sftp_rmdir(mSftp, path.data()) < 0) {
+      reportError(url, sftp_get_error(mSftp));
+      return;
     }
+  }
 
-    TQ_UINT32 code;
-    r >> code;
-    return code;
+  finished();
 }
 
-
+void sftpProtocol::slave_status() {
+  kdDebug(TDEIO_SFTP_DB) << "connected to " << mHost << "?: " << mConnected << endl;
+  slaveStatus((mConnected ? mHost : TQString()), mConnected);
+}
diff --git a/tdeioslave/sftp/tdeio_sftp.h b/tdeioslave/sftp/tdeio_sftp.h
index 30c452f9b..75b295cfd 100644
--- a/tdeioslave/sftp/tdeio_sftp.h
+++ b/tdeioslave/sftp/tdeio_sftp.h
@@ -1,59 +1,111 @@
-/***************************************************************************
-                          sftpProtocol.h  -  description
-                             -------------------
-    begin                : Sat Jun 30 20:08:47 CDT 2001
-    copyright            : (C) 2001 by Lucas Fisher
-    email                : ljfisher@purdue.edu
-***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+ * Copyright (c) 2001  Lucas Fisher       <ljfisher@purdue.edu>
+ * Copyright (c) 2009  Andreas Schneider  <mail@cynapses.org>
+ * Copyright (c) 2020  Martin Sandsmark   <martin@sandsmark.ninja>
+ *                     KDE2 port
+ * Copyright (c) 2022  Mavridis Philippe  <mavridisf@gmail.com>
+ *                     Trinity port
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License (LGPL) 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 __tdeio_sftp_h__
 #define __tdeio_sftp_h__
 
-#include <tqstring.h>
-#include <tqcstring.h>
-#include <tqobject.h>
-
 #include <kurl.h>
 #include <tdeio/global.h>
 #include <tdeio/slavebase.h>
 #include <kdebug.h>
+#include <stdint.h>
+#include <memory>
 
-#include "process.h"
-#include "sftpfileattr.h"
-#include "ksshprocess.h"
+#include <libssh/libssh.h>
+#include <libssh/sftp.h>
+#include <libssh/callbacks.h>
 
+// How big should each data packet be? Definitely not bigger than 64kb or
+// you will overflow the 2 byte size variable in a sftp packet.
+#define MAX_XFER_BUF_SIZE 60 * 1024
 #define TDEIO_SFTP_DB 7120
 
 
+#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 7, 90)
+#define TDEIO_SSH_KNOWN_HOSTS_OK        SSH_SERVER_KNOWN_OK
+#define TDEIO_SSH_KNOWN_HOSTS_OTHER     SSH_SERVER_FOUND_OTHER
+#define TDEIO_SSH_KNOWN_HOSTS_CHANGED   SSH_SERVER_KNOWN_CHANGED
+#define TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND SSH_SERVER_FILE_NOT_FOUND
+#define TDEIO_SSH_KNOWN_HOSTS_UNKNOWN   SSH_SERVER_NOT_KNOWN
+#define TDEIO_SSH_KNOWN_HOSTS_ERROR     SSH_SERVER_ERROR
+
+#else
+#define TDEIO_SSH_KNOWN_HOSTS_OK        SSH_KNOWN_HOSTS_OK
+#define TDEIO_SSH_KNOWN_HOSTS_OTHER     SSH_KNOWN_HOSTS_OTHER
+#define TDEIO_SSH_KNOWN_HOSTS_CHANGED   SSH_KNOWN_HOSTS_CHANGED
+#define TDEIO_SSH_KNOWN_HOSTS_NOT_FOUND SSH_KNOWN_HOSTS_NOT_FOUND
+#define TDEIO_SSH_KNOWN_HOSTS_UNKNOWN   SSH_KNOWN_HOSTS_UNKNOWN
+#define TDEIO_SSH_KNOWN_HOSTS_ERROR     SSH_KNOWN_HOSTS_ERROR
+#endif
+
+namespace TDEIO {
+  class AuthInfo;
+}
+
 class sftpProtocol : public TDEIO::SlaveBase
 {
 
 public:
   sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket);
   virtual ~sftpProtocol();
-  virtual void setHost(const TQString& h, int port, const TQString& user, const TQString& pass);
-  virtual void get(const KURL& url);
-  virtual void listDir(const KURL& url) ;
-  virtual void mimetype(const KURL& url);
-  virtual void stat(const KURL& url);
-  virtual void copy(const KURL &src, const KURL &dest, int permissions, bool overwrite);
-  virtual void put(const KURL& url, int permissions, bool overwrite, bool resume);
-  virtual void closeConnection();
-  virtual void slave_status();
-  virtual void del(const KURL &url, bool isfile);
-  virtual void chmod(const KURL& url, int permissions);
-  virtual void symlink(const TQString& target, const KURL& dest, bool overwrite);
-  virtual void rename(const KURL& src, const KURL& dest, bool overwrite);
-  virtual void mkdir(const KURL&url, int permissions);
-  virtual void openConnection();
+  virtual void setHost(const TQString& h, int port, const TQString& user, const TQString& pass) override;
+  virtual void get(const KURL& url) override;
+  virtual void listDir(const KURL& url)  override;
+  virtual void mimetype(const KURL& url) override;
+  virtual void stat(const KURL& url) override;
+  virtual void put(const KURL& url, int permissions, bool overwrite, bool resume) override;
+  virtual void copy(const KURL &src, const KURL &dest, int permissions, bool overwrite) override;
+  virtual void closeConnection() override;
+  virtual void slave_status() override;
+  virtual void del(const KURL &url, bool isfile) override;
+  virtual void chmod(const KURL& url, int permissions) override;
+  virtual void symlink(const TQString& target, const KURL& dest, bool overwrite) override;
+  virtual void rename(const KURL& src, const KURL& dest, bool overwrite) override;
+  virtual void mkdir(const KURL& url, int permissions) override;
+  virtual void openConnection() override;
+
+  // libssh authentication callback (note that this is called by the
+  // global ::auth_callback() call.
+  int auth_callback(const char *prompt, char *buf, size_t len,
+                    int echo, int verify, void *userdata);
+
+  // libssh logging callback (note that this is called by the
+  // global ::log_callback() call.
+  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
   /** True if ioslave is connected to sftp server. */
@@ -65,85 +117,103 @@ private: // Private variables
   /** Port we are connected to. */
   int mPort;
 
-  /** Ssh process to which we send the sftp packets. */
-  KSshProcess ssh;
+  /** The ssh session for the connection */
+  ssh_session mSession;
 
-  /** Username to use when connecting */
+  /** The sftp session for the connection */
+  sftp_session mSftp;
+
+  /** 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;
 
-  /** Message id of the last sftp packet we sent. */
-  unsigned int mMsgId;
+  /** The open file */
+  sftp_file mOpenFile;
 
-  /** Type of packet we are expecting to receive next. */
-  unsigned char mExpected;
+  /** The open URL */
+  KURL mOpenUrl;
+
+  ssh_callbacks mCallbacks;
 
   /** Version of the sftp protocol we are using. */
   int sftpVersion;
-  
-  struct Status 
-  {
-    int code;
-    TDEIO::filesize_t size;
-    TQString text;
-  };
+
+  //struct Status
+  //{
+  //  int code;
+  //  TDEIO::filesize_t size;
+  //  TQString text;
+  //};
+
+  /** 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
-  bool getPacket(TQByteArray& msg);
+  void statMime(const KURL &url);
+  void closeFile();
 
-   /* Type is a sftp packet type found in .sftp.h'.
-   * Example: SSH2_FXP_READLINK, SSH2_FXP_RENAME, etc.
-   *
-   * Returns true if the type is supported by the sftp protocol
-   * version negotiated by the client and server (sftpVersion).
-   */
-  bool isSupportedOperation(int type);
-  /** Used to have the server canonicalize any given path name to an absolute path.
-      This is useful for converting path names containing ".." components or relative
-      pathnames without a leading slash into absolute paths.
-      Returns the canonicalized url. */
-  int sftpRealPath(const KURL& url, KURL& newUrl);
-
-  /** Send an sftp packet to stdin of the ssh process. */
-  bool putPacket(TQByteArray& p);
-  /** Process SSH_FXP_STATUS packets. */
-  void processStatus(TQ_UINT8, const TQString& message = TQString::null);
-  /** Process SSH_FXP_STATUS packes and return the result. */
-  Status doProcessStatus(TQ_UINT8, const TQString& message = TQString::null);
-  /** Opens a directory handle for url.path. Returns true if succeeds. */
-  int sftpOpenDirectory(const KURL& url, TQByteArray& handle);
-  /** Closes a directory or file handle. */
-  int sftpClose(const TQByteArray& handle);
-  /** Send a sftp command to rename a file or directoy. */
-  int sftpRename(const KURL& src, const KURL& dest);
-  /** Set a files attributes. */
-  int sftpSetStat(const KURL& url, const sftpFileAttr& attr);
-  /** Sends a sftp command to remove a file or directory. */
-  int sftpRemove(const KURL& url, bool isfile);
-  /** Creates a symlink named dest to target. */
-  int sftpSymLink(const TQString& target, const KURL& dest);
-  /** Get directory listings. */
-  int sftpReadDir(const TQByteArray& handle, const KURL& url);
-  /** Retrieves the destination of a link. */
-  int sftpReadLink(const KURL& url, TQString& target);
-  /** Stats a file. */
-  int sftpStat(const KURL& url, sftpFileAttr& attr);
-  /** No descriptions */
-  int sftpOpen(const KURL& url, const TQ_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle);
-  /** No descriptions */
-  int sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data);
-  /** No descriptions */
-  int sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, const TQByteArray& data);
-  
-  /** Performs faster upload when the source is a local file... */
-  void sftpCopyPut(const KURL& src, const KURL& dest, int mode, bool overwrite);
-  /** Performs faster download when the destination is a local file... */
-  void sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite);
-  
-  /** */
-  Status sftpGet( const KURL& src, TDEIO::filesize_t offset = 0, int fd = -1);
-  void sftpPut( const KURL& dest, int permissions, bool resume, bool overwrite, int fd = -1);
+  /** @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);
+
+  bool createUDSEntry(const TQString &filename, const TQByteArray &path,
+      TDEIO::UDSEntry &entry, short int details);
+
+  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.h b/tdeioslave/smb/tdeio_smb.h
index a81728d5d..56c296c31 100644
--- a/tdeioslave/smb/tdeio_smb.h
+++ b/tdeioslave/smb/tdeio_smb.h
@@ -94,7 +94,7 @@ class TDEProcess;
 
 class SMBSlave : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 private:
     //---------------------------------------------------------------------
diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp
index 0aef92698..120372672 100644
--- a/tdeioslave/smb/tdeio_smb_mount.cpp
+++ b/tdeioslave/smb/tdeio_smb_mount.cpp
@@ -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/CMakeLists.txt b/tdeioslave/smtp/CMakeLists.txt
index 89ef650ca..d3d476ec4 100644
--- a/tdeioslave/smtp/CMakeLists.txt
+++ b/tdeioslave/smtp/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
 set( target tdeio_smtp )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
+  SOURCES smtp.cpp request.cpp response.cpp capabilities.cpp command.cpp transactionstate.cpp
   LINK tdeio-shared ${SASL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/smtp/Makefile.am b/tdeioslave/smtp/Makefile.am
index 9859048b1..22cf859a1 100644
--- a/tdeioslave/smtp/Makefile.am
+++ b/tdeioslave/smtp/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_smtp.la
 
-tdeio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
+tdeio_smtp_la_SOURCES = smtp.cpp request.cpp response.cpp capabilities.cpp command.cpp transactionstate.cpp
 tdeio_smtp_la_LIBADD  = $(LIB_TDEIO) $(SASL2_LIBS)
 tdeio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
@@ -16,22 +16,22 @@ TESTS = test_headergeneration test_responseparser test_commands
 
 check_PROGRAMS = $(TESTS) interactivesmtpserver
 
-test_headergeneration_SOURCES = test_headergeneration.cc
+test_headergeneration_SOURCES = test_headergeneration.cpp
 test_headergeneration_LDADD =  $(LIB_TDECORE)
 test_headergeneration_LDFLAGS = $(all_libraries)
 
-test_responseparser_SOURCES = test_responseparser.cc
+test_responseparser_SOURCES = test_responseparser.cpp
 test_responseparser_LDADD =  $(LIB_TDECORE)
 test_responseparser_LDFLAGS = $(all_libraries)
 
-test_commands_SOURCES = test_commands.cc
+test_commands_SOURCES = test_commands.cpp
 test_commands_LDADD =  $(tdeio_smtp_la_LIBADD)
 test_commands_LDFLAGS = $(all_libraries)
 
-interactivesmtpserver_SOURCES = interactivesmtpserver.cc
+interactivesmtpserver_SOURCES = interactivesmtpserver.cpp
 interactivesmtpserver_LDADD = $(LIB_TQT)
 interactivesmtpserver_LDFLAGS = $(all_libraries)
 interactivesmtpserver_METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/tdeio_smtp.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_smtp.pot
diff --git a/tdeioslave/smtp/capabilities.cc b/tdeioslave/smtp/capabilities.cpp
index f4f20fa7a..f0815c73e 100644
--- a/tdeioslave/smtp/capabilities.cc
+++ b/tdeioslave/smtp/capabilities.cpp
@@ -1,5 +1,5 @@
-/*  -*- c++ -*-
-    capabilities.cc
+/*
+    capabilities.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/capabilities.h b/tdeioslave/smtp/capabilities.h
index 1af13e365..eef6cc910 100644
--- a/tdeioslave/smtp/capabilities.h
+++ b/tdeioslave/smtp/capabilities.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     capabilities.h
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/command.cc b/tdeioslave/smtp/command.cpp
index 41bd8d58c..461cf520e 100644
--- a/tdeioslave/smtp/command.cc
+++ b/tdeioslave/smtp/command.cpp
@@ -1,5 +1,5 @@
-/*  -*- c++ -*-
-    command.cc
+/*
+    command.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/command.h b/tdeioslave/smtp/command.h
index c634d1a86..1f20be0e0 100644
--- a/tdeioslave/smtp/command.h
+++ b/tdeioslave/smtp/command.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     command.h
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/interactivesmtpserver.cc b/tdeioslave/smtp/interactivesmtpserver.cpp
index 5f25ca1ca..ed13d7253 100644
--- a/tdeioslave/smtp/interactivesmtpserver.cc
+++ b/tdeioslave/smtp/interactivesmtpserver.cpp
@@ -1,5 +1,5 @@
-/*  -*- c++ -*-
-    interactivesmtpserver.cc
+/*
+    interactivesmtpserver.cpp
 
     Code based on the serverSocket example by Jesper Pedersen.
 
@@ -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/interactivesmtpserver.h b/tdeioslave/smtp/interactivesmtpserver.h
index b4731d44c..c45a7cf56 100644
--- a/tdeioslave/smtp/interactivesmtpserver.h
+++ b/tdeioslave/smtp/interactivesmtpserver.h
@@ -1,7 +1,6 @@
 #ifndef INTERACTIVESMTPSERVER_H
 #define INTERACTIVESMTPSERVER_H
-
-/*  -*- c++ -*-
+/*
     interactivesmtpserver.h
 
     Code based on the serverSocket example by Jesper Pedersen.
@@ -67,7 +66,7 @@ static TQString trim( const TQString & s ) {
 
 
 class InteractiveSMTPServerWindow : public TQWidget {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   InteractiveSMTPServerWindow( TQSocket * socket, TQWidget * parent=0, const char * name=0, WFlags f=0 );
   ~InteractiveSMTPServerWindow();
@@ -103,7 +102,7 @@ private:
 };
 
 class InteractiveSMTPServer : public TQServerSocket {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   InteractiveSMTPServer( TQObject * parent=0 );
   ~InteractiveSMTPServer() {}
diff --git a/tdeioslave/smtp/request.cc b/tdeioslave/smtp/request.cpp
index 4e3cde0e1..6d38fdd6e 100644
--- a/tdeioslave/smtp/request.cc
+++ b/tdeioslave/smtp/request.cpp
@@ -1,5 +1,5 @@
-/*  -*- c++ -*-
-    request.cc
+/*
+    request.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/request.h b/tdeioslave/smtp/request.h
index 37d74d2de..a007e3ab2 100644
--- a/tdeioslave/smtp/request.h
+++ b/tdeioslave/smtp/request.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     request.h
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/response.cc b/tdeioslave/smtp/response.cpp
index b630051de..de6b98868 100644
--- a/tdeioslave/smtp/response.cc
+++ b/tdeioslave/smtp/response.cpp
@@ -1,5 +1,5 @@
-/*  -*- c++ -*-
-    response.cc
+/*
+    response.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/response.h b/tdeioslave/smtp/response.h
index 97220661f..e65406aea 100644
--- a/tdeioslave/smtp/response.h
+++ b/tdeioslave/smtp/response.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     response.h
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cpp
index 00dff3684..ba009c1c5 100644
--- a/tdeioslave/smtp/smtp.cc
+++ b/tdeioslave/smtp/smtp.cpp
@@ -71,7 +71,6 @@ using KioSMTP::TransactionState;
 #include <tqcstring.h>
 
 #include <memory>
-using std::auto_ptr;
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -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/smtp/smtp.h b/tdeioslave/smtp/smtp.h
index e9d9b833b..9d324fe0c 100644
--- a/tdeioslave/smtp/smtp.h
+++ b/tdeioslave/smtp/smtp.h
@@ -1,4 +1,4 @@
-/* -*- c++ -*-
+/*
  * Copyright (c) 2000, 2001 Alex Zepeda <zipzippy@sonic.net>
  * Copyright (c) 2001 Michael H�ckel <Michael@Haeckel.Net>
  * All rights reserved.
@@ -39,9 +39,7 @@
 class KURL;
 class TQCString;
 template <typename T> class TQMemArray;
-#ifdef USE_QT3
 typedef TQMemArray<char> TQByteArray;
-#endif // USE_QT3
 
 namespace KioSMTP {
   class Response;
diff --git a/tdeioslave/smtp/test_commands.cc b/tdeioslave/smtp/test_commands.cpp
index d8a5f0d4e..61181bc35 100644
--- a/tdeioslave/smtp/test_commands.cc
+++ b/tdeioslave/smtp/test_commands.cpp
@@ -723,6 +723,6 @@ void checkSuccessfulTransferCommand( bool error, bool preload, bool ungetLast,
 
 #define NDEBUG
 
-#include "command.cc"
-#include "response.cc"
-#include "transactionstate.cc"
+#include "command.cpp"
+#include "response.cpp"
+#include "transactionstate.cpp"
diff --git a/tdeioslave/smtp/test_headergeneration.cc b/tdeioslave/smtp/test_headergeneration.cpp
index 83d999c4a..9e4cb971f 100644
--- a/tdeioslave/smtp/test_headergeneration.cc
+++ b/tdeioslave/smtp/test_headergeneration.cpp
@@ -82,5 +82,5 @@ int main( int , char ** ) {
   return result == expected ? 0 : 1 ;
 }
 
-#include "request.cc"
+#include "request.cpp"
 
diff --git a/tdeioslave/smtp/test_responseparser.cc b/tdeioslave/smtp/test_responseparser.cpp
index e251aa291..4786bc717 100644
--- a/tdeioslave/smtp/test_responseparser.cc
+++ b/tdeioslave/smtp/test_responseparser.cpp
@@ -104,4 +104,4 @@ int main ( int, char** ) {
   return 0;
 }
 
-#include "response.cc"
+#include "response.cpp"
diff --git a/tdeioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cpp
index 58e5adf51..1d96e44b7 100644
--- a/tdeioslave/smtp/transactionstate.cc
+++ b/tdeioslave/smtp/transactionstate.cpp
@@ -1,5 +1,5 @@
-/*  -*- c++ -*-
-    transactionstate.cc
+/*
+    transactionstate.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/transactionstate.h b/tdeioslave/smtp/transactionstate.h
index ec39e3ac6..bf8a2a3bc 100644
--- a/tdeioslave/smtp/transactionstate.h
+++ b/tdeioslave/smtp/transactionstate.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     transactionstate.h
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
diff --git a/tdeioslave/system/Makefile.am b/tdeioslave/system/Makefile.am
index da49adca3..71475c4bc 100644
--- a/tdeioslave/system/Makefile.am
+++ b/tdeioslave/system/Makefile.am
@@ -27,5 +27,5 @@ check: testsystem
 	./testsystem
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_system.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_system.pot
 
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 21a9da7da..164b9a467 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -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 6270489c8..d4cc0e1cb 100644
--- a/tdeioslave/system/systemimpl.h
+++ b/tdeioslave/system/systemimpl.h
@@ -31,7 +31,7 @@
 
 class SystemImpl : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	SystemImpl();
 
diff --git a/tdeioslave/tar/CMakeLists.txt b/tdeioslave/tar/CMakeLists.txt
index 30f2f6b1b..f08ac3aa9 100644
--- a/tdeioslave/tar/CMakeLists.txt
+++ b/tdeioslave/tar/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
 set( target tdeio_tar )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES tar.cc
+  SOURCES tar.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/tar/Makefile.am b/tdeioslave/tar/Makefile.am
index 98acbb726..fdeb13c86 100644
--- a/tdeioslave/tar/Makefile.am
+++ b/tdeioslave/tar/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = tdeio_tar.la
 
-tdeio_tar_la_SOURCES = tar.cc
+tdeio_tar_la_SOURCES = tar.cpp
 tdeio_tar_la_LIBADD = $(LIB_TDESYCOCA)
 tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
@@ -21,4 +21,4 @@ kdelnk_DATA = tar.protocol ar.protocol zip.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/tdeio_tar.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_tar.pot
diff --git a/tdeioslave/tar/tar.cc b/tdeioslave/tar/tar.cpp
index 6d71d8b21..b7ba70687 100644
--- a/tdeioslave/tar/tar.cc
+++ b/tdeioslave/tar/tar.cpp
@@ -619,5 +619,3 @@ debug("void TARProtocol::filterData");
   }
 }
 */
-
-// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/tdeioslave/thumbnail/exrcreator.cpp b/tdeioslave/thumbnail/exrcreator.cpp
index 5708b8996..9ec2dd706 100644
--- a/tdeioslave/thumbnail/exrcreator.cpp
+++ b/tdeioslave/thumbnail/exrcreator.cpp
@@ -26,6 +26,7 @@
 #include <tqfile.h>
 
 #include <ImfInputFile.h>
+#include <ImfHeader.h>
 #include <ImfPreviewImage.h>
 
 #include "exrcreator.h"
diff --git a/tdeioslave/thumbnail/htmlcreator.cpp b/tdeioslave/thumbnail/htmlcreator.cpp
index 34742a0e9..5a6935010 100644
--- a/tdeioslave/thumbnail/htmlcreator.cpp
+++ b/tdeioslave/thumbnail/htmlcreator.cpp
@@ -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/htmlcreator.h b/tdeioslave/thumbnail/htmlcreator.h
index 752cf0ace..052e1959e 100644
--- a/tdeioslave/thumbnail/htmlcreator.h
+++ b/tdeioslave/thumbnail/htmlcreator.h
@@ -27,7 +27,7 @@ class TDEHTMLPart;
 
 class HTMLCreator : public TQObject, public ThumbCreator
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTMLCreator();
     virtual ~HTMLCreator();
diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
index cc2eefbc3..98b01138c 100644
--- a/tdeioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -428,7 +428,7 @@ const TQImage& ThumbnailProtocol::getIcon()
         int h = icon->height();
         for ( int y = 0; y < h; y++ )
         {
-            QRgb *line = (QRgb *) icon->scanLine( y );
+            TQRgb *line = (TQRgb *) icon->scanLine( y );
             for ( int x = 0; x < w; x++ )
                 line[x] &= m_iconAlpha; // transparency
         }
diff --git a/tdeioslave/trash/DESIGN b/tdeioslave/trash/DESIGN
index 2bb6f19df..9420c53ce 100644
--- a/tdeioslave/trash/DESIGN
+++ b/tdeioslave/trash/DESIGN
@@ -13,7 +13,7 @@ BUGS
 
 TODO
 ====
-* Clean up konq_popupmenu.cc for Type=Link URL=trash:/   :(
+* Clean up konq_popupmenu.cpp for Type=Link URL=trash:/   :(
 * Also, provide metainfo for trash contents for that desktop link.
 => maybe we need a new mimetype?
  Like application/x-trash-desktop, inheriting application/x-desktop. 
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index 5d0d9b3e6..1c2ec23cc 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -31,7 +31,7 @@ testtrash_LDFLAGS = $(all_libraries)
 TESTS = testtrash
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_trash.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_trash.pot
 
 # ktrashpropsdlgplugin target
 noinst_HEADERS = ktrashpropsdlgplugin.h discspaceutil.h trash_constant.h
diff --git a/tdeioslave/trash/discspaceutil.cpp b/tdeioslave/trash/discspaceutil.cpp
index 186cb0e7f..e231b901c 100644
--- a/tdeioslave/trash/discspaceutil.cpp
+++ b/tdeioslave/trash/discspaceutil.cpp
@@ -102,9 +102,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/discspaceutil.h b/tdeioslave/trash/discspaceutil.h
index a00141296..bcd8126e1 100644
--- a/tdeioslave/trash/discspaceutil.h
+++ b/tdeioslave/trash/discspaceutil.h
@@ -31,7 +31,7 @@
  */
 class DiscSpaceUtil : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeioslave/trash/kcmtrash.cpp b/tdeioslave/trash/kcmtrash.cpp
index 4747e092a..8793be5d9 100644
--- a/tdeioslave/trash/kcmtrash.cpp
+++ b/tdeioslave/trash/kcmtrash.cpp
@@ -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/kcmtrash.h b/tdeioslave/trash/kcmtrash.h
index 4987ccfba..dc04b9587 100644
--- a/tdeioslave/trash/kcmtrash.h
+++ b/tdeioslave/trash/kcmtrash.h
@@ -27,7 +27,7 @@ class TQTabWidget;
 
 class TrashModule : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TrashModule(TQWidget *parent, const char *name);
diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
index 067c10b6e..7b36aaaf4 100644
--- a/tdeioslave/trash/ktrashpropsdlgplugin.cpp
+++ b/tdeioslave/trash/ktrashpropsdlgplugin.cpp
@@ -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/ktrashpropsdlgplugin.h b/tdeioslave/trash/ktrashpropsdlgplugin.h
index b839f6428..b17c0d5f8 100644
--- a/tdeioslave/trash/ktrashpropsdlgplugin.h
+++ b/tdeioslave/trash/ktrashpropsdlgplugin.h
@@ -36,7 +36,7 @@ class KTrashPropsWidget;
 
 class KTrashPropsDlgPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const char*, const TQStringList& );
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/ktrashpropswidget.h b/tdeioslave/trash/ktrashpropswidget.h
index 8cebfcae4..ac131039b 100644
--- a/tdeioslave/trash/ktrashpropswidget.h
+++ b/tdeioslave/trash/ktrashpropswidget.h
@@ -32,7 +32,7 @@ class TrashImpl;
 
 class KTrashPropsWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KTrashPropsWidget(TQWidget *parent=0, const char *name=0);
diff --git a/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
index f4e10f262..7ada25041 100644
--- a/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
+++ b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS
@@ -1,4 +1,4 @@
 tdefile_trash
 ===========
-QString OriginalPath
+TQString OriginalPath
 DateTime DateOfDeletion
diff --git a/tdeioslave/trash/tdefile-plugin/tdefile_trash.h b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
index fbd6c9e3d..afcbba1f1 100644
--- a/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
@@ -28,7 +28,7 @@ class TQStringList;
 
 class KTrashPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KTrashPlugin(TQObject *parent, const char *name, const TQStringList& args);
diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp
index 90431afd5..aa1f63aa1 100644
--- a/tdeioslave/trash/tdeio_trash.cpp
+++ b/tdeioslave/trash/tdeio_trash.cpp
@@ -435,7 +435,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString
     addAtom( entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime );
     addAtom( entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime ); // ## or use it for deletion time?
     addAtom( entry, TDEIO::UDS_EXTRA, 0, info.origPath );
-    addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( Qt::ISODate ) );
+    addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( TQt::ISODate ) );
     return true;
 }
 
@@ -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/tdeio_trash.h b/tdeioslave/trash/tdeio_trash.h
index 1f19927ca..5d16ce93a 100644
--- a/tdeioslave/trash/tdeio_trash.h
+++ b/tdeioslave/trash/tdeio_trash.h
@@ -30,7 +30,7 @@ typedef TrashImpl::TrashedFileInfoList TrashedFileInfoList;
 
 class TrashProtocol : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TrashProtocol( const TQCString& protocol, const TQCString &pool, const TQCString &app);
     virtual ~TrashProtocol();
diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
index 60fe2d1a6..4a1ca12f8 100644
--- a/tdeioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -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;
diff --git a/tdeioslave/trash/testtrash.h b/tdeioslave/trash/testtrash.h
index e87b9c3a0..1b46e3551 100644
--- a/tdeioslave/trash/testtrash.h
+++ b/tdeioslave/trash/testtrash.h
@@ -22,9 +22,9 @@
 
 #include <tqobject.h>
 
-class TestTrash : public QObject
+class TestTrash : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TestTrash() {}
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index c2fc53352..8c062256c 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -130,7 +130,7 @@ bool TrashImpl::init()
         return false;
 
     // Check the trash directory and its info and files subdirs
-    // see also kdesktop/init.cc for first time initialization
+    // see also kdesktop/init.cpp for first time initialization
     m_initStatus = InitError;
     // $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default.
     const TQString xdgDataDir = TDEGlobal::dirs()->localxdgdatadir();
@@ -263,7 +263,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi
         info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1();
     info += "\n";
     info += "DeletionDate=";
-    info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1();
+    info += TQDateTime::currentDateTime().toString( TQt::ISODate ).latin1();
     info += "\n";
     size_t sz = info.size() - 1; // avoid trailing 0 from QCString
 
@@ -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 ) {
@@ -637,7 +637,7 @@ bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, i
     }
     TQString line = cfg.readEntry( "DeletionDate" );
     if ( !line.isEmpty() ) {
-        info.deletionDate = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( line, Qt::ISODate ));
+        info.deletionDate = TQDateTime::fromString( line, TQt::ISODate );
     }
     return true;
 }
diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h
index 571bbd353..90032762d 100644
--- a/tdeioslave/trash/trashimpl.h
+++ b/tdeioslave/trash/trashimpl.h
@@ -33,7 +33,7 @@
  */
 class TrashImpl : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TrashImpl();
 
diff --git a/tdepasswd/kcm/chfacedlg.cpp b/tdepasswd/kcm/chfacedlg.cpp
index 0a3dbfb78..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 );
 }
@@ -128,7 +128,7 @@ void ChFaceDlg::addCustomPixmap( TQString imPath, bool saveCopy )
   }
   if ( (pix.width() > KCFGUserAccount::faceSize())
 	|| (pix.height() > KCFGUserAccount::faceSize()) )
-    pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQ_ScaleMin );// Should be no bigger than certain size.
+    pix = pix.scale( KCFGUserAccount::faceSize(), KCFGUserAccount::faceSize(), TQImage::ScaleMin );// Should be no bigger than certain size.
 
   if ( saveCopy )
   {
diff --git a/tdepasswd/kcm/chfacedlg.h b/tdepasswd/kcm/chfacedlg.h
index f96d50084..6ae6a1c16 100644
--- a/tdepasswd/kcm/chfacedlg.h
+++ b/tdepasswd/kcm/chfacedlg.h
@@ -38,7 +38,7 @@ class KDialogBase;
 
 class ChFaceDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
 
diff --git a/tdepasswd/kcm/main.cpp b/tdepasswd/kcm/main.cpp
index 0751c997e..b7e2aa8fa 100644
--- a/tdepasswd/kcm/main.cpp
+++ b/tdepasswd/kcm/main.cpp
@@ -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/kcm/main.h b/tdepasswd/kcm/main.h
index 350c42820..f74ad55de 100644
--- a/tdepasswd/kcm/main.h
+++ b/tdepasswd/kcm/main.h
@@ -36,7 +36,7 @@ class Config;
  */
 class KCMUserAccount : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KCMUserAccount(TQWidget* parent, const char* name = "KCMUserAccount",
diff --git a/tdepasswd/passwd.cpp b/tdepasswd/passwd.cpp
index ab0e913a2..3db14efbf 100644
--- a/tdepasswd/passwd.cpp
+++ b/tdepasswd/passwd.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * $Id$
  *
diff --git a/tdepasswd/passwd.h b/tdepasswd/passwd.h
index 83bde9a83..80c8fb359 100644
--- a/tdepasswd/passwd.h
+++ b/tdepasswd/passwd.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * $Id$
  *
diff --git a/tdepasswd/passwddlg.cpp b/tdepasswd/passwddlg.cpp
index eb897dc95..4a2b7d4b1 100644
--- a/tdepasswd/passwddlg.cpp
+++ b/tdepasswd/passwddlg.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * $Id$
  *
diff --git a/tdepasswd/passwddlg.h b/tdepasswd/passwddlg.h
index 1fef792a4..392738fef 100644
--- a/tdepasswd/passwddlg.h
+++ b/tdepasswd/passwddlg.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * $Id$
  *
@@ -14,7 +14,7 @@
 class TDEpasswd1Dialog
     : public KPasswordDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEpasswd1Dialog();
@@ -30,7 +30,7 @@ protected:
 class TDEpasswd2Dialog
     : public KPasswordDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEpasswd2Dialog(const TQString &oldpass, const TQString &user);
diff --git a/tdepasswd/tdepasswd.cpp b/tdepasswd/tdepasswd.cpp
index a6015eacc..398d6d6bf 100644
--- a/tdepasswd/tdepasswd.cpp
+++ b/tdepasswd/tdepasswd.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * $Id$
  *
diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp
index cdf1fc225..814cda92a 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() ), kapp, TQ_SLOT( quit() ) ); }
 protected:
 	void mousePressEvent(TQMouseEvent*);
 private:
@@ -48,7 +48,7 @@ private:
 
 void JobTray::mousePressEvent(TQMouseEvent *e)
 {
-	if (e->button() == Qt::RightButton)
+	if (e->button() == TQt::RightButton)
 		KSystemTray::mousePressEvent(e);
 	else if (m_app->m_views.count() > 0)
 	{
@@ -114,13 +114,13 @@ void KJobViewerApp::initialize()
 	TDECmdLineArgs	*args = TDECmdLineArgs::parsedArgs();
 	bool 	showIt = args->isSet("show");
 	bool	all = args->isSet("all");
-	QString	prname = args->getOption("d");
+	TQString	prname = args->getOption("d");
 	KMJobViewer	*view(0);
 
 	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);
         }
 
diff --git a/tdeprint/kjobviewer/kjobviewer.h b/tdeprint/kjobviewer/kjobviewer.h
index 967262de2..af606b551 100644
--- a/tdeprint/kjobviewer/kjobviewer.h
+++ b/tdeprint/kjobviewer/kjobviewer.h
@@ -30,7 +30,7 @@ class JobTray;
 
 class KJobViewerApp : public KUniqueApplication, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	friend class JobTray;
 public:
 	KJobViewerApp();
diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp
index fd528b705..b9e04be1f 100644
--- a/tdeprint/kprinter/main.cpp
+++ b/tdeprint/kprinter/main.cpp
@@ -49,7 +49,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[])
 	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 102951ffd..aed2065a1 100644
--- a/tdeprint/kprinter/printwrapper.cpp
+++ b/tdeprint/kprinter/printwrapper.cpp
@@ -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,kapp,TQ_SLOT(quit()));
 }
 
 void hack( KPrintDialog* dlg );
@@ -395,7 +395,7 @@ void PrintWrapper::slotPrintRequested(KPrinter *kprinter)
 	// if nobody complains.
 	/*else
 	{
-		QString	msg = i18n("<nobr>File(s) sent to printer <b>%1</b>.</nobr>").arg(kprinter->printerName());
+		TQString msg = i18n("<nobr>File(s) sent to printer <b>%1</b>.</nobr>").arg(kprinter->printerName());
 		showmsg(msg,0);
 	}*/
 }
diff --git a/tdeprint/kprinter/printwrapper.h b/tdeprint/kprinter/printwrapper.h
index e34e8d964..734235252 100644
--- a/tdeprint/kprinter/printwrapper.h
+++ b/tdeprint/kprinter/printwrapper.h
@@ -28,7 +28,7 @@ class TQSocketNotifier;
 
 class PrintWrapper : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PrintWrapper();
 
diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp
index 2e714087a..5ca66f09b 100644
--- a/tdeprint/slave/tdeio_print.cpp
+++ b/tdeprint/slave/tdeio_print.cpp
@@ -455,10 +455,10 @@ 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 ) ) );
+	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 ) ) );
 	kapp->enter_loop();
 	m_httpBuffer.close();
 
diff --git a/tdeprint/slave/tdeio_print.h b/tdeprint/slave/tdeio_print.h
index ff56cb426..40891c044 100644
--- a/tdeprint/slave/tdeio_print.h
+++ b/tdeprint/slave/tdeio_print.h
@@ -32,7 +32,7 @@ namespace TDEIO {
 
 class TDEIO_Print : public TQObject, public TDEIO::SlaveBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEIO_Print(const TQCString& pool, const TQCString& app);
 
diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp
index 3ae57e7ab..3c9b0e9f1 100644
--- a/tdeprint/tdeprint_part/printpart.cpp
+++ b/tdeprint/tdeprint_part/printpart.cpp
@@ -43,7 +43,7 @@ PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ ,
 	m_extension = new PrintPartExtension(this);
 
 	m_view = new KMMainView(parentWidget, "MainView", actionCollection());
-	m_view->setFocusPolicy(TQ_ClickFocus);
+	m_view->setFocusPolicy(TQWidget::ClickFocus);
 	m_view->enableToolbar(false);
 	setWidget(m_view);
 
diff --git a/tdeprint/tdeprint_part/printpart.h b/tdeprint/tdeprint_part/printpart.h
index 40e8041ea..8f32207df 100644
--- a/tdeprint/tdeprint_part/printpart.h
+++ b/tdeprint/tdeprint_part/printpart.h
@@ -29,7 +29,7 @@ class TDEAboutData;
 
 class PrintPart : public KParts::ReadOnlyPart
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PrintPart(TQWidget *parentWidget, const char *widgetName,
 		  TQObject *parent, const char *name,
@@ -49,7 +49,7 @@ private:
 
 class PrintPartExtension : public KParts::BrowserExtension
 {
-	Q_OBJECT
+	TQ_OBJECT
 	friend class PrintPart;
 public:
 	PrintPartExtension(PrintPart *parent);
diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am
index a11e69200..196576c6f 100644
--- a/tdeprint/tdeprintfax/Makefile.am
+++ b/tdeprint/tdeprintfax/Makefile.am
@@ -16,7 +16,7 @@ private_SCRIPTS = anytops
 privatedir = $(kde_datadir)/tdeprintfax
 
 messages: rc.cpp
-	$(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/tdeprintfax.pot
+	$(XGETTEXT) `find . -name \*.h -o -name \*.cpp` -o $(podir)/tdeprintfax.pot
 
 KDE_ICON = tdeprintfax
 pic_ICON = abentry
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp
index 7fdb4fec1..8a2456e73 100644
--- a/tdeprint/tdeprintfax/conffilters.cpp
+++ b/tdeprint/tdeprintfax/conffilters.cpp
@@ -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/conffilters.h b/tdeprint/tdeprintfax/conffilters.h
index ca796b934..e40c7e89a 100644
--- a/tdeprint/tdeprintfax/conffilters.h
+++ b/tdeprint/tdeprintfax/conffilters.h
@@ -27,7 +27,7 @@ class TDEListView;
 
 class ConfFilters : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ConfFilters(TQWidget *parent = 0, const char *name = 0);
 
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 fbb27aac9..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 );
 
@@ -75,7 +75,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)
  
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);
 	TQGridLayout	*l1 = new TQGridLayout(0, 2, 2, 0, 10);
-	l0->addLayout(TQT_TQLAYOUT(l1));
+	l0->addLayout(l1);
 	l1->setColStretch(1, 1);
 	l1->addWidget(syslabel, 0, 0);
 	l1->addWidget(cmdlabel, 1, 0);
diff --git a/tdeprint/tdeprintfax/confsystem.h b/tdeprint/tdeprintfax/confsystem.h
index 0ce8971f0..01170f387 100644
--- a/tdeprint/tdeprintfax/confsystem.h
+++ b/tdeprint/tdeprintfax/confsystem.h
@@ -29,7 +29,7 @@ class TQComboBox;
 
 class ConfSystem : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ConfSystem(TQWidget *parent = 0, const char *name = 0);
 
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/faxab.h b/tdeprint/tdeprintfax/faxab.h
index da38fb9d8..ac2098cc0 100644
--- a/tdeprint/tdeprintfax/faxab.h
+++ b/tdeprint/tdeprintfax/faxab.h
@@ -32,7 +32,7 @@ class TQPushButton;
 
 class FaxAB : public KDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	FaxAB(TQWidget *parent = 0, const char *name = 0);
 	~FaxAB();
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp
index 5ea6a65a2..78074c55f 100644
--- a/tdeprint/tdeprintfax/faxctrl.cpp
+++ b/tdeprint/tdeprintfax/faxctrl.cpp
@@ -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;
 }
 
@@ -522,7 +522,7 @@ void FaxCtrl::viewLog(TQWidget *)
 		m_logview = new KTextEdit(topView);
 		m_logview->setTextFormat( TQt::LogText );
 		m_logview->setWordWrap( TQTextEdit::WidgetWidth );
-		m_logview->setPaper( Qt::white );
+		m_logview->setPaper( TQt::white );
 		//m_logview->setReadOnly(true);
 		//m_logview->setWordWrap(TQTextEdit::NoWrap);
 		TQPushButton	*m_clear = new KPushButton(KStdGuiItem::clear(), topView);
@@ -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);
@@ -599,12 +599,12 @@ void FaxCtrl::slotClearLog()
 
 void FaxCtrl::slotCloseLog()
 {
-	const TQObject	*obj = TQT_TQOBJECT_CONST(sender());
+	const TQObject	*obj = sender();
 	if (m_logview)
 	{
 		TQTextEdit	*view = m_logview;
 		m_logview = 0;
-		if (obj && obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
+		if (obj && obj->inherits("TQPushButton"))
 			delete view->parentWidget();
 kdDebug() << "slotClose()" << endl;
 	}
diff --git a/tdeprint/tdeprintfax/faxctrl.h b/tdeprint/tdeprintfax/faxctrl.h
index 9135b7cc6..5a11e37d9 100644
--- a/tdeprint/tdeprintfax/faxctrl.h
+++ b/tdeprint/tdeprintfax/faxctrl.h
@@ -32,7 +32,7 @@ class TQTextEdit;
 
 class FaxCtrl : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	FaxCtrl(TQWidget *parent = 0, const char *name = 0);
 	~FaxCtrl();
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/filterdlg.h b/tdeprint/tdeprintfax/filterdlg.h
index ab4fd0406..26dbc729c 100644
--- a/tdeprint/tdeprintfax/filterdlg.h
+++ b/tdeprint/tdeprintfax/filterdlg.h
@@ -27,7 +27,7 @@ class TQLineEdit;
 
 class FilterDlg : public KDialogBase
 {
-  	Q_OBJECT
+  	TQ_OBJECT
 public:
 	FilterDlg(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp
index 2927d4e88..4538bc7ae 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,16 +124,16 @@ 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 );
 
 	TQGridLayout	*l0 = new TQGridLayout(mainw, 10, 2, 10, 5);
 	l0->setColStretch(1,1);
-	l0->addWidget(m_filelabel, 0, 0, Qt::AlignLeft|Qt::AlignTop);
+	l0->addWidget(m_filelabel, 0, 0, TQt::AlignLeft|TQt::AlignTop);
 	TQHBoxLayout *l2 = new TQHBoxLayout( 0, 0, 10 );
 	TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 5 );
 	l0->addLayout( l2, 0, 1 );
@@ -159,7 +159,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	l0->addWidget( m_cover, 6, 1 );
 	l0->addWidget( m_subjectlabel, 7, 0 );
 	l0->addWidget( m_subject, 7, 1 );
-	l0->addWidget(m_commentlabel, 8, 0, Qt::AlignTop|Qt::AlignLeft);
+	l0->addWidget(m_commentlabel, 8, 0, TQt::AlignTop|TQt::AlignLeft);
 	l0->addWidget(m_comment, 8, 1);
 	l0->addWidget(m_timelabel, 9, 0);
 	TQHBoxLayout	*l1 = new TQHBoxLayout(0, 0, 5);
@@ -178,7 +178,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)
 	updateState();
 
 	resize(550,500);
-	TQWidget	*d = TQT_TQWIDGET(kapp->desktop());
+	TQWidget	*d = kapp->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", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
-	new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
-	new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
-	new TDEAction(i18n("A&bort"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
-	new TDEAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
-	new TDEAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
-	new TDEAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");
-	new TDEAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::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/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h
index 783593c3b..9981ba72a 100644
--- a/tdeprint/tdeprintfax/tdeprintfax.h
+++ b/tdeprint/tdeprintfax/tdeprintfax.h
@@ -38,7 +38,7 @@ class TQListViewItem;
 
 class KdeprintFax : public TDEMainWindow
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	struct FaxItem
 	{
diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp
index fce4491e7..f1f39ca57 100644
--- a/tdescreensaver/blankscrn.cpp
+++ b/tdescreensaver/blankscrn.cpp
@@ -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/blankscrn.h b/tdescreensaver/blankscrn.h
index ba6da0226..4fefb9dfd 100644
--- a/tdescreensaver/blankscrn.h
+++ b/tdescreensaver/blankscrn.h
@@ -17,7 +17,7 @@ class KColorButton;
 
 class KBlankSaver : public KScreenSaver
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KBlankSaver( WId drawable );
 	virtual ~KBlankSaver();
@@ -34,7 +34,7 @@ private:
 
 class KBlankSetup : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KBlankSetup( TQWidget *parent = NULL, const char *name = NULL );
 
diff --git a/tdescreensaver/random.h b/tdescreensaver/random.h
index e34556662..3b7fb8ea4 100644
--- a/tdescreensaver/random.h
+++ b/tdescreensaver/random.h
@@ -19,7 +19,7 @@ class TQCheckBox;
 
 class KRandomSetup : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KRandomSetup( TQWidget *parent = NULL, const char *name = NULL );
 
diff --git a/tdesu/CMakeLists.txt b/tdesu/CMakeLists.txt
index 4c33fb0d8..67ee4c645 100644
--- a/tdesu/CMakeLists.txt
+++ b/tdesu/CMakeLists.txt
@@ -40,6 +40,8 @@ else()
 endif()
 
 check_function_exists( getpeereid HAVE_GETPEEREID )
+check_function_exists( getpeerucred HAVE_GETPEERUCRED )
+
 check_include_file( "sys/select.h" HAVE_SYS_SELECT_H )
 check_include_file( "sys/wait.h" HAVE_SYS_WAIT_H )
 
diff --git a/tdesu/tdesu/sudlg.cpp b/tdesu/tdesu/sudlg.cpp
index 59ab64b08..0ed2dfc92 100644
--- a/tdesu/tdesu/sudlg.cpp
+++ b/tdesu/tdesu/sudlg.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesu/sudlg.h b/tdesu/tdesu/sudlg.h
index 08f4e608a..669eea8e7 100644
--- a/tdesu/tdesu/sudlg.h
+++ b/tdesu/tdesu/sudlg.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org>
@@ -12,7 +12,7 @@
 class TDEsuDialog
     : public KPasswordDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index f2635925e..b36b0513b 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1998 Pietro Iglio <iglio@fub.it>
diff --git a/tdesu/tdesud/handler.h b/tdesu/tdesud/handler.h
index 8728efe78..70412a321 100644
--- a/tdesu/tdesud/handler.h
+++ b/tdesu/tdesud/handler.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/lexer.cpp b/tdesu/tdesud/lexer.cpp
index f1932f07d..75535ec9f 100644
--- a/tdesu/tdesud/lexer.cpp
+++ b/tdesu/tdesud/lexer.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/lexer.h b/tdesu/tdesud/lexer.h
index d8f529cd8..a2b42c7a4 100644
--- a/tdesu/tdesud/lexer.h
+++ b/tdesu/tdesud/lexer.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/repo.cpp b/tdesu/tdesud/repo.cpp
index 296199438..e3f6f7e0b 100644
--- a/tdesu/tdesud/repo.cpp
+++ b/tdesu/tdesud/repo.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/tdesu/tdesud/repo.h b/tdesu/tdesud/repo.h
index 70027793f..88e9e519b 100644
--- a/tdesu/tdesud/repo.h
+++ b/tdesu/tdesud/repo.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/secure.cpp b/tdesu/tdesud/secure.cpp
index 9b30ab4ee..dd778575e 100644
--- a/tdesu/tdesud/secure.cpp
+++ b/tdesu/tdesud/secure.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/tdesu/tdesud/secure.h b/tdesu/tdesud/secure.h
index edf58d9c6..9e7a2690c 100644
--- a/tdesu/tdesud/secure.h
+++ b/tdesu/tdesud/secure.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index a4959b368..950bb91b4 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
  *
  * This file is part of the KDE project, module tdesu.
  * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
@@ -45,7 +45,8 @@
 #include <pwd.h>
 #include <errno.h>
 
-#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) &&\
+	!defined(Q_OS_SOLARIS)
 #include <sys/prctl.h>
 #endif
 #include <sys/time.h>
@@ -251,7 +252,8 @@ int create_socket()
 
 int main(int argc, char *argv[])
 {
-#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) &&\
+	!defined(Q_OS_SOLARIS)
     prctl(PR_SET_DUMPABLE, 0);
 #endif
 
diff --git a/tdm/CMakeLists.txt b/tdm/CMakeLists.txt
index ce8a1f4ed..3a6b6a41b 100644
--- a/tdm/CMakeLists.txt
+++ b/tdm/CMakeLists.txt
@@ -21,4 +21,10 @@ include( ConfigureChecks.cmake )
 
 add_subdirectory( backend )
 add_subdirectory( kfrontend )
-add_subdirectory( cryptocardwatcher )
+tde_conditional_add_subdirectory( WITH_TDEHWLIB cryptocardwatcher )
+
+# systemd
+if( BUILD_TDM_SYSTEMD_UNIT_FILE AND NOT "${SYSTEMDSYSTEMUNITDIR}" STREQUAL "" )
+  configure_file( "${TDM_SERVICE_FILE_TEMPLATE}" tdm.service @ONLY )
+  install( FILES "${CMAKE_CURRENT_BINARY_DIR}/tdm.service" DESTINATION ${SYSTEMDSYSTEMUNITDIR} )
+endif( )
diff --git a/tdm/ConfigureChecks.cmake b/tdm/ConfigureChecks.cmake
index cb5615243..d0080f4f1 100644
--- a/tdm/ConfigureChecks.cmake
+++ b/tdm/ConfigureChecks.cmake
@@ -10,11 +10,19 @@
 #################################################
 
 find_library( UTIL_LIBRARY util )
+if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+  set( UTIL_LIBRARY "" )
+endif()
 
 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 )
@@ -118,13 +126,79 @@ if( WITH_XDMCP )
 endif()
 
 
-if( WITH_PAM )
+# If a tdm.service file is wanted, find systemd, then work out which
+# distribution is running, select an appropriate template and create the file.
+# When it is not possible to identify the distribution or there is no specific
+# template is available, use the default of 'tde.service.cmake'. The template
+# can also be set from the command line.
+
+if( BUILD_TDM_SYSTEMD_UNIT_FILE )
+
+  if( NOT SYSTEMDSYSTEMUNITDIR )
+    pkg_search_module( SYSTEMD systemd )
+    if( SYSTEMD_FOUND )
+      execute_process(
+        COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd
+        OUTPUT_VARIABLE SYSTEMDSYSTEMUNITDIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+    endif( )
+  endif( )
+
+  if( "${SYSTEMDSYSTEMUNITDIR}" STREQUAL "" )
+    set( SYSTEMDSYSTEMUNITDIR "/usr/lib/systemd/system" )
+  endif( )
+
+  if( NOT TDM_SERVICE_FILE_TEMPLATE )
+
+    find_program( LSB_RELEASE lsb_release HINTS ENV PATH )
+    unset( _DIST_ID_LIST )
+
+    if( EXISTS "/etc/os-release" )
+
+      file( READ "/etc/os-release" _OS_RELEASE )
+
+      if( "\n${_OS_RELEASE}" MATCHES "\nID=\"*([^\"\n]*)" )
+        set( _DISTRIBUTION "${CMAKE_MATCH_1}" )
+      endif( )
+      if( "\n${_OS_RELEASE}" MATCHES "\nVERSION_ID=\"*([^\\.\"\n]*)" )
+        set( _DIST_VERSION "${CMAKE_MATCH_1}" )
+      endif( )
+      if( "\n${_OS_RELEASE}" MATCHES "\nID_LIKE=\"*([^\\.\"\n]*)" )
+        string( REGEX REPLACE " " ";" _DIST_ID_LIST "${CMAKE_MATCH_1}" )
+      endif( )
+
+      if( _DISTRIBUTION )
+        message( STATUS "Running ${_DISTRIBUTION} distribution, version ${_DIST_VERSION}" )
+        string( TOLOWER "${_DISTRIBUTION}" _DISTRIBUTION )
+        list( INSERT _DIST_ID_LIST 0 "${_DISTRIBUTION}" )
+      endif( )
+
+      foreach( _DIST_ID IN LISTS _DIST_ID_LIST )
+        if( NOT TDM_SERVICE_FILE_TEMPLATE )
+          if( _DIST_VERSION AND
+              EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tdm.service.${_DIST_ID}-${_DIST_VERSION}.cmake" )
+            set( TDM_SERVICE_FILE_TEMPLATE "tdm.service.${_DIST_ID}-${_DIST_VERSION}.cmake" )
+          elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tdm.service.${_DIST_ID}.cmake" )
+            set( TDM_SERVICE_FILE_TEMPLATE "tdm.service.${_DIST_ID}.cmake" )
+          endif( )
+        endif( )
+      endforeach( )
+
+    else( )
+
+      message(STATUS "**WARNING** /etc/os-release was not found. The default template for tdm.service will be used.")
+
+    endif( )
+
+    if( NOT TDM_SERVICE_FILE_TEMPLATE )
+      set( TDM_SERVICE_FILE_TEMPLATE "tdm.service.cmake" )
+    endif( )
 
-  set( USE_PAM 1 CACHE INTERNAL "" FORCE )
+    message( STATUS "tdm.service template file is ${TDM_SERVICE_FILE_TEMPLATE}" )
 
-elseif( WITH_SHADOW )
+    configure_file( "${TDM_SERVICE_FILE_TEMPLATE}" tdm.service @ONLY )
 
-  set( HAVE_SHADOW 1 CACHE INTERNAL "" FORCE )
-  set( USESHADOW 1 CACHE INTERNAL "" FORCE )
+  endif( )
 
 endif( )
diff --git a/tdm/backend/CMakeLists.txt b/tdm/backend/CMakeLists.txt
index 8f11c4b34..cb0cd3d3f 100644
--- a/tdm/backend/CMakeLists.txt
+++ b/tdm/backend/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdm/kfrontend
   ${XAU_INCLUDE_DIRS}
   ${XDMCP_INCLUDE_DIRS}
+  ${TQT_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -48,6 +49,6 @@ 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 pthread ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${UTIL_LIBRARY} ${XDMCP_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdm/backend/consolekit.c b/tdm/backend/consolekit.c
index 61d0b165e..9a6729b91 100644
--- a/tdm/backend/consolekit.c
+++ b/tdm/backend/consolekit.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
 
     Copyright (C) 2006-2007 William Jon McCann <mccann@jhu.edu>
     Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
diff --git a/tdm/backend/consolekit.h b/tdm/backend/consolekit.h
index e385e3f91..12b5462da 100644
--- a/tdm/backend/consolekit.h
+++ b/tdm/backend/consolekit.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
 
     Copyright (C) 2006 William Jon McCann <mccann@jhu.edu>
     Copyright (C) 2007 Kevin Kofler <Kevin@tigcc.ticalc.org>
diff --git a/tdm/backend/ctrl.c b/tdm/backend/ctrl.c
index 1e7cfd07a..cc9540745 100644
--- a/tdm/backend/ctrl.c
+++ b/tdm/backend/ctrl.c
@@ -41,6 +41,7 @@ from the copyright holder.
 #include <string.h>
 #include <signal.h>
 #include <pwd.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 
 #ifdef __linux__
diff --git a/tdm/backend/dm.c b/tdm/backend/dm.c
index 605f0b1c4..9168b88b5 100644
--- a/tdm/backend/dm.c
+++ b/tdm/backend/dm.c
@@ -34,6 +34,8 @@ from the copyright holder.
  * display manager
  */
 
+#include <tqglobal.h>
+
 #include "dm.h"
 #include "dm_auth.h"
 #include "dm_error.h"
@@ -51,6 +53,12 @@ from the copyright holder.
 # include <sys/vt.h>
 #endif
 
+#ifdef HAVE_PTHREAD_SETNAME_NP
+#define _GNU_SOURCE
+#define __BSD_VISIBLE 1
+#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
 
@@ -66,7 +74,8 @@ static void MainLoop( void );
 
 static int signalFds[2];
 
-#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE)
+#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE) && \
+    !defined(HAVE_PTHREAD_SETNAME_NP)
 static char *Title;
 static int TitleLen;
 #endif
@@ -104,7 +113,7 @@ main( int argc, char **argv )
 		if (!StrDup( &progpath, argv[0] ))
 			Panic( "Out of memory" );
 	} else
-#ifdef __linux__
+#ifdef Q_OS_LINUX
 	{
 		/* note that this will resolve symlinks ... */
 		int len;
@@ -114,6 +123,16 @@ main( int argc, char **argv )
 		if (!StrNDup( &progpath, fullpath, len ))
 			Panic( "Out of memory" );
 	}
+#elif defined(Q_OS_SOLARIS)
+	{
+		/* note that this will resolve symlinks ... */
+		int len;
+		char fullpath[PATH_MAX];
+		if ((len = readlink( "/proc/self/path/a.out", fullpath, sizeof(fullpath) )) < 0)
+			Panic( "Invoke with full path specification or mount /proc" );
+		if (!StrNDup( &progpath, fullpath, len ))
+			Panic( "Out of memory" );
+	}
 #else
 # if 0
 		Panic( "Must be invoked with full path specification" );
@@ -161,7 +180,8 @@ main( int argc, char **argv )
 #endif
 	prog = strrchr( progpath, '/' ) + 1;
 
-#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE)
+#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE) && \
+    !defined(HAVE_PTHREAD_SETNAME_NP)
 	Title = argv[0];
 	TitleLen = (argv[argc - 1] + strlen( argv[argc - 1] )) - Title;
 #endif
@@ -1685,7 +1705,8 @@ UnlockPidFile( void )
 void
 SetTitle( const char *name )
 {
-#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE)
+#if !defined(HAVE_SETPROCTITLE) && !defined(NOXDMTITLE) && \
+    !defined(HAVE_PTHREAD_SETNAME_NP)
 	char *p;
 	int left;
 #endif
@@ -1694,6 +1715,8 @@ SetTitle( const char *name )
 	ReInitErrorLog();
 #ifdef HAVE_SETPROCTITLE
 	setproctitle( "%s", name );
+#elif defined(HAVE_PTHREAD_SETNAME_NP)
+	pthread_setname_np(pthread_self(), name);
 #elif !defined(NOXDMTITLE)
 	p = Title;
 	left = TitleLen;
diff --git a/tdm/backend/getfd.c b/tdm/backend/getfd.c
index aaad616b6..6dea4f56c 100644
--- a/tdm/backend/getfd.c
+++ b/tdm/backend/getfd.c
@@ -1,12 +1,15 @@
+#include <tqglobal.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#ifdef __linux__
+#ifdef Q_OS_LINUX
 #include <linux/kd.h>
 #endif
+
 #include "getfd.h"
 
 /*
@@ -22,7 +25,8 @@ is_a_console(int fd) {
 	char arg;
 
 	arg = 0;
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) ||\
+    defined(Q_OS_SOLARIS)
 	return arg;
 #else
 	return (ioctl(fd, KDGKBTYPE, &arg) == 0
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/config.def b/tdm/config.def
index 6164f2f83..43de11c71 100644
--- a/tdm/config.def
+++ b/tdm/config.def
@@ -33,19 +33,8 @@
 #define TDMCONF KDE_CONFDIR "/tdm"
 #define TDMDATA KDE_DATADIR "/tdm"
 
-#ifdef _AIX
-# define HALT_CMD	"/usr/sbin/shutdown -h now"
-# define REBOOT_CMD	"/usr/sbin/shutdown -r now"
-#elif defined(BSD)
-# define HALT_CMD	"/sbin/shutdown -h now"
-# define REBOOT_CMD	"/sbin/shutdown -r now"
-#elif defined(__SVR4)
-# define HALT_CMD	"/usr/sbin/halt"
-# define REBOOT_CMD	"/usr/sbin/reboot"
-#else
-# define HALT_CMD	"/sbin/poweroff"
-# define REBOOT_CMD	"/sbin/reboot"
-#endif
+# define HALT_CMD	POWEROFF_BINARY
+# define REBOOT_CMD	REBOOT_BINARY
 
 #if defined(BSD) || defined(__linux__)
 # define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games"
@@ -104,7 +93,8 @@
  overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme.
  In addition, if a tdmdistrc file is found, this file will be ignored.
  If a tdmdistrc file is installed, changes should be made to that file.
- See /usr/share/doc/tdm/README.Debian for details
+ You may find more details in distribution specific files if present, like
+ for example /usr/share/doc/tdm-trinity/README.Debian for Debian-based distros.
  _
  Definition: the greeter is the login dialog, i.e., the part of &tdm;
  which the user sees.
diff --git a/tdm/cryptocardwatcher/CMakeLists.txt b/tdm/cryptocardwatcher/CMakeLists.txt
index 7564ac2cf..c66161263 100644
--- a/tdm/cryptocardwatcher/CMakeLists.txt
+++ b/tdm/cryptocardwatcher/CMakeLists.txt
@@ -24,9 +24,8 @@ link_directories(
 ##### tdecryptocardwatcher (executable) #########
 
 tde_add_executable( tdecryptocardwatcher AUTOMOC
-  SOURCES main.cpp watcher.cc
-  LINK tdecore-shared tdeio-shared dmctl-static
+  SOURCES main.cpp watcher.cpp
+  LINK tdecore-shared tdeio-shared dmctl-static ${TDEHW_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
   SETUID
 )
-
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/cryptocardwatcher/watcher.cc b/tdm/cryptocardwatcher/watcher.cpp
index ecd4e8f3c..ecd4e8f3c 100644
--- a/tdm/cryptocardwatcher/watcher.cc
+++ b/tdm/cryptocardwatcher/watcher.cpp
diff --git a/tdm/cryptocardwatcher/watcher.h b/tdm/cryptocardwatcher/watcher.h
index bfbb010a0..289f16142 100644
--- a/tdm/cryptocardwatcher/watcher.h
+++ b/tdm/cryptocardwatcher/watcher.h
@@ -26,7 +26,7 @@ class TDECryptographicCardDevice;
 
 class CardWatcher : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		CardWatcher();
diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt
index d150a32c9..05472b551 100644
--- a/tdm/kfrontend/CMakeLists.txt
+++ b/tdm/kfrontend/CMakeLists.txt
@@ -70,8 +70,8 @@ tde_add_executable( tdm_greet AUTOMOC
     tdm_greet.c tdmconfig.cpp tdmclock.cpp kconsole.cpp
     kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp
     tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp
-    kgapp.cpp sakdlg.cc
-  LINK tdmthemer-static tdeui-shared tdeio-shared dmctl-static Xtst ${LIBTDELDAP_LIBRARIES} ${TDMGREET_OPTIONAL_LINK}
+    kgapp.cpp sakdlg.cpp
+  LINK tdmthemer-static tdeui-shared tdeio-shared dmctl-static Xtst ${TDEHW_LIBRARIES} ${TDMGREET_OPTIONAL_LINK}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp
index 9f0c714c0..876f42c88 100644
--- a/tdm/kfrontend/kchooser.cpp
+++ b/tdm/kfrontend/kchooser.cpp
@@ -75,7 +75,7 @@ ChooserDlg::ChooserDlg()
 	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/kchooser.h b/tdm/kfrontend/kchooser.h
index fcf14b1e1..1382ddd57 100644
--- a/tdm/kfrontend/kchooser.h
+++ b/tdm/kfrontend/kchooser.h
@@ -33,7 +33,7 @@ class TQListView;
 class TQListViewItem;
 
 class ChooserDlg : public KGDialog {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGDialog inherited;
 
   public:
diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp
index bf1560aed..d47576c12 100644
--- a/tdm/kfrontend/kconsole.cpp
+++ b/tdm/kfrontend/kconsole.cpp
@@ -129,7 +129,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/kconsole.h b/tdm/kfrontend/kconsole.h
index 2b3e2aac3..04d197652 100644
--- a/tdm/kfrontend/kconsole.h
+++ b/tdm/kfrontend/kconsole.h
@@ -30,7 +30,7 @@ class TQSocketNotifier;
 class KPty;
 
 class KConsole : public TQTextEdit {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQTextEdit inherited;
 
   public:
diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp
index 5e8f8e861..30ee85a00 100644
--- a/tdm/kfrontend/kfdialog.cpp
+++ b/tdm/kfrontend/kfdialog.cpp
@@ -178,10 +178,10 @@ 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, Qt::AlignCenter );
-	grid->addWidget( label2, 0, 1, Qt::AlignCenter );
-	grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter );
+	grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+	grid->addWidget( label2, 0, 1, TQt::AlignCenter );
+	grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter );
 }
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index a48dcf93a..6e144600f 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -101,7 +101,7 @@ GreeterApp::GreeterApp(Display *dpy) : TDEApplication(dpy)
 	init();
 }
 
-GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : TDEApplication(dpy, visual, colormap)
+GreeterApp::GreeterApp(Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap) : TDEApplication(dpy, visual, colormap)
 {
 	init();
 }
@@ -124,14 +124,14 @@ void GreeterApp::init()
 		startTimer( pingInterval * 60000 );
 	}
 
-#ifdef __TDE_HAVE_TDEHWLIB
+#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
 }
 
 void GreeterApp::deviceChanged(TDEGenericDevice* device) {
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #ifdef WITH_XRANDR
 	if (device->type() == TDEGenericDeviceType::Monitor) {
 		KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
@@ -139,7 +139,7 @@ void GreeterApp::deviceChanged(TDEGenericDevice* device) {
 		delete randrsimple;
 	}
 #endif // WITH_XRANDR
-#endif // __TDE_HAVE_TDEHWLIB
+#endif // WITH_TDEHWLIB
 }
 
 void
@@ -201,7 +201,7 @@ checkSAK(GreeterApp* app)
 	app->restoreOverrideCursor();
 	SAKDlg sak(0);
 	sak.exec();
-	app->setOverrideCursor( Qt::WaitCursor );
+	app->setOverrideCursor( TQt::WaitCursor );
 }
 
 void
@@ -284,7 +284,7 @@ kg_main( const char *argv0 )
 
 	GreeterApp *app;
 	if ((!_compositor.isEmpty()) && ( argb_visual_available == true )) {
-		app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap ));
+		app = new GreeterApp(dpyi, TQt::HANDLE( visual ), TQt::HANDLE( colormap ));
 	}
 	else {
 		argb_visual_available = false;
@@ -308,11 +308,22 @@ kg_main( const char *argv0 )
 	iccConfigFile += "/kicc/kiccconfigrc";
 	KSimpleConfig iccconfig(iccConfigFile, true);
 	if (iccconfig.readBoolEntry("EnableICC", false) == true) {
-		TQString iccCommand = TQString("/usr/bin/xcalib ");
-		iccCommand += iccconfig.readEntry("ICCFile");
-		iccCommand += TQString(" &");
-		if (system(iccCommand.ascii()) < 0) {
-			printf("WARNING: Unable to execute command \"%s\"\n", iccCommand.ascii());
+		TQString iccCommand = TDEGlobal::dirs()->findExe("dispwin");
+		if (iccCommand.isEmpty())
+		{
+			iccCommand = TDEGlobal::dirs()->findExe("xcalib");
+		}
+		if (iccCommand.isEmpty())
+		{
+			printf("WARNING: Unable to find command to set ICC profile - dispwin or xcalib\n");
+		}
+		else
+		{
+			iccCommand += TQString(" %1 &").arg(iccconfig.readEntry("ICCFile"));
+			if (system(iccCommand.local8Bit()) < 0)
+			{
+				printf("WARNING: Unable to execute command \"%s\"\n", iccCommand.local8Bit().data());
+			}
 		}
 	}
 
@@ -400,14 +411,14 @@ 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;
 		}
 
 		TDEProcess *proc2 = 0;
-		app->setOverrideCursor( Qt::WaitCursor );
+		app->setOverrideCursor( TQt::WaitCursor );
 		FDialog *dialog = NULL;
 #ifdef XDMCP
 		if (cmd == G_Choose) {
diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h
index c9e2802c1..1acbcf187 100644
--- a/tdm/kfrontend/kgapp.h
+++ b/tdm/kfrontend/kgapp.h
@@ -27,20 +27,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define KGAPP_H
 
 #include <tdeapplication.h>
-#ifdef __TDE_HAVE_TDEHWLIB
+#ifdef WITH_TDEHWLIB
 #include <tdehardwaredevices.h>
 #else
 #define TDEGenericDevice void
 #endif
 
 class GreeterApp : public TDEApplication {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TDEApplication inherited;
 
   public:
 	GreeterApp();
 	GreeterApp(Display *dpy);
-	GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap);
+	GreeterApp(Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap);
 	~GreeterApp();
 	virtual bool x11EventFilter( XEvent * );
 
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/kgdialog.h b/tdm/kfrontend/kgdialog.h
index a902b6ff0..fe084ca0b 100644
--- a/tdm/kfrontend/kgdialog.h
+++ b/tdm/kfrontend/kgdialog.h
@@ -41,7 +41,7 @@ class KGVerify;
 #define ex_choose  3
 
 class KGDialog : public FDialog {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef FDialog inherited;
 
   public:
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 7f45ca197..d0815efbe 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "kgreeter.h"
 #include "kconsole.h"
 #include "tdmconfig.h"
@@ -35,10 +39,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <dmctl.h>
 
+#ifdef WITH_TDEHWLIB
 #include <ksslcertificate.h>
-
 #include <tdehardwaredevices.h>
 #include <tdecryptographiccarddevice.h>
+#endif
 
 #include <tdeapplication.h>
 #include <tdelocale.h>
@@ -99,9 +104,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <X11/Xlib.h>
 
-#ifdef HAVE_KRB5
-#include <libtdeldap.h>
-#endif
 
 #define FIFO_DIR "/tmp/tdesocket-global/tdm"
 #define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1"
@@ -121,8 +123,8 @@ class UserListView : public TDEListView {
                 // FIXME: This must be configurable, so disable
                 // painting of list background for now.
 //		if (themed) {
-//		  setBackgroundMode( Qt::NoBackground );
-//		  viewport()->setBackgroundMode( Qt::NoBackground );
+//		  setBackgroundMode( TQt::NoBackground );
+//		  viewport()->setBackgroundMode( TQt::NoBackground );
 //		  setFrameStyle( TQFrame::NoFrame );
 //		}
 	}
@@ -167,7 +169,7 @@ public:
         // painting of list background for now.
         return TDEListView::paintEmptyArea(p, rect );
 
-        const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap());
+        const TQPixmap *pm = paletteBackgroundPixmap();
         if (!pm || pm->isNull()) {
             return;
         }
@@ -205,18 +207,18 @@ KGreeter::KGreeter( bool framed )
 	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) {
@@ -228,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();
 }
 
@@ -249,16 +251,18 @@ KGreeter::~KGreeter()
 void KGreeter::cryptographicCardWatcherSetup() {
 	cardLoginUser = TQString::null;
 
+#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*)));
+		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
 }
 
 void KGreeter::done(int r) {
@@ -389,7 +393,7 @@ KGreeter::insertUser( const TQImage &default_pix,
 		TQBuffer buf( fc );
 		buf.open( IO_ReadOnly );
 		TQImageIO ir;
-		ir.setIODevice( TQT_TQIODEVICE(&buf) );
+		ir.setIODevice( &buf );
 		if (!ir.read()) {
 			LogInfo( "%s is no valid image\n", fn.data() );
 			continue;
@@ -397,7 +401,7 @@ KGreeter::insertUser( const TQImage &default_pix,
 		p = ir.image();
 		TQSize ns( 48, 48 );
 		if (p.size() != ns) {
-			p = p.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin );
+			p = p.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin );
 		}
 		break;
 	} while (--nd >= 0);
@@ -486,7 +490,7 @@ KGreeter::insertUsers(int limit_users)
 		TQSize ns( 48, 48 );
 		if (default_pix.size() != ns)
 			default_pix =
-			  default_pix.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin );
+			  default_pix.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin );
 	}
 	if (_showUsers == SHOW_ALL) {
 		KGreeterUserList noUsers( _noUsers );
@@ -652,7 +656,7 @@ KGreeter::slotUserEntered()
 	if (isVisible())
 		slotLoadPrevWM();
 	else
-		TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadPrevWM()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadPrevWM()) );
 }
 
 void
@@ -861,15 +865,20 @@ KGreeter::verifySetUser( const TQString &user )
 }
 
 void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
-#ifdef HAVE_KRB5
-	// Make sure card logins are enabled before attempting one
-	if (!LDAPManager::pkcsLoginEnabled()) {
-		return;
-	}
-#else
+#ifdef WITH_TDEHWLIB
+#ifndef HAVE_KRB5
 	// Don't enable card-based logins if Kerberos integration was disabled
 	return;
 #endif
+	// Make sure card logins are enabled before attempting one
+	KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" ));
+	systemconfig->setGroup(NULL);
+	bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false);
+	delete systemconfig;
+	if (!enabled)
+	{
+		return;
+	}
 
 	TQString login_name = TQString::null;
 	X509CertificatePtrList certList = cdevice->cardX509Certificates();
@@ -936,9 +945,11 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
 			verify->accept();
 		}
 	}
+#endif
 }
 
 void KGreeter::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
 	cardLoginUser = TQString::null;
 	userView->setEnabled(false);
 	verify->lockUserEntry(false);
@@ -950,6 +961,7 @@ void KGreeter::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
 
 	verify->cardLoginInProgress = false;
 	verify->cardLoginDevice = NULL;
+#endif
 }
 
 KStdGreeter::KStdGreeter()
@@ -981,7 +993,7 @@ KStdGreeter::KStdGreeter()
 		                    "open windows on it or intercept your input.") );
 		complainLabel->setAlignment( AlignCenter );
 		complainLabel->setFont( _failFont );
-		complainLabel->setPaletteForegroundColor( Qt::red );
+		complainLabel->setPaletteForegroundColor( TQt::red );
 		inner_box->addWidget( complainLabel );
 	}
 	if (_logoArea == LOGO_NONE) {
@@ -1041,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
 
@@ -1100,7 +1112,7 @@ KStdGreeter::KStdGreeter()
         verify->setInfoMessageDisplay(showInfoMessages);
 	verify->start();
 
-	TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup()));
+	TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup()));
 }
 
 void
@@ -1156,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" );
@@ -1244,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
@@ -1330,9 +1342,11 @@ KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft )
 		}
 	}
 
+#ifdef WITH_TDEHWLIB
 	if (cardLoginUser != TQString::null) {
 		verify->setPasswordPrompt(i18n("PIN:"));
 	}
+#endif
 }
 
 void
diff --git a/tdm/kfrontend/kgreeter.h b/tdm/kfrontend/kgreeter.h
index f715b3a8c..ed634c6e8 100644
--- a/tdm/kfrontend/kgreeter.h
+++ b/tdm/kfrontend/kgreeter.h
@@ -69,7 +69,7 @@ struct SessType {
 //
 class ControlPipeHandlerObject : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ControlPipeHandlerObject();
@@ -93,7 +93,7 @@ class ControlPipeHandlerObject : public TQObject
 // TDM greeter
 //
 class KGreeter : public KGDialog, public KGVerifyHandler {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGDialog inherited;
 
   public:
@@ -166,7 +166,7 @@ class KGreeter : public KGDialog, public KGVerifyHandler {
 };
 
 class KStdGreeter : public KGreeter {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGreeter inherited;
 
   public:
@@ -187,7 +187,7 @@ class KStdGreeter : public KGreeter {
 };
 
 class KThemedGreeter : public KGreeter {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGreeter inherited;
 
   public:
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index 93bcce27a..105ee3aeb 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -32,10 +32,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "themer/tdmitem.h"
 #include "themer/tdmlabel.h"
 
-#include <ksslcertificate.h>
 
+#ifdef WITH_TDEHWLIB
+#include <ksslcertificate.h>
 #include <tdehardwaredevices.h>
 #include <tdecryptographiccarddevice.h>
+#endif
 
 #include <tdeapplication.h>
 #include <tdelocale.h>
@@ -98,11 +100,13 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer,
 	, isClear(true)
 	, inGreeterPlugin(false)
 	, abortRequested(false)
+#ifdef WITH_TDEHWLIB
 	, cardLoginInProgress(false)
 	, 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( kapp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
 
 	_parent->installEventFilter( this );
 }
@@ -121,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] );
 		}
@@ -324,7 +328,11 @@ KGVerify::start()
 				_autoLoginDelay = 0, timeable = false;
 			return;
 		}
-		else if (!cardLoginInProgress) {
+		else
+#ifdef WITH_TDEHWLIB
+			if (!cardLoginInProgress)
+#endif
+		{
 			applyPreset();
 		}
 	}
@@ -664,6 +672,7 @@ KGVerify::handleVerify()
 					greet->textPrompt(msg, echo, ndelay);
 					inGreeterPlugin = !ndelay;
 
+#ifdef WITH_TDEHWLIB
 					if (cardLoginInProgress) {
 						TQString autoPIN = cardLoginDevice->autoPIN(); 
 						if (autoPIN != TQString::null) {
@@ -673,6 +682,7 @@ KGVerify::handleVerify()
 						}
 						cardLoginInProgress = false;
 					}
+#endif
 				}
 				else {
 					inGreeterPlugin = true;
@@ -1076,7 +1086,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
 
 	failedLabel = new TQLabel( parent );
 	failedLabel->setFont( _failFont );
-	grid->addWidget( failedLabel, 1, 0, Qt::AlignCenter );
+	grid->addWidget( failedLabel, 1, 0, TQt::AlignCenter );
 
 	updateLockStatus();
 }
@@ -1133,7 +1143,7 @@ KGStdVerify::updateStatus()
 	if (failedLabelState != nfls) {
 		failedLabelState = nfls;
 		if (nfls < 0) {
-			failedLabel->setPaletteForegroundColor( Qt::black );
+			failedLabel->setPaletteForegroundColor( TQt::black );
 			failedLabel->setText( i18n( "Automatic login in 1 second...",
 			                            "Automatic login in %n seconds...",
 			                            timedLeft ) );
@@ -1143,11 +1153,11 @@ KGStdVerify::updateStatus()
 				failedLabel->clear();
 				break;
 			case 3:
-				failedLabel->setPaletteForegroundColor( Qt::red );
+				failedLabel->setPaletteForegroundColor( TQt::red );
 				failedLabel->setText( i18n("Warning: Caps Lock on") );
 				break;
 			case 2:
-				failedLabel->setPaletteForegroundColor( Qt::black );
+				failedLabel->setPaletteForegroundColor( TQt::black );
 				failedLabel->setText( authTok ?
 				                         i18n("Change failed") :
 				                         fixedEntity.isEmpty() ?
@@ -1254,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()
@@ -1311,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/kgverify.h b/tdm/kfrontend/kgverify.h
index 9935459be..405fa35ba 100644
--- a/tdm/kfrontend/kgverify.h
+++ b/tdm/kfrontend/kgverify.h
@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // helper class, nuke when qt supports suspend()/resume()
 class QXTimer : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQObject inherited;
 
   public:
@@ -77,7 +77,9 @@ class TQPopupMenu;
 class TQTimer;
 class KPushButton;
 class KLibrary;
+#ifdef WITH_TDEHWLIB
 class TDECryptographicCardDevice;
+#endif
 
 struct GreeterPluginHandle {
 	KLibrary *library;
@@ -87,7 +89,7 @@ struct GreeterPluginHandle {
 typedef TQValueVector<int> PluginList;
 
 class KGVerify : public TQObject, public KGreeterPluginHandler {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQObject inherited;
 
   public:
@@ -182,12 +184,14 @@ class KGVerify : public TQObject, public KGreeterPluginHandler {
 
 	static TQVariant getConf( void *ctx, const char *key, const TQVariant &dflt );
 
+#ifdef WITH_TDEHWLIB
 	bool cardLoginInProgress;
 	TDECryptographicCardDevice* cardLoginDevice;
+#endif
 };
 
 class KGStdVerify : public KGVerify {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGVerify inherited;
 
   public:
@@ -196,7 +200,7 @@ class KGStdVerify : public KGVerify {
 	             const PluginList &pluginList,
 	             KGreeterPlugin::Function func, KGreeterPlugin::Context ctx );
 	virtual ~KGStdVerify();
-	TQLayout *getLayout() const { return TQT_TQLAYOUT(grid); }
+	TQLayout *getLayout() const { return grid; }
 	void selectPlugin( int id );
 
   protected:
@@ -212,7 +216,7 @@ class KGStdVerify : public KGVerify {
 };
 
 class KGThemedVerify : public KGVerify {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KGVerify inherited;
 
   public:
@@ -233,7 +237,7 @@ class KGThemedVerify : public KGVerify {
 };
 
 class KGChTok : public FDialog, public KGVerifyHandler {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef FDialog inherited;
 
   public:
diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp
index 7145eb18a..a52adabb2 100644
--- a/tdm/kfrontend/krootimage.cpp
+++ b/tdm/kfrontend/krootimage.cpp
@@ -51,8 +51,8 @@ MyApplication::MyApplication( const char *conf )
 	: TDEApplication(),
 	  renderer( 0, new KSimpleConfig( 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/krootimage.h b/tdm/kfrontend/krootimage.h
index e002ce230..65b55ba45 100644
--- a/tdm/kfrontend/krootimage.h
+++ b/tdm/kfrontend/krootimage.h
@@ -32,7 +32,7 @@ Boston, MA 02110-1301, USA.
 
 class MyApplication : public TDEApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
 	MyApplication( const char * );
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cpp
index 3758a4719..879e30e02 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cpp
@@ -10,10 +10,11 @@
 
 #include <dmctl.h>
 
+#ifdef WITH_TDEHWLIB
 #include <ksslcertificate.h>
-
 #include <tdehardwaredevices.h>
 #include <tdecryptographiccarddevice.h>
+#endif
 
 #include <tdeapplication.h>
 #include <tdelocale.h>
@@ -132,26 +133,28 @@ 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
 	// 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*)));
+		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
 
 	mControlPipeHandlerThread = new TQEventLoopThread();
 	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();
 }
 
@@ -172,6 +175,7 @@ void SAKDlg::processInputPipeCommand(TQString command) {
 }
 
 void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
 	TQString login_name = TQString::null;
 	X509CertificatePtrList certList = cdevice->cardX509Certificates();
 	if (certList.count() > 0) {
@@ -213,10 +217,13 @@ void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
 			closeDialogForced();
 		}
 	}
+#endif
 }
 
 void SAKDlg::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
 	//
+#endif
 }
 
 SAKDlg::~SAKDlg()
@@ -246,7 +253,7 @@ void SAKDlg::reject()
 
 void SAKDlg::updateLabel(TQString &txt)
 {
-	mStatusLabel->setPaletteForegroundColor(Qt::black);
+	mStatusLabel->setPaletteForegroundColor(TQt::black);
 	mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
diff --git a/tdm/kfrontend/sakdlg.h b/tdm/kfrontend/sakdlg.h
index fd77dd028..8854d8ee0 100644
--- a/tdm/kfrontend/sakdlg.h
+++ b/tdm/kfrontend/sakdlg.h
@@ -31,7 +31,7 @@ class TDECryptographicCardDevice;
 //
 class SAKDlg : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		SAKDlg(TQWidget *parent);
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/tdmadmindialog.h b/tdm/kfrontend/tdmadmindialog.h
index e5a68fbb9..bf0e22dce 100644
--- a/tdm/kfrontend/tdmadmindialog.h
+++ b/tdm/kfrontend/tdmadmindialog.h
@@ -37,7 +37,7 @@ class TQButtonGroup;
 class TQComboBox;
 
 class TDMAdmin : public FDialog, public KGVerifyHandler {
-    Q_OBJECT
+    TQ_OBJECT
     typedef FDialog inherited;
 
 public:
diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp
index f9a7122b8..88beae860 100644
--- a/tdm/kfrontend/tdmclock.cpp
+++ b/tdm/kfrontend/tdmclock.cpp
@@ -37,7 +37,7 @@ 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
diff --git a/tdm/kfrontend/tdmclock.h b/tdm/kfrontend/tdmclock.h
index 89a48eb8e..c579cb81c 100644
--- a/tdm/kfrontend/tdmclock.h
+++ b/tdm/kfrontend/tdmclock.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqframe.h>
 
 class KdmClock : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQFrame inherited;
 
   public:
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index 0cba5e82d..da0863be5 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -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 );
@@ -280,7 +280,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent )
 		          + 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,16 +297,16 @@ 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 );
 
 	TQGridLayout *grid = new TQGridLayout( schedGroup, 0, 0, KDmh, KDsh );
 	grid->addRowSpacing( 0, schedGroup->fontMetrics().height() - 5 );
-	grid->addWidget( lab1, 1, 0, Qt::AlignRight );
+	grid->addWidget( lab1, 1, 0, TQt::AlignRight );
 	grid->addWidget( le_start, 1, 1 );
-	grid->addWidget( lab2, 2, 0, Qt::AlignRight );
+	grid->addWidget( lab2, 2, 0, TQt::AlignRight );
 	grid->addWidget( le_timeout, 2, 1 );
 	grid->addMultiCellWidget( cb_force, 3,3, 0,1 );
 
@@ -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 )
@@ -494,7 +494,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
 
 		// first line of buttons
 		hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
-		hbuttonbox->setAlignment( Qt::AlignHCenter );
+		hbuttonbox->setAlignment( TQt::AlignHCenter );
 
 		// Reboot
 		FlatButton* btnReboot = new FlatButton( lfrm );
@@ -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,16 +534,16 @@ 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()  );
-		hbuttonbox2->setAlignment( Qt::AlignRight );
+		hbuttonbox2->setAlignment( TQt::AlignRight );
 
 		// 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() );	
 	}
@@ -753,7 +753,7 @@ void FlatButton::init()
 	setUsesBigPixmap(true);
 	setAutoRaise(true);
 	setTextPosition( TQToolButton::Under );
-	setFocusPolicy(TQ_StrongFocus);	
+	setFocusPolicy(TQWidget::StrongFocus);	
  }
 
 
@@ -885,13 +885,13 @@ TDMCancelShutdown::TDMCancelShutdown( int how, int start, int timeout,
 		strt = i18n("now");
 	else {
 		qdt.setTime_t( start );
-		strt = qdt.toString( Qt::LocalDate );
+		strt = qdt.toString( TQt::LocalDate );
 	}
 	if (timeout == TO_INF)
 		end = i18n("infinite");
 	else {
 		qdt.setTime_t( timeout );
-		end = qdt.toString( Qt::LocalDate );
+		end = qdt.toString( TQt::LocalDate );
 	}
 	TQString trg =
 		i18n("Owner: %1"
diff --git a/tdm/kfrontend/tdmshutdown.h b/tdm/kfrontend/tdmshutdown.h
index 6a2ee3a70..603511267 100644
--- a/tdm/kfrontend/tdmshutdown.h
+++ b/tdm/kfrontend/tdmshutdown.h
@@ -46,7 +46,7 @@ class TQLineEdit;
 enum { Authed = TQDialog::Accepted + 1, Schedule };
 
 class TDMShutdownBase : public FDialog, public KGVerifyHandler {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef FDialog inherited;
 
   public:
@@ -94,7 +94,7 @@ class TDMShutdownBase : public FDialog, public KGVerifyHandler {
 
 
 class TDMShutdown : public TDMShutdownBase {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TDMShutdownBase inherited;
 
   public:
@@ -124,7 +124,7 @@ class TDMShutdown : public TDMShutdownBase {
 };
 
 class TDMRadioButton : public TQRadioButton {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TQRadioButton inherited;
 
   public:
@@ -139,7 +139,7 @@ class TDMRadioButton : public TQRadioButton {
 };
 
 class TDMDelayedPushButton : public KPushButton {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef KPushButton inherited;
 
   public:
@@ -157,7 +157,7 @@ class TDMDelayedPushButton : public KPushButton {
 };
 
 class TDMSlimShutdown : public FDialog {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef FDialog inherited;
 
   public:
@@ -178,7 +178,7 @@ class TDMSlimShutdown : public FDialog {
 };
 
 class TDMConfShutdown : public TDMShutdownBase {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TDMShutdownBase inherited;
 
   public:
@@ -187,7 +187,7 @@ class TDMConfShutdown : public TDMShutdownBase {
 };
 
 class TDMCancelShutdown : public TDMShutdownBase {
-	Q_OBJECT
+	TQ_OBJECT
 	typedef TDMShutdownBase inherited;
 
   public:
@@ -197,7 +197,7 @@ class TDMCancelShutdown : public TDMShutdownBase {
 
 class KSMPushButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -215,7 +215,7 @@ private:
 
 class FlatButton : public TQToolButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
  public:
 
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp
index ce5904a26..befcb7c35 100644
--- a/tdm/kfrontend/themer/tdmitem.cpp
+++ b/tdm/kfrontend/themer/tdmitem.cpp
@@ -232,13 +232,13 @@ KdmItem::setWidget( TQWidget *widget )
 		myWidget->show();
 
 	// Remove borders so that it blends nicely with the theme background
-	TQFrame* frame = ::tqqt_cast<TQFrame *>( widget );
+	TQFrame* frame = ::tqt_cast<TQFrame *>( widget );
 	if (frame)
 		frame->setFrameStyle( TQFrame::NoFrame );
 
 	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
@@ -307,7 +307,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
 	}
 
 	if (myWidget || (myLayoutItem && myLayoutItem->widget())) {
-            // TDEListView because it's missing a Q_OBJECT
+            // TDEListView because it's missing a TQ_OBJECT
             // FIXME: This is a nice idea in theory, but in practice it is
             // very confusing for the user not to see the empty list box
             // delineated from the rest of the greeter.
@@ -379,7 +379,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
 
 #ifdef DRAW_OUTLINE
 	// Draw bounding rect for this item
-	p->setPen( Qt::white );
+	p->setPen( TQt::white );
 	p->drawRect( area );
 #endif
 
@@ -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
@@ -663,7 +663,7 @@ KdmItem::parentWidget() const
   if (!this->parent())
     return 0;
 
-  if (parent()->tqt_cast(TQWIDGET_OBJECT_NAME_STRING))
+  if (parent()->tqt_cast("TQWidget"))
     return (TQWidget*)parent();
   return ((KdmItem*)parent())->parentWidget();
 }
diff --git a/tdm/kfrontend/themer/tdmitem.h b/tdm/kfrontend/themer/tdmitem.h
index d2aeed69c..ad07f16cb 100644
--- a/tdm/kfrontend/themer/tdmitem.h
+++ b/tdm/kfrontend/themer/tdmitem.h
@@ -81,7 +81,7 @@ class TQLayoutItem;
  */
 
 class KdmItem : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 
 	friend class KdmThemer;
 
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/tdmlabel.h b/tdm/kfrontend/themer/tdmlabel.h
index e45d68091..37b10be56 100644
--- a/tdm/kfrontend/themer/tdmlabel.h
+++ b/tdm/kfrontend/themer/tdmlabel.h
@@ -34,7 +34,7 @@ class TQTimer;
  */
 
 class KdmLabel : public KdmItem {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp
index 079135c1d..fa9e0fcf5 100644
--- a/tdm/kfrontend/themer/tdmpixmap.cpp
+++ b/tdm/kfrontend/themer/tdmpixmap.cpp
@@ -303,9 +303,9 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
 			float tint_alpha = pClass->alpha;
 
 			for (int y = 0; y < h; ++y) {
-				QRgb *ls = (QRgb *)scaledImage.scanLine( y );
+				TQRgb *ls = (TQRgb *)scaledImage.scanLine( y );
 				for (int x = 0; x < w; ++x) {
-					QRgb l = ls[x];
+					TQRgb l = ls[x];
 					int r = int( tqRed( l ) * tint_red );
 					int g = int( tqGreen( l ) * tint_green );
 					int b = int( tqBlue( l ) * tint_blue );
diff --git a/tdm/kfrontend/themer/tdmpixmap.h b/tdm/kfrontend/themer/tdmpixmap.h
index faa71a034..90d0a38aa 100644
--- a/tdm/kfrontend/themer/tdmpixmap.h
+++ b/tdm/kfrontend/themer/tdmpixmap.h
@@ -35,7 +35,7 @@
  */
 
 class KdmPixmap : public KdmItem {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmrect.cpp b/tdm/kfrontend/themer/tdmrect.cpp
index a92b0f679..bb4023cd4 100644
--- a/tdm/kfrontend/themer/tdmrect.cpp
+++ b/tdm/kfrontend/themer/tdmrect.cpp
@@ -182,7 +182,7 @@ KdmRect::setWidget( TQWidget *widget )
         if ( rect.normal.color.isValid() && widget ) 
         {
      	     TQPalette p = widget->palette();
-	     p.setColor( TQPalette::Normal, TQColorGroup::Text, rect.normal.color );
+	     p.setColor( TQPalette::Active, TQColorGroup::Text, rect.normal.color );
 	     widget->setPalette(p);
 	}
 	KdmItem::setWidget( widget );
diff --git a/tdm/kfrontend/themer/tdmrect.h b/tdm/kfrontend/themer/tdmrect.h
index 6dfdc126a..8c436ccda 100644
--- a/tdm/kfrontend/themer/tdmrect.h
+++ b/tdm/kfrontend/themer/tdmrect.h
@@ -32,7 +32,7 @@
  */
 
 class KdmRect : public KdmItem {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KdmRect( KdmItem *parent, const TQDomNode &node, const char *name = 0 );
diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp
index 6c27b7629..f064e384a 100644
--- a/tdm/kfrontend/themer/tdmthemer.cpp
+++ b/tdm/kfrontend/themer/tdmthemer.cpp
@@ -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()) )
 */
 }
 
@@ -139,19 +139,19 @@ KdmThemer::widgetEvent( TQEvent *e )
 	switch (e->type()) {
 	case TQEvent::MouseMove:
 		{
-			TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+			TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
 			rootItem->mouseEvent( me->x(), me->y() );
 		}
 		break;
 	case TQEvent::MouseButtonPress:
 		{
-			TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+			TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
 			rootItem->mouseEvent( me->x(), me->y(), true );
 		}
 		break;
 	case TQEvent::MouseButtonRelease:
 		{
-			TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+			TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
 			rootItem->mouseEvent( me->x(), me->y(), false, true );
 		}
 		break;
@@ -164,7 +164,7 @@ KdmThemer::widgetEvent( TQEvent *e )
 		break;
 	case TQEvent::Paint:
 		{
-			TQRect paintRect = TQT_TQPAINTEVENT(e)->rect();
+			TQRect paintRect = static_cast<TQPaintEvent*>(e)->rect();
 			kdDebug() << timestamp() << " paint on: " << paintRect << endl;
 
 			if (!argb_visual_available) {
@@ -411,7 +411,7 @@ KdmThemer::slotActivated( const TQString &id )
 	}
 	
 	item->widget()->setFocus();
-	TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING);
+	TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast("TQLineEdit");
 	if (le) {
 		le->selectAll();
 	}
@@ -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/tdm/kfrontend/themer/tdmthemer.h b/tdm/kfrontend/themer/tdmthemer.h
index 785a116da..7b9cd2049 100644
--- a/tdm/kfrontend/themer/tdmthemer.h
+++ b/tdm/kfrontend/themer/tdmthemer.h
@@ -49,7 +49,7 @@ class TQEvent;
 
 
 class KdmThemer : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	/*
diff --git a/tdm/tdm.service.cmake b/tdm/tdm.service.cmake
new file mode 100644
index 000000000..37befc1d5
--- /dev/null
+++ b/tdm/tdm.service.cmake
@@ -0,0 +1,13 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm-trinity(1)
+Conflicts=getty@tty7.service
+After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=@BIN_INSTALL_DIR@/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/tdm/tdm.service.debian.cmake b/tdm/tdm.service.debian.cmake
new file mode 100644
index 000000000..3ba232aa1
--- /dev/null
+++ b/tdm/tdm.service.debian.cmake
@@ -0,0 +1,15 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm-trinity(1)
+Conflicts=getty@tty7.service
+After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service
+
+[Service]
+# temporary safety check until all DMs are converted to correct
+# display-manager.service symlink handling
+ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]'
+ExecStart=@BIN_INSTALL_DIR@/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service
diff --git a/tdm/tdm.service.fedora-18.cmake b/tdm/tdm.service.fedora-18.cmake
new file mode 100644
index 000000000..cd1bdc54d
--- /dev/null
+++ b/tdm/tdm.service.fedora-18.cmake
@@ -0,0 +1,13 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm-trinity(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service livesys-late.service systemd-logind.service
+
+[Service]
+ExecStart=@BIN_INSTALL_DIR@/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/tdm/tdm.service.fedora-19.cmake b/tdm/tdm.service.fedora-19.cmake
new file mode 100644
index 000000000..9b57961e3
--- /dev/null
+++ b/tdm/tdm.service.fedora-19.cmake
@@ -0,0 +1,13 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm-trinity(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=@BIN_INSTALL_DIR@/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/tdm/tdm.service.fedora.cmake b/tdm/tdm.service.fedora.cmake
new file mode 100644
index 000000000..9b57961e3
--- /dev/null
+++ b/tdm/tdm.service.fedora.cmake
@@ -0,0 +1,13 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm-trinity(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=@BIN_INSTALL_DIR@/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/tdm/tdm.service.rhel.cmake b/tdm/tdm.service.rhel.cmake
new file mode 100644
index 000000000..9b57961e3
--- /dev/null
+++ b/tdm/tdm.service.rhel.cmake
@@ -0,0 +1,13 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm-trinity(1)
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+
+[Service]
+ExecStart=@BIN_INSTALL_DIR@/tdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/tdm/tdm.service.ubuntu.cmake b/tdm/tdm.service.ubuntu.cmake
new file mode 100644
index 000000000..3ba232aa1
--- /dev/null
+++ b/tdm/tdm.service.ubuntu.cmake
@@ -0,0 +1,15 @@
+[Unit]
+Description=Trinity Display Manager
+Documentation=man:tdm-trinity(1)
+Conflicts=getty@tty7.service
+After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service
+
+[Service]
+# temporary safety check until all DMs are converted to correct
+# display-manager.service symlink handling
+ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]'
+ExecStart=@BIN_INSTALL_DIR@/tdm
+Restart=always
+
+[Install]
+Alias=display-manager.service
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 996754181..7a04b7fea 100644
--- a/tdmlib/kgreet_classic.cpp
+++ b/tdmlib/kgreet_classic.cpp
@@ -83,7 +83,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 
 	if (!themer)
 		grid = new TQGridLayout( 0, 0, 10 );
-		layoutItem = TQT_TQLAYOUTITEM(grid);
+		layoutItem = grid;
 
 	loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
 	loginEdit = 0;
@@ -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;
@@ -174,7 +174,7 @@ KClassicGreeter::~KClassicGreeter()
 		delete passwdEdit;
 		return;
 	}
-	TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		 delete itm->widget();
 	delete layoutItem;
diff --git a/tdmlib/kgreet_classic.h b/tdmlib/kgreet_classic.h
index 3f36d5000..f5dc52122 100644
--- a/tdmlib/kgreet_classic.h
+++ b/tdmlib/kgreet_classic.h
@@ -37,7 +37,7 @@ class TQGridLayout;
 class TQLabel;
 
 class KClassicGreeter : public TQObject, public KGreeterPlugin {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
 	KClassicGreeter( KGreeterPluginHandler *handler,
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
index e7a5f0747..1f6da138c 100644
--- a/tdmlib/kgreet_pam.cpp
+++ b/tdmlib/kgreet_pam.cpp
@@ -55,7 +55,7 @@ protected:
 	virtual void contextMenuEvent( TQContextMenuEvent * ) {}
 };
 
-static FILE* log;
+static FILE *logFile;
 static void kg_debug(const char* fmt, ...)
 {
     va_list lst;
@@ -63,8 +63,8 @@ static void kg_debug(const char* fmt, ...)
 
 #ifdef PAM_GREETER_DEBUG
 #if 0
-    vfprintf(log, fmt, lst);
-    fflush(log);
+    vfprintf(logFile, fmt, lst);
+    fflush(logFile);
 #else
     char buf[6000];
     sprintf(buf, "*** %s\n", fmt);
@@ -111,7 +111,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
         m_themer = themer;
 
 	if (!themer)
-		layoutItem = TQT_TQLAYOUTITEM(new TQGridLayout( 0, 0, 10 ));
+		layoutItem = new TQGridLayout( 0, 0, 10 );
 
         loginLabel = 0;
         authLabel.clear();
@@ -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;
@@ -211,7 +211,7 @@ KPamGreeter::~KPamGreeter()
 		delete loginEdit;
 		return;
 	}
-	TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		 delete itm->widget();
 	delete layoutItem;
@@ -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
@@ -691,9 +691,11 @@ static bool init( const TQString &,
 static void done( void )
 {
 	TDEGlobal::locale()->removeCatalogue( "kgreet_pam" );
-        if (log && log != stderr)
-	    fclose(log);
-        log = 0;
+	if (logFile && (logFile != stderr))
+	{
+	    fclose(logFile);
+	}
+	logFile = 0;
 }
 
 static KGreeterPlugin *
diff --git a/tdmlib/kgreet_pam.h b/tdmlib/kgreet_pam.h
index f579f9522..98e3315b1 100644
--- a/tdmlib/kgreet_pam.h
+++ b/tdmlib/kgreet_pam.h
@@ -37,7 +37,7 @@ class TQGridLayout;
 class TQLabel;
 
 class KPamGreeter : public TQObject, public KGreeterPlugin {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
 	KPamGreeter( KGreeterPluginHandler *handler,
@@ -68,7 +68,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
 	virtual void revive();
 	virtual void clear();
 
-        TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(TQT_TQLAYOUT(layoutItem)); }
+        TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(layoutItem); }
 
   public slots:
 	void slotLoginLostFocus();
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp
index 471095d7e..b7a9211b8 100644
--- a/tdmlib/kgreet_winbind.cpp
+++ b/tdmlib/kgreet_winbind.cpp
@@ -91,8 +91,10 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 		themer = 0;
 
 	if (!themer)
+	{
 		grid = new TQGridLayout( 0, 0, 10 );
-		layoutItem = TQT_TQLAYOUTITEM(grid);
+		layoutItem = grid;
+	}
 
 	domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
 	domainCombo = 0;
@@ -106,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 );
@@ -134,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 );
@@ -154,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();
@@ -215,7 +217,7 @@ KWinbindGreeter::~KWinbindGreeter()
 		delete domainCombo;
 		return;
 	}
-	TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout*>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		delete itm->widget();
 	delete layoutItem;
@@ -611,8 +613,8 @@ KWinbindGreeter::slotStartDomainList()
     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()));
+    connect(m_domainLister, TQ_SIGNAL(readReady(KProcIO*)), 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);
diff --git a/tdmlib/kgreet_winbind.h b/tdmlib/kgreet_winbind.h
index 85565628e..7bd8e59e6 100644
--- a/tdmlib/kgreet_winbind.h
+++ b/tdmlib/kgreet_winbind.h
@@ -41,7 +41,7 @@ class KdmThemer;
 class KProcIO;
 
 class KWinbindGreeter : public TQObject, public KGreeterPlugin {
-	Q_OBJECT
+	TQ_OBJECT
 
   public:
 	KWinbindGreeter( KGreeterPluginHandler *handler,
diff --git a/tqt3integration/libtqttde/tqttde.cpp b/tqt3integration/libtqttde/tqttde.cpp
index 3647db8a2..45b0a8b96 100644
--- a/tqt3integration/libtqttde/tqttde.cpp
+++ b/tqt3integration/libtqttde/tqttde.cpp
@@ -90,7 +90,7 @@ static DCOPClient* dcopClient()
         if( !tqApp->inherits( "TDEApplication" )) // KApp 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/libtqttde/tqttde.h b/tqt3integration/libtqttde/tqttde.h
index 2d634df07..06cba49ed 100644
--- a/tqt3integration/libtqttde/tqttde.h
+++ b/tqt3integration/libtqttde/tqttde.h
@@ -26,7 +26,7 @@
 class tqttde_EventLoop
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
 
     public slots:
         void block( bool );
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp
index e397105b1..9a7d8f6e3 100644
--- a/tqt3integration/module/module.cpp
+++ b/tqt3integration/module/module.cpp
@@ -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/module/module.h b/tqt3integration/module/module.h
index cf136aa8c..f32ef85e2 100644
--- a/tqt3integration/module/module.h
+++ b/tqt3integration/module/module.h
@@ -36,7 +36,7 @@ namespace TDEIntegration
 class Module
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         Module( const TQCString& obj );
@@ -69,7 +69,7 @@ class Module
 class KFileDialog
     : public ::KFileDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KFileDialog(const TQString& startDir, const TQString& filter,
@@ -86,7 +86,7 @@ class KFileDialog
 class KDirSelectDialog
     : public ::KDirSelectDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KDirSelectDialog(const TQString& startDir, bool localOnly,
@@ -103,7 +103,7 @@ class KDirSelectDialog
 class KColorDialog
     : public ::KColorDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KColorDialog( TQWidget *parent, const char *name, bool modal )
@@ -118,7 +118,7 @@ class KColorDialog
 class TDEFontDialog
     : public ::TDEFontDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         TDEFontDialog( TQWidget *parent, const char *name, bool onlyFixed, bool modal,
@@ -135,7 +135,7 @@ class TDEFontDialog
 class KDialogBase
     : public ::KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KDialogBase( const TQString &caption, int buttonMask=Yes|No|Cancel,
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/translations/desktop_files/applnk-compat/af.po b/translations/desktop_files/applnk-compat/af.po
index 80150452a..16c95cc16 100644
--- a/translations/desktop_files/applnk-compat/af.po
+++ b/translations/desktop_files/applnk-compat/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/applnk-compat.pot b/translations/desktop_files/applnk-compat/applnk-compat.pot
index a414ed470..9a1e9b8de 100644
--- a/translations/desktop_files/applnk-compat/applnk-compat.pot
+++ b/translations/desktop_files/applnk-compat/applnk-compat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
@@ -17,8 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: battery.desktop:2 bwarning.desktop:2
-#: cwarning.desktop:2 power.desktop:2
+#: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
 msgid "Laptop"
 msgstr ""
 
diff --git a/translations/desktop_files/applnk-compat/ar.po b/translations/desktop_files/applnk-compat/ar.po
index 365cc9211..23dd64ca7 100644
--- a/translations/desktop_files/applnk-compat/ar.po
+++ b/translations/desktop_files/applnk-compat/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/az.po b/translations/desktop_files/applnk-compat/az.po
index 210a7def7..d622f65b2 100644
--- a/translations/desktop_files/applnk-compat/az.po
+++ b/translations/desktop_files/applnk-compat/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/be.po b/translations/desktop_files/applnk-compat/be.po
index 5ec2d025d..ac7e08fb7 100644
--- a/translations/desktop_files/applnk-compat/be.po
+++ b/translations/desktop_files/applnk-compat/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/bg.po b/translations/desktop_files/applnk-compat/bg.po
index 0fb9474d0..c7508812b 100644
--- a/translations/desktop_files/applnk-compat/bg.po
+++ b/translations/desktop_files/applnk-compat/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\n"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
 "PO-Revision-Date: 2020-07-12 20:05+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/applnk-compat/bn.po b/translations/desktop_files/applnk-compat/bn.po
index 331e77856..7d18cc798 100644
--- a/translations/desktop_files/applnk-compat/bn.po
+++ b/translations/desktop_files/applnk-compat/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/br.po b/translations/desktop_files/applnk-compat/br.po
index b42f0a06a..1539fddf9 100644
--- a/translations/desktop_files/applnk-compat/br.po
+++ b/translations/desktop_files/applnk-compat/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/bs.po b/translations/desktop_files/applnk-compat/bs.po
index ca2c37d02..44984496d 100644
--- a/translations/desktop_files/applnk-compat/bs.po
+++ b/translations/desktop_files/applnk-compat/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ca.po b/translations/desktop_files/applnk-compat/ca.po
index 21381afbd..ef1357d7c 100644
--- a/translations/desktop_files/applnk-compat/ca.po
+++ b/translations/desktop_files/applnk-compat/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/cs.po b/translations/desktop_files/applnk-compat/cs.po
index 87297bafb..168d0e5b4 100644
--- a/translations/desktop_files/applnk-compat/cs.po
+++ b/translations/desktop_files/applnk-compat/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+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: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/applnk-compat/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.2.2\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -24,7 +25,7 @@ msgstr "Notebook"
 #. Name
 #: email.desktop:10
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. Comment
 #: email.desktop:11
@@ -51,7 +52,7 @@ msgstr "Správce souborů"
 #. Name
 #: kcmkxmlrpcd.desktop:2
 msgid "XML RPC Daemon"
-msgstr "TDE XML RPC démon"
+msgstr "XML RPC démon"
 
 #. Name
 #: konqhtml.desktop:2
@@ -71,12 +72,12 @@ msgstr "Nastavení hesel"
 #. Keywords
 #: passwords.desktop:15
 msgid "Passwords;tdesu;Echo characters;Remember passwords;Timeout;"
-msgstr "Heslo;tdesu;Zapamatování hesla;Prodleva;"
+msgstr "Heslo;tdesu;Zobrazování znaků;Zapamatování hesla;Prodleva;"
 
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Socks"
 
 #. Name
 #: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-compat/csb.po b/translations/desktop_files/applnk-compat/csb.po
index b03ed62d2..c0091221a 100644
--- a/translations/desktop_files/applnk-compat/csb.po
+++ b/translations/desktop_files/applnk-compat/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/cy.po b/translations/desktop_files/applnk-compat/cy.po
index a49725fad..e42f491ce 100644
--- a/translations/desktop_files/applnk-compat/cy.po
+++ b/translations/desktop_files/applnk-compat/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/da.po b/translations/desktop_files/applnk-compat/da.po
index 1dd2eb53d..ee75c0b5f 100644
--- a/translations/desktop_files/applnk-compat/da.po
+++ b/translations/desktop_files/applnk-compat/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/de.po b/translations/desktop_files/applnk-compat/de.po
index 103a9d8d1..c320d16e3 100644
--- a/translations/desktop_files/applnk-compat/de.po
+++ b/translations/desktop_files/applnk-compat/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/el.po b/translations/desktop_files/applnk-compat/el.po
index 34d16e469..076368d0e 100644
--- a/translations/desktop_files/applnk-compat/el.po
+++ b/translations/desktop_files/applnk-compat/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/en_GB.po b/translations/desktop_files/applnk-compat/en_GB.po
index 8d0cfe0f8..36e8d34a1 100644
--- a/translations/desktop_files/applnk-compat/en_GB.po
+++ b/translations/desktop_files/applnk-compat/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/eo.po b/translations/desktop_files/applnk-compat/eo.po
index 84e20f934..bae8e3faa 100644
--- a/translations/desktop_files/applnk-compat/eo.po
+++ b/translations/desktop_files/applnk-compat/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/es.po b/translations/desktop_files/applnk-compat/es.po
index 19244436a..581b22a09 100644
--- a/translations/desktop_files/applnk-compat/es.po
+++ b/translations/desktop_files/applnk-compat/es.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+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: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2022-08-29 21:55+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-compat/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.13.1\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -81,7 +82,7 @@ msgstr ""
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "SOCKS"
 
 #. Name
 #: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-compat/et.po b/translations/desktop_files/applnk-compat/et.po
index 5245e2ed5..d52e94006 100644
--- a/translations/desktop_files/applnk-compat/et.po
+++ b/translations/desktop_files/applnk-compat/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/eu.po b/translations/desktop_files/applnk-compat/eu.po
index 490143970..d053dcd93 100644
--- a/translations/desktop_files/applnk-compat/eu.po
+++ b/translations/desktop_files/applnk-compat/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/fa.po b/translations/desktop_files/applnk-compat/fa.po
index 2e508b526..61a2aef28 100644
--- a/translations/desktop_files/applnk-compat/fa.po
+++ b/translations/desktop_files/applnk-compat/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/fi.po b/translations/desktop_files/applnk-compat/fi.po
index dff9ec1ca..81ceeb28e 100644
--- a/translations/desktop_files/applnk-compat/fi.po
+++ b/translations/desktop_files/applnk-compat/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/fo.po b/translations/desktop_files/applnk-compat/fo.po
index 6d3c9bec9..ae22492df 100644
--- a/translations/desktop_files/applnk-compat/fo.po
+++ b/translations/desktop_files/applnk-compat/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/fr.po b/translations/desktop_files/applnk-compat/fr.po
index 8d1042b24..ad0a372bc 100644
--- a/translations/desktop_files/applnk-compat/fr.po
+++ b/translations/desktop_files/applnk-compat/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/fy.po b/translations/desktop_files/applnk-compat/fy.po
index fd60269f4..65e28bef2 100644
--- a/translations/desktop_files/applnk-compat/fy.po
+++ b/translations/desktop_files/applnk-compat/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ga.po b/translations/desktop_files/applnk-compat/ga.po
index 10a527e4b..830b53ef7 100644
--- a/translations/desktop_files/applnk-compat/ga.po
+++ b/translations/desktop_files/applnk-compat/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/gl.po b/translations/desktop_files/applnk-compat/gl.po
index d6f15c41d..b36994030 100644
--- a/translations/desktop_files/applnk-compat/gl.po
+++ b/translations/desktop_files/applnk-compat/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/he.po b/translations/desktop_files/applnk-compat/he.po
index d92f7db01..9594f2055 100644
--- a/translations/desktop_files/applnk-compat/he.po
+++ b/translations/desktop_files/applnk-compat/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/hi.po b/translations/desktop_files/applnk-compat/hi.po
index 4e54ee733..e2e6bc4ae 100644
--- a/translations/desktop_files/applnk-compat/hi.po
+++ b/translations/desktop_files/applnk-compat/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/hr.po b/translations/desktop_files/applnk-compat/hr.po
index 0d005bfab..b4f174dd3 100644
--- a/translations/desktop_files/applnk-compat/hr.po
+++ b/translations/desktop_files/applnk-compat/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/hsb.po b/translations/desktop_files/applnk-compat/hsb.po
index d79a8958e..667dddc76 100644
--- a/translations/desktop_files/applnk-compat/hsb.po
+++ b/translations/desktop_files/applnk-compat/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/hu.po b/translations/desktop_files/applnk-compat/hu.po
index 209852ced..982ab6ee6 100644
--- a/translations/desktop_files/applnk-compat/hu.po
+++ b/translations/desktop_files/applnk-compat/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/id.po b/translations/desktop_files/applnk-compat/id.po
index 22bb45c91..ca11123f7 100644
--- a/translations/desktop_files/applnk-compat/id.po
+++ b/translations/desktop_files/applnk-compat/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/is.po b/translations/desktop_files/applnk-compat/is.po
index f226e21bf..6ad31b77b 100644
--- a/translations/desktop_files/applnk-compat/is.po
+++ b/translations/desktop_files/applnk-compat/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/it.po b/translations/desktop_files/applnk-compat/it.po
index 19edea14f..a14fd4632 100644
--- a/translations/desktop_files/applnk-compat/it.po
+++ b/translations/desktop_files/applnk-compat/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+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: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2021-04-18 18:00+0000\n"
+"Last-Translator: Fiflagar Lorizen <fiflagar.lorizen@posteo.net>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-compat/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.5.3\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -80,7 +81,7 @@ msgstr "Password;tdesu;caratteri password;ricorda password;tempo massimo;"
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Socks"
 
 #. Name
 #: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-compat/ja.po b/translations/desktop_files/applnk-compat/ja.po
index 5d1eed96e..0cdf5fab5 100644
--- a/translations/desktop_files/applnk-compat/ja.po
+++ b/translations/desktop_files/applnk-compat/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ka.po b/translations/desktop_files/applnk-compat/ka.po
index d38b2de31..9eccd7308 100644
--- a/translations/desktop_files/applnk-compat/ka.po
+++ b/translations/desktop_files/applnk-compat/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/kk.po b/translations/desktop_files/applnk-compat/kk.po
index c5f92a48a..fabf0d5bd 100644
--- a/translations/desktop_files/applnk-compat/kk.po
+++ b/translations/desktop_files/applnk-compat/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/km.po b/translations/desktop_files/applnk-compat/km.po
index 32c023698..46a1d1136 100644
--- a/translations/desktop_files/applnk-compat/km.po
+++ b/translations/desktop_files/applnk-compat/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ko.po b/translations/desktop_files/applnk-compat/ko.po
index 5cd73d8ae..a650c0c26 100644
--- a/translations/desktop_files/applnk-compat/ko.po
+++ b/translations/desktop_files/applnk-compat/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/lo.po b/translations/desktop_files/applnk-compat/lo.po
index 2dc34f2a8..40a611115 100644
--- a/translations/desktop_files/applnk-compat/lo.po
+++ b/translations/desktop_files/applnk-compat/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/lt.po b/translations/desktop_files/applnk-compat/lt.po
index 5821ca660..416733b7c 100644
--- a/translations/desktop_files/applnk-compat/lt.po
+++ b/translations/desktop_files/applnk-compat/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/lv.po b/translations/desktop_files/applnk-compat/lv.po
index 08065d9a5..411ce0282 100644
--- a/translations/desktop_files/applnk-compat/lv.po
+++ b/translations/desktop_files/applnk-compat/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/mk.po b/translations/desktop_files/applnk-compat/mk.po
index ac1add102..f4cde870f 100644
--- a/translations/desktop_files/applnk-compat/mk.po
+++ b/translations/desktop_files/applnk-compat/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/mn.po b/translations/desktop_files/applnk-compat/mn.po
index 659cb8d88..ea28e875c 100644
--- a/translations/desktop_files/applnk-compat/mn.po
+++ b/translations/desktop_files/applnk-compat/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ms.po b/translations/desktop_files/applnk-compat/ms.po
index a77300649..7cb50d221 100644
--- a/translations/desktop_files/applnk-compat/ms.po
+++ b/translations/desktop_files/applnk-compat/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/mt.po b/translations/desktop_files/applnk-compat/mt.po
index 408945ee2..fc852d56c 100644
--- a/translations/desktop_files/applnk-compat/mt.po
+++ b/translations/desktop_files/applnk-compat/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/nb.po b/translations/desktop_files/applnk-compat/nb.po
index c60a52cfb..4c030fcf8 100644
--- a/translations/desktop_files/applnk-compat/nb.po
+++ b/translations/desktop_files/applnk-compat/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/nds.po b/translations/desktop_files/applnk-compat/nds.po
index a6b91884a..d021a0e06 100644
--- a/translations/desktop_files/applnk-compat/nds.po
+++ b/translations/desktop_files/applnk-compat/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ne.po b/translations/desktop_files/applnk-compat/ne.po
index d44c3a232..8649fb14b 100644
--- a/translations/desktop_files/applnk-compat/ne.po
+++ b/translations/desktop_files/applnk-compat/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/nl.po b/translations/desktop_files/applnk-compat/nl.po
index 723b37f24..d2f9aa819 100644
--- a/translations/desktop_files/applnk-compat/nl.po
+++ b/translations/desktop_files/applnk-compat/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/nn.po b/translations/desktop_files/applnk-compat/nn.po
index 1903a3d7e..7a191d43d 100644
--- a/translations/desktop_files/applnk-compat/nn.po
+++ b/translations/desktop_files/applnk-compat/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/nso.po b/translations/desktop_files/applnk-compat/nso.po
index 097c714f6..291a2755f 100644
--- a/translations/desktop_files/applnk-compat/nso.po
+++ b/translations/desktop_files/applnk-compat/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/oc.po b/translations/desktop_files/applnk-compat/oc.po
index 222aa3b6c..02f768705 100644
--- a/translations/desktop_files/applnk-compat/oc.po
+++ b/translations/desktop_files/applnk-compat/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/pa.po b/translations/desktop_files/applnk-compat/pa.po
index 7aef8424c..252ec96b3 100644
--- a/translations/desktop_files/applnk-compat/pa.po
+++ b/translations/desktop_files/applnk-compat/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/pl.po b/translations/desktop_files/applnk-compat/pl.po
index c435f8e17..30cd47eb2 100644
--- a/translations/desktop_files/applnk-compat/pl.po
+++ b/translations/desktop_files/applnk-compat/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+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: 2021-07-07 18:16+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/"
+"projects/tdebase/applnk-compat/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.8.1\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
 msgid "Laptop"
-msgstr ""
+msgstr "Laptop"
 
 #. Name
 #: email.desktop:10
@@ -79,7 +81,7 @@ msgstr ""
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Proxy SOCKS"
 
 #. Name
 #: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-compat/pt.po b/translations/desktop_files/applnk-compat/pt.po
index 9d7163e01..099d09bd9 100644
--- a/translations/desktop_files/applnk-compat/pt.po
+++ b/translations/desktop_files/applnk-compat/pt.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+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: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2021-03-10 14:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-compat/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.5.1\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -64,22 +65,23 @@ msgstr "Navegador Konqueror"
 #. Name
 #: passwords.desktop:11
 msgid "Passwords"
-msgstr "Senhas"
+msgstr "Palavras-passe"
 
 #. Comment
 #: passwords.desktop:13
 msgid "Configure password settings"
-msgstr "Configurar as opções das senhas"
+msgstr "Configurar as opções das palavras-passe"
 
 #. Keywords
 #: passwords.desktop:15
 msgid "Passwords;tdesu;Echo characters;Remember passwords;Timeout;"
-msgstr "Senhas;tdesu;caracteres de eco;lembrar a senha;tempo limite;"
+msgstr ""
+"Palavras-passe;tdesu;caracteres de eco;lembrar a palavra-passe;tempo limite;"
 
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Socks"
 
 #. Name
 #: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-compat/pt_BR.po b/translations/desktop_files/applnk-compat/pt_BR.po
index 6fc6b70d3..770cd8408 100644
--- a/translations/desktop_files/applnk-compat/pt_BR.po
+++ b/translations/desktop_files/applnk-compat/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-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ro.po b/translations/desktop_files/applnk-compat/ro.po
index 5de5a1239..55eb536a3 100644
--- a/translations/desktop_files/applnk-compat/ro.po
+++ b/translations/desktop_files/applnk-compat/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ru.po b/translations/desktop_files/applnk-compat/ru.po
index 7f31be9b3..bd71f2d99 100644
--- a/translations/desktop_files/applnk-compat/ru.po
+++ b/translations/desktop_files/applnk-compat/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>, 2021, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+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: 2021-07-07 18:16+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/applnk-compat/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
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
@@ -40,6 +43,13 @@ msgid ""
 "Current Profile;Profile;Organization;Incoming Host;Outgoing Host;Email "
 "Client;"
 msgstr ""
+"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;Электронна� почта;Почта;Эл. почта;�дре�;Почтовый �ервер;Локальный "
+"почтовый �щик;почтовый �щик;Информаци� о пользователе;�дре� ответа;"
+"Информаци� о �ервере;Им� пользовател�;Пароли;Хо�т;Текущий "
+"профиль;Профиль;Организаци�;Вход�щий хо�т;И�ход�щий хо�т;Почтовый клиент;"
 
 #. Name
 #: kcmkonq.desktop:2
@@ -49,7 +59,7 @@ msgstr "Файловый менеджер"
 #. Name
 #: kcmkxmlrpcd.desktop:2
 msgid "XML RPC Daemon"
-msgstr "Служба XML RPC"
+msgstr "Демон XML RPC"
 
 #. Name
 #: konqhtml.desktop:2
@@ -70,11 +80,13 @@ msgstr "�а�тройка паролей"
 #: passwords.desktop:15
 msgid "Passwords;tdesu;Echo characters;Remember passwords;Timeout;"
 msgstr ""
+"Passwords;tdesu;Echo characters;Remember passwords;Timeout;Пароли;"
+"Запоминание паролей;Сохранение паролей;Тайм-аут;"
 
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Socks"
 
 #. Name
 #: userinfo.desktop:13
diff --git a/translations/desktop_files/applnk-compat/rw.po b/translations/desktop_files/applnk-compat/rw.po
index 76a53b621..aa9bf1966 100644
--- a/translations/desktop_files/applnk-compat/rw.po
+++ b/translations/desktop_files/applnk-compat/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/se.po b/translations/desktop_files/applnk-compat/se.po
index 1a43b1fbe..4e5394d2f 100644
--- a/translations/desktop_files/applnk-compat/se.po
+++ b/translations/desktop_files/applnk-compat/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/sk.po b/translations/desktop_files/applnk-compat/sk.po
index 2f5a203f2..3f6f6b4bf 100644
--- a/translations/desktop_files/applnk-compat/sk.po
+++ b/translations/desktop_files/applnk-compat/sk.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+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: 2021-07-07 18:16+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/"
+"projects/tdebase/applnk-compat/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Name
 #: battery.desktop:2 bwarning.desktop:2 cwarning.desktop:2 power.desktop:2
 msgid "Laptop"
-msgstr ""
+msgstr "Notebook"
 
 #. Name
 #: email.desktop:10
@@ -58,7 +59,7 @@ msgstr "XML RPC démon"
 #. Name
 #: konqhtml.desktop:2
 msgid "Konqueror Browser"
-msgstr "Web priehliada� Konqueror"
+msgstr "Prehliada� Konqueror"
 
 #. Name
 #: passwords.desktop:11
@@ -78,7 +79,7 @@ msgstr "Heslá;tdesu;zobrazované znaky;zapamätanie hesiel;Timeout;"
 #. Name
 #: socks.desktop:2
 msgid "Socks"
-msgstr ""
+msgstr "Socks"
 
 #. Name
 #: userinfo.desktop:13
@@ -88,7 +89,7 @@ msgstr "Používateľský ú�et"
 #. Comment
 #: userinfo.desktop:14
 msgid "Change your account information"
-msgstr "Nastavenie informácií o vašom ú�te"
+msgstr "Nastavenie informácií o Vašom ú�te"
 
 #. Keywords
 #: userinfo.desktop:15
diff --git a/translations/desktop_files/applnk-compat/sl.po b/translations/desktop_files/applnk-compat/sl.po
index 2533c9bdc..5ac096122 100644
--- a/translations/desktop_files/applnk-compat/sl.po
+++ b/translations/desktop_files/applnk-compat/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/sr.po b/translations/desktop_files/applnk-compat/sr.po
index 174511c60..ca87f3fb8 100644
--- a/translations/desktop_files/applnk-compat/sr.po
+++ b/translations/desktop_files/applnk-compat/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/sr@Latn.po b/translations/desktop_files/applnk-compat/sr@Latn.po
index 3f6e8abf0..017335b55 100644
--- a/translations/desktop_files/applnk-compat/sr@Latn.po
+++ b/translations/desktop_files/applnk-compat/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-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ss.po b/translations/desktop_files/applnk-compat/ss.po
index 18d0652e0..34586256f 100644
--- a/translations/desktop_files/applnk-compat/ss.po
+++ b/translations/desktop_files/applnk-compat/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/sv.po b/translations/desktop_files/applnk-compat/sv.po
index 96e0d20ea..9fd3c7ee0 100644
--- a/translations/desktop_files/applnk-compat/sv.po
+++ b/translations/desktop_files/applnk-compat/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ta.po b/translations/desktop_files/applnk-compat/ta.po
index 20c413115..1721890a9 100644
--- a/translations/desktop_files/applnk-compat/ta.po
+++ b/translations/desktop_files/applnk-compat/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/te.po b/translations/desktop_files/applnk-compat/te.po
index df1555615..3dbcd79de 100644
--- a/translations/desktop_files/applnk-compat/te.po
+++ b/translations/desktop_files/applnk-compat/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/tg.po b/translations/desktop_files/applnk-compat/tg.po
index f438d6bb0..d735d1117 100644
--- a/translations/desktop_files/applnk-compat/tg.po
+++ b/translations/desktop_files/applnk-compat/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/th.po b/translations/desktop_files/applnk-compat/th.po
index 7f5880d48..f2e973c80 100644
--- a/translations/desktop_files/applnk-compat/th.po
+++ b/translations/desktop_files/applnk-compat/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/tr.po b/translations/desktop_files/applnk-compat/tr.po
index f04a57778..d030eb685 100644
--- a/translations/desktop_files/applnk-compat/tr.po
+++ b/translations/desktop_files/applnk-compat/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/tt.po b/translations/desktop_files/applnk-compat/tt.po
index c713d4316..58eb24bd7 100644
--- a/translations/desktop_files/applnk-compat/tt.po
+++ b/translations/desktop_files/applnk-compat/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/uk.po b/translations/desktop_files/applnk-compat/uk.po
index c5892db22..8f81faced 100644
--- a/translations/desktop_files/applnk-compat/uk.po
+++ b/translations/desktop_files/applnk-compat/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\n"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/applnk-compat/uz.po b/translations/desktop_files/applnk-compat/uz.po
index 052354941..598e81136 100644
--- a/translations/desktop_files/applnk-compat/uz.po
+++ b/translations/desktop_files/applnk-compat/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/uz@cyrillic.po b/translations/desktop_files/applnk-compat/uz@cyrillic.po
index 1551bc79a..b7f612d69 100644
--- a/translations/desktop_files/applnk-compat/uz@cyrillic.po
+++ b/translations/desktop_files/applnk-compat/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-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/ven.po b/translations/desktop_files/applnk-compat/ven.po
index a679c5ad1..a3caeac14 100644
--- a/translations/desktop_files/applnk-compat/ven.po
+++ b/translations/desktop_files/applnk-compat/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/vi.po b/translations/desktop_files/applnk-compat/vi.po
index 89ac69c34..95301de37 100644
--- a/translations/desktop_files/applnk-compat/vi.po
+++ b/translations/desktop_files/applnk-compat/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/wa.po b/translations/desktop_files/applnk-compat/wa.po
index 62f58ec32..e8d1f0de7 100644
--- a/translations/desktop_files/applnk-compat/wa.po
+++ b/translations/desktop_files/applnk-compat/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/xh.po b/translations/desktop_files/applnk-compat/xh.po
index 3a2b228bb..a1dcc7f18 100644
--- a/translations/desktop_files/applnk-compat/xh.po
+++ b/translations/desktop_files/applnk-compat/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/zh_CN.po b/translations/desktop_files/applnk-compat/zh_CN.po
index 8b8b4760d..153a1c351 100644
--- a/translations/desktop_files/applnk-compat/zh_CN.po
+++ b/translations/desktop_files/applnk-compat/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-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/zh_TW.po b/translations/desktop_files/applnk-compat/zh_TW.po
index 49e6729de..74557d0a0 100644
--- a/translations/desktop_files/applnk-compat/zh_TW.po
+++ b/translations/desktop_files/applnk-compat/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-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-compat/zu.po b/translations/desktop_files/applnk-compat/zu.po
index a6d44bfdd..af19464e8 100644
--- a/translations/desktop_files/applnk-compat/zu.po
+++ b/translations/desktop_files/applnk-compat/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 17:00+0200\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"
diff --git a/translations/desktop_files/applnk-directories/af.po b/translations/desktop_files/applnk-directories/af.po
index 6215d6105..40bb1ca49 100644
--- a/translations/desktop_files/applnk-directories/af.po
+++ b/translations/desktop_files/applnk-directories/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/applnk-directories.pot b/translations/desktop_files/applnk-directories/applnk-directories.pot
index 6a3564963..a9183b3a6 100644
--- a/translations/desktop_files/applnk-directories/applnk-directories.pot
+++ b/translations/desktop_files/applnk-directories/applnk-directories.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
@@ -33,11 +33,10 @@ msgid "Web Development"
 msgstr ""
 
 #. 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
+#: 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 ""
 
@@ -87,8 +86,7 @@ msgid "Games for Kids"
 msgstr ""
 
 #. Name
-#: kde-games-strategy.directory:4
-#: tde-games-strategy.directory:4
+#: kde-games-strategy.directory:4 tde-games-strategy.directory:4
 msgid "Tactics & Strategy"
 msgstr ""
 
@@ -107,17 +105,14 @@ msgstr ""
 
 #. Name
 #. Comment
-#: kde-utilities-desktop.directory:4
-#: tde-settings-desktop.directory:4
-#: tde-utilities-desktop.directory:4
-#: tde-utilities-desktop.directory:6
+#: kde-utilities-desktop.directory:4 tde-settings-desktop.directory:4
+#: tde-utilities-desktop.directory:4 tde-utilities-desktop.directory:6
 msgid "Desktop"
 msgstr ""
 
 #. Name
 #. Comment
-#: kde-utilities-pim.directory:4
-#: tde-utilities-pim.directory:4
+#: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
 msgstr ""
@@ -158,8 +153,7 @@ msgid "Graphics"
 msgstr ""
 
 #. Name
-#: tde-internet-terminal.directory:4
-#: tde-system-terminal.directory:4
+#: tde-internet-terminal.directory:4 tde-system-terminal.directory:4
 msgid "Terminal Applications"
 msgstr ""
 
@@ -226,8 +220,7 @@ msgstr ""
 
 #. Name
 #. Comment
-#: tde-settings-peripherals.directory:4
-#: tde-utilities-peripherals.directory:4
+#: tde-settings-peripherals.directory:4 tde-utilities-peripherals.directory:4
 #: tde-utilities-peripherals.directory:6
 msgid "Peripherals"
 msgstr ""
@@ -294,8 +287,7 @@ msgstr ""
 
 #. Name
 #. Comment
-#: tde-utilities-file.directory:4
-#: tde-utilities-file.directory:6
+#: tde-utilities-file.directory:4 tde-utilities-file.directory:6
 msgid "File"
 msgstr ""
 
diff --git a/translations/desktop_files/applnk-directories/ar.po b/translations/desktop_files/applnk-directories/ar.po
index d6908f9d7..dee315a8b 100644
--- a/translations/desktop_files/applnk-directories/ar.po
+++ b/translations/desktop_files/applnk-directories/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/az.po b/translations/desktop_files/applnk-directories/az.po
index 46566a756..cf2367aea 100644
--- a/translations/desktop_files/applnk-directories/az.po
+++ b/translations/desktop_files/applnk-directories/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/be.po b/translations/desktop_files/applnk-directories/be.po
index 7dc08631f..a99b1e5f4 100644
--- a/translations/desktop_files/applnk-directories/be.po
+++ b/translations/desktop_files/applnk-directories/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/bg.po b/translations/desktop_files/applnk-directories/bg.po
index 95b57c18e..38164abe1 100644
--- a/translations/desktop_files/applnk-directories/bg.po
+++ b/translations/desktop_files/applnk-directories/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\n"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
 "PO-Revision-Date: 2020-07-12 20:05+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/applnk-directories/bn.po b/translations/desktop_files/applnk-directories/bn.po
index 6c9eda59c..78a6edb6c 100644
--- a/translations/desktop_files/applnk-directories/bn.po
+++ b/translations/desktop_files/applnk-directories/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/br.po b/translations/desktop_files/applnk-directories/br.po
index db299e98a..bd54f1e0a 100644
--- a/translations/desktop_files/applnk-directories/br.po
+++ b/translations/desktop_files/applnk-directories/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/bs.po b/translations/desktop_files/applnk-directories/bs.po
index 150ce9619..31541b102 100644
--- a/translations/desktop_files/applnk-directories/bs.po
+++ b/translations/desktop_files/applnk-directories/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ca.po b/translations/desktop_files/applnk-directories/ca.po
index a14a5006d..d8cc5cf00 100644
--- a/translations/desktop_files/applnk-directories/ca.po
+++ b/translations/desktop_files/applnk-directories/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/cs.po b/translations/desktop_files/applnk-directories/cs.po
index a2fc8d91a..240cbce21 100644
--- a/translations/desktop_files/applnk-directories/cs.po
+++ b/translations/desktop_files/applnk-directories/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16: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"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/applnk-directories/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.2.2\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +39,7 @@ msgstr "Webový vývoj"
 #: 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 "Editory"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Jazyky"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematika"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Různé"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -115,7 +116,7 @@ msgstr "Pracovní plocha"
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr ""
+msgstr "PIM"
 
 #. Name
 #: tde-development-translation.directory:4
@@ -159,9 +160,8 @@ msgstr "Terminálové aplikace"
 
 #. Name
 #: tde-internet.directory:4
-#, fuzzy
 msgid "Internet"
-msgstr "Internet a síť"
+msgstr "Internet"
 
 #. Name
 #: tde-main.directory:5
@@ -182,7 +182,7 @@ msgstr "Multimédia"
 #. Comment
 #: tde-office-pim.directory:4 tde-office-pim.directory:6
 msgid "Personal Information Management"
-msgstr ""
+msgstr "Správa osobních informací"
 
 #. Name
 #: tde-office.directory:4
@@ -202,7 +202,7 @@ msgstr "Komponenty TDE"
 #. Name
 #: tde-settings-hardware.directory:4
 msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
 
 #. Name
 #: tde-settings-information.directory:4
diff --git a/translations/desktop_files/applnk-directories/csb.po b/translations/desktop_files/applnk-directories/csb.po
index 0922a256d..f340fc22f 100644
--- a/translations/desktop_files/applnk-directories/csb.po
+++ b/translations/desktop_files/applnk-directories/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/cy.po b/translations/desktop_files/applnk-directories/cy.po
index d251ed1dc..da75adc8a 100644
--- a/translations/desktop_files/applnk-directories/cy.po
+++ b/translations/desktop_files/applnk-directories/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/da.po b/translations/desktop_files/applnk-directories/da.po
index 6af6ca688..c80b89e39 100644
--- a/translations/desktop_files/applnk-directories/da.po
+++ b/translations/desktop_files/applnk-directories/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/de.po b/translations/desktop_files/applnk-directories/de.po
index 3af3fc973..daeab971f 100644
--- a/translations/desktop_files/applnk-directories/de.po
+++ b/translations/desktop_files/applnk-directories/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/el.po b/translations/desktop_files/applnk-directories/el.po
index f8327bc25..07ff75020 100644
--- a/translations/desktop_files/applnk-directories/el.po
+++ b/translations/desktop_files/applnk-directories/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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16: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"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2021-04-18 18:00+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/applnk-directories/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.5.3\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +39,7 @@ 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
@@ -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
@@ -68,7 +69,7 @@ msgstr "Επιστήμη"
 #. 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
@@ -115,7 +116,7 @@ msgstr "Επιφάνεια ε�γασίας"
 #: 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
@@ -134,9 +135,8 @@ msgstr "Εκπαίδευση"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "Παιχνίδια τ�που Rogue"
+msgstr "Παιχνίδια λογικής"
 
 #. Name
 #: tde-games-roguelikes.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
@@ -207,7 +207,7 @@ msgstr "Υλικό"
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "Πλη�οφο�ίες συσκευών"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -274,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/applnk-directories/en_GB.po b/translations/desktop_files/applnk-directories/en_GB.po
index cd90026db..e079cc2cc 100644
--- a/translations/desktop_files/applnk-directories/en_GB.po
+++ b/translations/desktop_files/applnk-directories/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/eo.po b/translations/desktop_files/applnk-directories/eo.po
index 00a62cd29..a612f2498 100644
--- a/translations/desktop_files/applnk-directories/eo.po
+++ b/translations/desktop_files/applnk-directories/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/es.po b/translations/desktop_files/applnk-directories/es.po
index 377b5899b..54614ad6d 100644
--- a/translations/desktop_files/applnk-directories/es.po
+++ b/translations/desktop_files/applnk-directories/es.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16: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"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/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.13.1\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +39,7 @@ msgstr "Desarrollo 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 "Editores"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Lenguajes"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematicas"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Miscelaneo"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -68,7 +69,7 @@ msgstr "Ciencia"
 #. 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
@@ -115,7 +116,7 @@ msgstr "Escritorio"
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr ""
+msgstr "PIM"
 
 #. Name
 #: tde-development-translation.directory:4
diff --git a/translations/desktop_files/applnk-directories/et.po b/translations/desktop_files/applnk-directories/et.po
index dff0516db..0abe08d95 100644
--- a/translations/desktop_files/applnk-directories/et.po
+++ b/translations/desktop_files/applnk-directories/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/eu.po b/translations/desktop_files/applnk-directories/eu.po
index 73a56cd4c..60d27a6fc 100644
--- a/translations/desktop_files/applnk-directories/eu.po
+++ b/translations/desktop_files/applnk-directories/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/fa.po b/translations/desktop_files/applnk-directories/fa.po
index 6440fc19e..34769b3f8 100644
--- a/translations/desktop_files/applnk-directories/fa.po
+++ b/translations/desktop_files/applnk-directories/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/fi.po b/translations/desktop_files/applnk-directories/fi.po
index 558652ff0..0a2771d22 100644
--- a/translations/desktop_files/applnk-directories/fi.po
+++ b/translations/desktop_files/applnk-directories/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/fo.po b/translations/desktop_files/applnk-directories/fo.po
index 4b3e55b16..ba154a69e 100644
--- a/translations/desktop_files/applnk-directories/fo.po
+++ b/translations/desktop_files/applnk-directories/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/fr.po b/translations/desktop_files/applnk-directories/fr.po
index 4632e711e..ec977dec6 100644
--- a/translations/desktop_files/applnk-directories/fr.po
+++ b/translations/desktop_files/applnk-directories/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/fy.po b/translations/desktop_files/applnk-directories/fy.po
index c9cc7afb8..355107436 100644
--- a/translations/desktop_files/applnk-directories/fy.po
+++ b/translations/desktop_files/applnk-directories/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ga.po b/translations/desktop_files/applnk-directories/ga.po
index 7ad47b4a0..475c834e2 100644
--- a/translations/desktop_files/applnk-directories/ga.po
+++ b/translations/desktop_files/applnk-directories/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/gl.po b/translations/desktop_files/applnk-directories/gl.po
index d159537ac..1b4c2a886 100644
--- a/translations/desktop_files/applnk-directories/gl.po
+++ b/translations/desktop_files/applnk-directories/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/he.po b/translations/desktop_files/applnk-directories/he.po
index fde386aeb..2d5ed2abf 100644
--- a/translations/desktop_files/applnk-directories/he.po
+++ b/translations/desktop_files/applnk-directories/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/hi.po b/translations/desktop_files/applnk-directories/hi.po
index 7758ea621..a1712a047 100644
--- a/translations/desktop_files/applnk-directories/hi.po
+++ b/translations/desktop_files/applnk-directories/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/hr.po b/translations/desktop_files/applnk-directories/hr.po
index 3742545e6..5c50793f9 100644
--- a/translations/desktop_files/applnk-directories/hr.po
+++ b/translations/desktop_files/applnk-directories/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/hsb.po b/translations/desktop_files/applnk-directories/hsb.po
index 538091dd1..ce70b7a23 100644
--- a/translations/desktop_files/applnk-directories/hsb.po
+++ b/translations/desktop_files/applnk-directories/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/hu.po b/translations/desktop_files/applnk-directories/hu.po
index 2ca667a05..a8e1e8fe2 100644
--- a/translations/desktop_files/applnk-directories/hu.po
+++ b/translations/desktop_files/applnk-directories/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/id.po b/translations/desktop_files/applnk-directories/id.po
index fb3618454..d5e60fca6 100644
--- a/translations/desktop_files/applnk-directories/id.po
+++ b/translations/desktop_files/applnk-directories/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/is.po b/translations/desktop_files/applnk-directories/is.po
index 332da9226..6697c00af 100644
--- a/translations/desktop_files/applnk-directories/is.po
+++ b/translations/desktop_files/applnk-directories/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/it.po b/translations/desktop_files/applnk-directories/it.po
index fa64dfce0..d85a81285 100644
--- a/translations/desktop_files/applnk-directories/it.po
+++ b/translations/desktop_files/applnk-directories/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16: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"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2021-04-18 18:00+0000\n"
+"Last-Translator: Fiflagar Lorizen <fiflagar.lorizen@posteo.net>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/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.5.3\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +39,7 @@ msgstr "Sviluppo 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 "Editor"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Lingue"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematica"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Varie"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -68,7 +69,7 @@ msgstr "Scienza"
 #. Name
 #: kde-games-arcade.directory:4 tde-games-arcade.directory:4
 msgid "Arcade"
-msgstr ""
+msgstr "Giochi Arcade"
 
 #. Name
 #: kde-games-board.directory:4 tde-games-board.directory:4
@@ -108,14 +109,14 @@ msgstr "Accessibilità"
 #: kde-utilities-desktop.directory:4 tde-settings-desktop.directory:4
 #: tde-utilities-desktop.directory:4 tde-utilities-desktop.directory:6
 msgid "Desktop"
-msgstr ""
+msgstr "Desktop"
 
 #. Name
 #. Comment
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr ""
+msgstr "PIM"
 
 #. Name
 #: tde-development-translation.directory:4
@@ -159,9 +160,8 @@ msgstr "Applicazioni terminale"
 
 #. Name
 #: tde-internet.directory:4
-#, fuzzy
 msgid "Internet"
-msgstr "Internet e Rete"
+msgstr "Internet e Reti"
 
 #. Name
 #: tde-main.directory:5
@@ -175,15 +175,14 @@ msgstr "Altri programmi"
 
 #. Name
 #: tde-multimedia.directory:4
-#, fuzzy
 msgid "Multimedia"
-msgstr "Suono e Multimedia"
+msgstr "Suoni e Multimedia"
 
 #. Name
 #. Comment
 #: tde-office-pim.directory:4 tde-office-pim.directory:6
 msgid "Personal Information Management"
-msgstr ""
+msgstr "Gestione delle Informazioni Personali"
 
 #. Name
 #: tde-office.directory:4
@@ -203,7 +202,7 @@ msgstr "Componenti di TDE"
 #. Name
 #: tde-settings-hardware.directory:4
 msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
 
 #. Name
 #: tde-settings-information.directory:4
@@ -291,7 +290,7 @@ msgstr "Oggetti smarriti"
 #. Comment
 #: tde-utilities-file.directory:4 tde-utilities-file.directory:6
 msgid "File"
-msgstr ""
+msgstr "File"
 
 #. Name
 #: tde-utilities-xutils.directory:4
diff --git a/translations/desktop_files/applnk-directories/ja.po b/translations/desktop_files/applnk-directories/ja.po
index 926949304..33450539e 100644
--- a/translations/desktop_files/applnk-directories/ja.po
+++ b/translations/desktop_files/applnk-directories/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ka.po b/translations/desktop_files/applnk-directories/ka.po
index da14d5f6c..924ec059a 100644
--- a/translations/desktop_files/applnk-directories/ka.po
+++ b/translations/desktop_files/applnk-directories/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/kk.po b/translations/desktop_files/applnk-directories/kk.po
index 6fea667ee..41f0799b5 100644
--- a/translations/desktop_files/applnk-directories/kk.po
+++ b/translations/desktop_files/applnk-directories/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/km.po b/translations/desktop_files/applnk-directories/km.po
index 307d5b8fc..c8669b514 100644
--- a/translations/desktop_files/applnk-directories/km.po
+++ b/translations/desktop_files/applnk-directories/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ko.po b/translations/desktop_files/applnk-directories/ko.po
index 10b5fa9c3..26c1bb96c 100644
--- a/translations/desktop_files/applnk-directories/ko.po
+++ b/translations/desktop_files/applnk-directories/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ku.po b/translations/desktop_files/applnk-directories/ku.po
index de8169e49..80a90a3ca 100644
--- a/translations/desktop_files/applnk-directories/ku.po
+++ b/translations/desktop_files/applnk-directories/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/lo.po b/translations/desktop_files/applnk-directories/lo.po
index 52ecc9466..cf83a28a4 100644
--- a/translations/desktop_files/applnk-directories/lo.po
+++ b/translations/desktop_files/applnk-directories/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/lt.po b/translations/desktop_files/applnk-directories/lt.po
index 082bbd5ef..da0343f6f 100644
--- a/translations/desktop_files/applnk-directories/lt.po
+++ b/translations/desktop_files/applnk-directories/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/lv.po b/translations/desktop_files/applnk-directories/lv.po
index 9dd924b30..1ed425641 100644
--- a/translations/desktop_files/applnk-directories/lv.po
+++ b/translations/desktop_files/applnk-directories/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/mk.po b/translations/desktop_files/applnk-directories/mk.po
index 938c0dda9..2f607891c 100644
--- a/translations/desktop_files/applnk-directories/mk.po
+++ b/translations/desktop_files/applnk-directories/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/mn.po b/translations/desktop_files/applnk-directories/mn.po
index ec51085ed..96a1c898e 100644
--- a/translations/desktop_files/applnk-directories/mn.po
+++ b/translations/desktop_files/applnk-directories/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ms.po b/translations/desktop_files/applnk-directories/ms.po
index d0066f554..3c5cd09aa 100644
--- a/translations/desktop_files/applnk-directories/ms.po
+++ b/translations/desktop_files/applnk-directories/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/mt.po b/translations/desktop_files/applnk-directories/mt.po
index 7c299153e..739dfc392 100644
--- a/translations/desktop_files/applnk-directories/mt.po
+++ b/translations/desktop_files/applnk-directories/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/nb.po b/translations/desktop_files/applnk-directories/nb.po
index d1b6f0c32..8e7f6e9f7 100644
--- a/translations/desktop_files/applnk-directories/nb.po
+++ b/translations/desktop_files/applnk-directories/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/nds.po b/translations/desktop_files/applnk-directories/nds.po
index 7202b607d..b42032d44 100644
--- a/translations/desktop_files/applnk-directories/nds.po
+++ b/translations/desktop_files/applnk-directories/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ne.po b/translations/desktop_files/applnk-directories/ne.po
index 2ec93f095..e6d9e89ee 100644
--- a/translations/desktop_files/applnk-directories/ne.po
+++ b/translations/desktop_files/applnk-directories/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/nl.po b/translations/desktop_files/applnk-directories/nl.po
index 9b4416ed1..1790136d6 100644
--- a/translations/desktop_files/applnk-directories/nl.po
+++ b/translations/desktop_files/applnk-directories/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/nn.po b/translations/desktop_files/applnk-directories/nn.po
index a62e14f08..0bf36877c 100644
--- a/translations/desktop_files/applnk-directories/nn.po
+++ b/translations/desktop_files/applnk-directories/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/nso.po b/translations/desktop_files/applnk-directories/nso.po
index 8d47a32da..5aeecbd9d 100644
--- a/translations/desktop_files/applnk-directories/nso.po
+++ b/translations/desktop_files/applnk-directories/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/oc.po b/translations/desktop_files/applnk-directories/oc.po
index 5ee538211..046c0920e 100644
--- a/translations/desktop_files/applnk-directories/oc.po
+++ b/translations/desktop_files/applnk-directories/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/pa.po b/translations/desktop_files/applnk-directories/pa.po
index f23ed7a55..cfe02fcc4 100644
--- a/translations/desktop_files/applnk-directories/pa.po
+++ b/translations/desktop_files/applnk-directories/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/pl.po b/translations/desktop_files/applnk-directories/pl.po
index 6878c85d3..95c83eb16 100644
--- a/translations/desktop_files/applnk-directories/pl.po
+++ b/translations/desktop_files/applnk-directories/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16: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"
+"POT-Creation-Date: 2021-07-07 18:16+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/"
+"projects/tdebase/applnk-directories/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.8.1\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +40,7 @@ msgstr "Programowanie WWW"
 #: 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
@@ -48,17 +50,17 @@ msgstr "Edytory"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Języki"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematyka"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Pozostałe"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -134,9 +136,8 @@ msgstr "Nauka i rozrywka"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "Gry z rodziny Rogue"
+msgstr "Gry logiczne"
 
 #. Name
 #: tde-games-roguelikes.directory:4
@@ -160,9 +161,8 @@ msgstr "Programy terminala"
 
 #. Name
 #: tde-internet.directory:4
-#, fuzzy
 msgid "Internet"
-msgstr "Internet i sieć"
+msgstr "Internet"
 
 #. Name
 #: tde-main.directory:5
@@ -176,7 +176,6 @@ msgstr "Więcej programów"
 
 #. Name
 #: tde-multimedia.directory:4
-#, fuzzy
 msgid "Multimedia"
 msgstr "Dźwięk i multimedia"
 
@@ -209,7 +208,7 @@ msgstr "Sprzęt"
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "Informacje o urzÄ…dzeniach"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -276,12 +275,12 @@ msgstr "PodglÄ…d wygaszacza ekranu"
 #. Name
 #: tde-system-su.directory:5
 msgid "SuperUser"
-msgstr ""
+msgstr "Administrator"
 
 #. Name
 #: tde-system.directory:4
 msgid "System"
-msgstr ""
+msgstr "System"
 
 #. Name
 #: tde-unknown.directory:4
diff --git a/translations/desktop_files/applnk-directories/pt.po b/translations/desktop_files/applnk-directories/pt.po
index 8c9c8cf37..d66a03311 100644
--- a/translations/desktop_files/applnk-directories/pt.po
+++ b/translations/desktop_files/applnk-directories/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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16: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"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2021-12-02 19:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/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.9.1\n"
 
 #. Name
 #: .directory:2
 msgid "Default"
-msgstr "Por Omissão"
+msgstr "Por omissão"
 
 #. Name
 #: hidden.directory:4
@@ -38,7 +39,7 @@ msgstr "Desenvolvimento 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 "Editores"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Idiomas"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matemática"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversos"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -115,7 +116,7 @@ msgstr "Ambiente de Trabalho"
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr ""
+msgstr "PIM"
 
 #. Name
 #: tde-development-translation.directory:4
@@ -134,9 +135,8 @@ msgstr "Educação/Entretenimento"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "Jogos tipo Rogue"
+msgstr "Jogos de Lógica"
 
 #. Name
 #: tde-games-roguelikes.directory:4
@@ -160,9 +160,8 @@ msgstr "Aplicações de Terminal"
 
 #. Name
 #: tde-internet.directory:4
-#, fuzzy
 msgid "Internet"
-msgstr "Internet e Rede"
+msgstr "Internet"
 
 #. Name
 #: tde-main.directory:5
@@ -183,7 +182,7 @@ msgstr "Multimédia"
 #. Comment
 #: tde-office-pim.directory:4 tde-office-pim.directory:6
 msgid "Personal Information Management"
-msgstr ""
+msgstr "Gestão de Informação Pessoal"
 
 #. Name
 #: tde-office.directory:4
@@ -203,12 +202,12 @@ msgstr "Componentes do TDE"
 #. Name
 #: tde-settings-hardware.directory:4
 msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
 
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "Informações do dispositivo"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -275,7 +274,7 @@ msgstr "Demonstrações de protectores de ecrã"
 #. Name
 #: tde-system-su.directory:5
 msgid "SuperUser"
-msgstr ""
+msgstr "SuperUtilizador"
 
 #. Name
 #: tde-system.directory:4
diff --git a/translations/desktop_files/applnk-directories/pt_BR.po b/translations/desktop_files/applnk-directories/pt_BR.po
index f0f9e652d..102538116 100644
--- a/translations/desktop_files/applnk-directories/pt_BR.po
+++ b/translations/desktop_files/applnk-directories/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-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ro.po b/translations/desktop_files/applnk-directories/ro.po
index 16eaf02c5..b36eec43b 100644
--- a/translations/desktop_files/applnk-directories/ro.po
+++ b/translations/desktop_files/applnk-directories/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ru.po b/translations/desktop_files/applnk-directories/ru.po
index 601ae30b1..f1735c604 100644
--- a/translations/desktop_files/applnk-directories/ru.po
+++ b/translations/desktop_files/applnk-directories/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-08 16: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"
+"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"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/applnk-directories/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
 #: .directory:2
@@ -38,7 +40,7 @@ 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
@@ -48,17 +50,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
@@ -88,7 +90,7 @@ msgstr "Дет�кие игры"
 #. Name
 #: kde-games-strategy.directory:4 tde-games-strategy.directory:4
 msgid "Tactics & Strategy"
-msgstr "Стратеги�"
+msgstr "Тактика и �тратеги�"
 
 #. Name
 #: kde-toys.directory:4 tde-toys.directory:4
@@ -135,7 +137,7 @@ msgstr "Образование"
 #. Name
 #: tde-games-logic.directory:4
 msgid "Logic Games"
-msgstr "головоломки"
+msgstr "Головоломки"
 
 #. Name
 #: tde-games-roguelikes.directory:4
diff --git a/translations/desktop_files/applnk-directories/rw.po b/translations/desktop_files/applnk-directories/rw.po
index a3f3e8877..6d0215587 100644
--- a/translations/desktop_files/applnk-directories/rw.po
+++ b/translations/desktop_files/applnk-directories/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/se.po b/translations/desktop_files/applnk-directories/se.po
index f894e3df7..fab4a469f 100644
--- a/translations/desktop_files/applnk-directories/se.po
+++ b/translations/desktop_files/applnk-directories/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/sk.po b/translations/desktop_files/applnk-directories/sk.po
index 36c5af47e..75a701343 100644
--- a/translations/desktop_files/applnk-directories/sk.po
+++ b/translations/desktop_files/applnk-directories/sk.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16: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"
+"POT-Creation-Date: 2021-07-07 18:16+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/"
+"projects/tdebase/applnk-directories/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Name
 #: .directory:2
 msgid "Default"
-msgstr "Štandardný"
+msgstr "Predvolený"
 
 #. Name
 #: hidden.directory:4
@@ -38,7 +39,7 @@ msgstr "Vývoj pre Web"
 #: 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
@@ -48,17 +49,17 @@ msgstr "Editory"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Jazyky"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematika"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Rôzne"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -115,7 +116,7 @@ msgstr "Plocha"
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr ""
+msgstr "PIM"
 
 #. Name
 #: tde-development-translation.directory:4
@@ -134,9 +135,8 @@ msgstr "Å kola hrou"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "Hry v štýle Rogue"
+msgstr "Logické hry"
 
 #. Name
 #: tde-games-roguelikes.directory:4
@@ -160,14 +160,13 @@ msgstr "Terminálové aplikácie"
 
 #. Name
 #: tde-internet.directory:4
-#, fuzzy
 msgid "Internet"
-msgstr "Internet a sieť"
+msgstr "Internet"
 
 #. Name
 #: tde-main.directory:5
 msgid "TDE Menu"
-msgstr "Menu TDE"
+msgstr "Ponuka TDE"
 
 #. Name
 #: tde-more.directory:5
@@ -183,7 +182,7 @@ msgstr "Multimédiá"
 #. Comment
 #: tde-office-pim.directory:4 tde-office-pim.directory:6
 msgid "Personal Information Management"
-msgstr ""
+msgstr "Správa osobných informácií"
 
 #. Name
 #: tde-office.directory:4
@@ -193,22 +192,22 @@ msgstr "Kancelária"
 #. Name
 #: tde-settings-accessibility.directory:4
 msgid "Regional & Accessibility"
-msgstr "Prístupnosť a regionálne nastavenie"
+msgstr "Prístupnosť a regionálne nastavenia"
 
 #. Name
 #: tde-settings-components.directory:4
 msgid "TDE Components"
-msgstr "Komponenty TDE"
+msgstr "Sú�asti TDE"
 
 #. Name
 #: tde-settings-hardware.directory:4
 msgid "Hardware"
-msgstr ""
+msgstr "Hardvér"
 
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "Informácie o zariadeniach"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -230,7 +229,7 @@ msgstr "Periférie"
 #. Name
 #: tde-settings-power.directory:4
 msgid "Power Control"
-msgstr "Ovládanie spotreby"
+msgstr "Správa napájania"
 
 #. Name
 #: tde-settings-security.directory:4
@@ -255,7 +254,7 @@ msgstr "Webový prehliada�"
 #. Name
 #: tde-settings.directory:4
 msgid "Settings-Modules"
-msgstr "Moduly nastavenia"
+msgstr "Nastavenia modulov"
 
 #. Name
 #: tde-settingsmenu.directory:4
@@ -270,12 +269,12 @@ msgstr "Šetri�e obrazovky"
 #. Comment
 #: tde-system-screensavers.directory:8
 msgid "Screen saver demos"
-msgstr "Demo šetri�ov obrazovky"
+msgstr "Ukážky šetri�ov obrazovky"
 
 #. Name
 #: tde-system-su.directory:5
 msgid "SuperUser"
-msgstr ""
+msgstr "Správca"
 
 #. Name
 #: tde-system.directory:4
@@ -296,7 +295,7 @@ msgstr "Súbor"
 #. Name
 #: tde-utilities-xutils.directory:4
 msgid "X-Utilities"
-msgstr "Nastroje pre X"
+msgstr "Nástroje pre X"
 
 #. Comment
 #: tde-utilities-xutils.directory:6
diff --git a/translations/desktop_files/applnk-directories/sl.po b/translations/desktop_files/applnk-directories/sl.po
index 6c78975db..3c95fd77b 100644
--- a/translations/desktop_files/applnk-directories/sl.po
+++ b/translations/desktop_files/applnk-directories/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/sr.po b/translations/desktop_files/applnk-directories/sr.po
index 9c63755f5..e3ec741c8 100644
--- a/translations/desktop_files/applnk-directories/sr.po
+++ b/translations/desktop_files/applnk-directories/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/sr@Latn.po b/translations/desktop_files/applnk-directories/sr@Latn.po
index 6c330a1f8..287f5bdbf 100644
--- a/translations/desktop_files/applnk-directories/sr@Latn.po
+++ b/translations/desktop_files/applnk-directories/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-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ss.po b/translations/desktop_files/applnk-directories/ss.po
index e76cf4d4e..ade15976b 100644
--- a/translations/desktop_files/applnk-directories/ss.po
+++ b/translations/desktop_files/applnk-directories/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/sv.po b/translations/desktop_files/applnk-directories/sv.po
index 1a091ccd7..584bb4449 100644
--- a/translations/desktop_files/applnk-directories/sv.po
+++ b/translations/desktop_files/applnk-directories/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ta.po b/translations/desktop_files/applnk-directories/ta.po
index 0abfee27f..e59ad58bc 100644
--- a/translations/desktop_files/applnk-directories/ta.po
+++ b/translations/desktop_files/applnk-directories/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/te.po b/translations/desktop_files/applnk-directories/te.po
index 705d794d7..0a89435b5 100644
--- a/translations/desktop_files/applnk-directories/te.po
+++ b/translations/desktop_files/applnk-directories/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/tg.po b/translations/desktop_files/applnk-directories/tg.po
index c89254cfd..c93e71335 100644
--- a/translations/desktop_files/applnk-directories/tg.po
+++ b/translations/desktop_files/applnk-directories/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/th.po b/translations/desktop_files/applnk-directories/th.po
index bd410a0d5..2693035d2 100644
--- a/translations/desktop_files/applnk-directories/th.po
+++ b/translations/desktop_files/applnk-directories/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/tr.po b/translations/desktop_files/applnk-directories/tr.po
index a598316df..0e951cb76 100644
--- a/translations/desktop_files/applnk-directories/tr.po
+++ b/translations/desktop_files/applnk-directories/tr.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Erdem Ersoy <erdemersoy@erdemersoy.net>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16: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"
+"POT-Creation-Date: 2021-07-07 18:16+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/"
+"projects/tdebase/applnk-directories/tr/>\n"
 "Language: tr\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.5.3\n"
 
 #. Name
 #: .directory:2
@@ -38,7 +39,7 @@ msgstr "Web GeliÅŸtirme"
 #: 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 "Düzenleyiciler"
 #. Name
 #: kde-edu-languages.directory:4
 msgid "Languages"
-msgstr ""
+msgstr "Diller"
 
 #. Name
 #: kde-edu-mathematics.directory:4
 msgid "Mathematics"
-msgstr ""
+msgstr "Matematik"
 
 #. Name
 #: kde-edu-miscellaneous.directory:4
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Çeşitli"
 
 #. Name
 #: kde-edu-science.directory:4 tde-science.directory:5
@@ -115,7 +116,7 @@ msgstr "Masaüstü"
 #: kde-utilities-pim.directory:4 tde-utilities-pim.directory:4
 #: tde-utilities-pim.directory:6
 msgid "PIM"
-msgstr ""
+msgstr "PIM"
 
 #. Name
 #: tde-development-translation.directory:4
@@ -134,9 +135,8 @@ msgstr "EÄŸitim ve EÄŸlence"
 
 #. Name
 #: tde-games-logic.directory:4
-#, fuzzy
 msgid "Logic Games"
-msgstr "Rogue benzeri oyunlar"
+msgstr "Mantık Oyunları"
 
 #. Name
 #: tde-games-roguelikes.directory:4
@@ -182,7 +182,7 @@ msgstr "Çokluortam"
 #. Comment
 #: tde-office-pim.directory:4 tde-office-pim.directory:6
 msgid "Personal Information Management"
-msgstr ""
+msgstr "Kişi Bilgisi Yönetimi"
 
 #. Name
 #: tde-office.directory:4
@@ -207,7 +207,7 @@ msgstr "Donanım"
 #. Name
 #: tde-settings-information.directory:4
 msgid "Device Informations"
-msgstr ""
+msgstr "Aygıt Bilgileri"
 
 #. Name
 #: tde-settings-looknfeel.directory:4
@@ -274,7 +274,7 @@ msgstr "Ekran koruyucu tanıtımları"
 #. Name
 #: tde-system-su.directory:5
 msgid "SuperUser"
-msgstr ""
+msgstr "Süper Kullanıcı"
 
 #. Name
 #: tde-system.directory:4
diff --git a/translations/desktop_files/applnk-directories/tt.po b/translations/desktop_files/applnk-directories/tt.po
index abed4822c..eb8bf3afb 100644
--- a/translations/desktop_files/applnk-directories/tt.po
+++ b/translations/desktop_files/applnk-directories/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/uk.po b/translations/desktop_files/applnk-directories/uk.po
index 6fc49d284..a65bf8297 100644
--- a/translations/desktop_files/applnk-directories/uk.po
+++ b/translations/desktop_files/applnk-directories/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\n"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/applnk-directories/uz.po b/translations/desktop_files/applnk-directories/uz.po
index 9a345c38a..8139f3811 100644
--- a/translations/desktop_files/applnk-directories/uz.po
+++ b/translations/desktop_files/applnk-directories/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/uz@cyrillic.po b/translations/desktop_files/applnk-directories/uz@cyrillic.po
index 33c2c11f7..0d2e5d099 100644
--- a/translations/desktop_files/applnk-directories/uz@cyrillic.po
+++ b/translations/desktop_files/applnk-directories/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-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/ven.po b/translations/desktop_files/applnk-directories/ven.po
index 31997d91a..d61a3a530 100644
--- a/translations/desktop_files/applnk-directories/ven.po
+++ b/translations/desktop_files/applnk-directories/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/vi.po b/translations/desktop_files/applnk-directories/vi.po
index ec877391a..a2a78cbda 100644
--- a/translations/desktop_files/applnk-directories/vi.po
+++ b/translations/desktop_files/applnk-directories/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/wa.po b/translations/desktop_files/applnk-directories/wa.po
index a5baff6f4..a38523e5a 100644
--- a/translations/desktop_files/applnk-directories/wa.po
+++ b/translations/desktop_files/applnk-directories/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/xh.po b/translations/desktop_files/applnk-directories/xh.po
index d7f7d8992..1a8d62239 100644
--- a/translations/desktop_files/applnk-directories/xh.po
+++ b/translations/desktop_files/applnk-directories/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/zh_CN.po b/translations/desktop_files/applnk-directories/zh_CN.po
index 825b875dd..521081cdb 100644
--- a/translations/desktop_files/applnk-directories/zh_CN.po
+++ b/translations/desktop_files/applnk-directories/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-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/zh_TW.po b/translations/desktop_files/applnk-directories/zh_TW.po
index 7e507233b..e3fa40f09 100644
--- a/translations/desktop_files/applnk-directories/zh_TW.po
+++ b/translations/desktop_files/applnk-directories/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-08 16:58+0200\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"
diff --git a/translations/desktop_files/applnk-directories/zu.po b/translations/desktop_files/applnk-directories/zu.po
index b22524501..50164ada8 100644
--- a/translations/desktop_files/applnk-directories/zu.po
+++ b/translations/desktop_files/applnk-directories/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-08 16:58+0200\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"
diff --git a/translations/desktop_files/drkonqi-presets/cs.po b/translations/desktop_files/drkonqi-presets/cs.po
index 03641fd55..89a756f76 100644
--- a/translations/desktop_files/drkonqi-presets/cs.po
+++ b/translations/desktop_files/drkonqi-presets/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/drkonqi-presets/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.2.2\n"
 
 #. Name
 #: developerrc:2
@@ -44,7 +45,7 @@ msgstr "Možná budete chtít opravit váš program. KliknÄ›te na záložku ladÄ
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -54,7 +55,7 @@ msgstr "Neplatná instrukce."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -64,7 +65,7 @@ msgstr "Přerušeno."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -74,7 +75,7 @@ msgstr "Výjimka v plovoucí �árce."
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
diff --git a/translations/desktop_files/drkonqi-presets/it.po b/translations/desktop_files/drkonqi-presets/it.po
index cf9562eb3..91333bbcf 100644
--- a/translations/desktop_files/drkonqi-presets/it.po
+++ b/translations/desktop_files/drkonqi-presets/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
 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: 2021-04-18 18:00+0000\n"
+"Last-Translator: Fiflagar Lorizen <fiflagar.lorizen@posteo.net>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/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.5.3\n"
 
 #. Name
 #: developerrc:2
@@ -46,7 +47,7 @@ msgstr ""
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -56,7 +57,7 @@ msgstr "Istruzione illegale."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -66,7 +67,7 @@ msgstr "Terminato in maniera anomala."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -76,7 +77,7 @@ msgstr "Eccezione virgola mobile."
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
@@ -91,7 +92,7 @@ msgstr "Sconosciuto"
 #. Comment
 #: developerrc:37
 msgid "This signal is unknown."
-msgstr "Questo segnale è sconosciuto"
+msgstr "Questo segnale è sconosciuto."
 
 #. Name
 #: enduserrc:2
diff --git a/translations/desktop_files/drkonqi-presets/pl.po b/translations/desktop_files/drkonqi-presets/pl.po
index 13ec3fe69..fa45f2411 100644
--- a/translations/desktop_files/drkonqi-presets/pl.po
+++ b/translations/desktop_files/drkonqi-presets/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2021.
 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: 2021-10-10 09:30+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/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.8.1\n"
 
 #. Name
 #: developerrc:2
@@ -46,7 +48,7 @@ msgstr ""
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -56,7 +58,7 @@ msgstr "Nielegalna instrukcja."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -66,7 +68,7 @@ msgstr "Przerwany."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -76,7 +78,7 @@ msgstr "Błąd podczas obliczeń zmiennoprzecinkowych."
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
diff --git a/translations/desktop_files/drkonqi-presets/pt.po b/translations/desktop_files/drkonqi-presets/pt.po
index ca27d371e..0d33ab446 100644
--- a/translations/desktop_files/drkonqi-presets/pt.po
+++ b/translations/desktop_files/drkonqi-presets/pt.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022, 2023.
 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: 2023-07-16 17:52+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/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
 #: developerrc:2
@@ -44,7 +45,7 @@ msgstr "Pode desejar corrigir o programa. Examine a página do 'backtrace'."
 #. Name
 #: developerrc:20 enduserrc:20
 msgid "SIGILL"
-msgstr ""
+msgstr "SIGILL"
 
 #. Comment
 #: developerrc:21
@@ -54,7 +55,7 @@ msgstr "Instrução inválida."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -64,7 +65,7 @@ msgstr "Abortado."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -74,7 +75,7 @@ msgstr "Excepção de virgula flutuante."
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
@@ -119,11 +120,11 @@ msgid ""
 "include as much information as possible, maybe the original documents. If "
 "you have a way to reproduce the error, include this also."
 msgstr ""
-"Você poderá querer enviar um relatório de erro para esta aplicação. "
-"Verifique se está listada no http://bugs.trinitydesktop.org; caso contrário, "
-"mande um e-mail ao autor. Por favor inclua o máximo possível de informação, "
-"bem como os documentos em que estava a trabalhar. Se conseguir reproduzir o "
-"erro, inclua também a forma de o fazer."
+"Poderá querer enviar um relatório de erro para esta aplicação. Verifique se "
+"está listada no http://bugs.trinitydesktop.org; caso contrário, mande um e-"
+"mail ao autor. Por favor inclua o máximo possível de informação, bem como os "
+"documentos em que estava a trabalhar. Se conseguir reproduzir o erro, inclua "
+"também a forma de o fazer."
 
 #. Comment
 #: enduserrc:21
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/sk.po b/translations/desktop_files/drkonqi-presets/sk.po
index 39b846a56..626e6bcb8 100644
--- a/translations/desktop_files/drkonqi-presets/sk.po
+++ b/translations/desktop_files/drkonqi-presets/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 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: 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/"
+"projects/tdebase/drkonqi-presets/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Name
 #: developerrc:2
@@ -71,7 +72,7 @@ msgstr ""
 #. Comment
 #: developerrc:29
 msgid "Floating point exception."
-msgstr "Výnimka."
+msgstr "Výnimka v desatinnej �iarke."
 
 #. Name
 #: developerrc:32 enduserrc:32
@@ -86,7 +87,7 @@ msgstr "Nesprávne adresovanie pamäti."
 #. Name
 #: developerrc:36 enduserrc:36
 msgid "Unknown"
-msgstr "Neznámi"
+msgstr "Neznáme"
 
 #. Comment
 #: developerrc:37
@@ -96,12 +97,12 @@ msgstr "Tento signál je neznámy."
 #. Name
 #: enduserrc:2
 msgid "End user"
-msgstr "Kone�ný používateľ"
+msgstr "Koncový používateľ"
 
 #. Comment
 #: enduserrc:3
 msgid "Settings preferred for end users"
-msgstr "Preferované nastavenia pre kone�ných používateľov"
+msgstr "Uprednostňované nastavenia pre kone�ných používateľov"
 
 #. Name
 #: enduserrc:13
@@ -142,8 +143,8 @@ msgid ""
 "An application terminates with a SIGABRT signal when it detects an internal "
 "inconsistency caused by a bug in the program."
 msgstr ""
-"Aplikácia bola ukon�ená SIGABRT signálom, ke� program detekoval internú "
-"nezhodu spôsobenú chybou v programe."
+"Aplikácia bola ukon�ená SIGABRT signálom, ke� program detekoval vnútornú "
+"nesúdržnosť spôsobenú chybou v programe."
 
 #. Comment
 #: enduserrc:29
@@ -152,7 +153,7 @@ msgid ""
 "application. The application was asked to save its documents."
 msgstr ""
 "Aplikácia vä�šinou dostane SIGFPE signál kvôli chybe v aplikácii. Tento "
-"signál žiada tiež aplikáciu, aby si uložila svoje dokumenty."
+"signál žiada aplikáciu, aby si uložila svoje dokumenty."
 
 #. Comment
 #: enduserrc:33
diff --git a/translations/desktop_files/drkonqi-presets/tr.po b/translations/desktop_files/drkonqi-presets/tr.po
index 8dcf7bd79..3558c90e0 100644
--- a/translations/desktop_files/drkonqi-presets/tr.po
+++ b/translations/desktop_files/drkonqi-presets/tr.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Erdem Ersoy <erdemersoy@erdemersoy.net>, 2021.
 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: 2021-04-20 20:01+0000\n"
+"Last-Translator: Erdem Ersoy <erdemersoy@erdemersoy.net>\n"
+"Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/drkonqi-presets/tr/>\n"
 "Language: tr\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.5.3\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 "Hatalı talimat."
 #. Name
 #: developerrc:24 enduserrc:24
 msgid "SIGABRT"
-msgstr ""
+msgstr "SIGABRT"
 
 #. Comment
 #: developerrc:25
@@ -65,7 +66,7 @@ msgstr "Ä°ptal edildi."
 #. Name
 #: developerrc:28 enduserrc:28
 msgid "SIGFPE"
-msgstr ""
+msgstr "SIGFPE"
 
 #. Comment
 #: developerrc:29
@@ -75,7 +76,7 @@ msgstr "Kayar nokta hatası."
 #. Name
 #: developerrc:32 enduserrc:32
 msgid "SIGSEGV"
-msgstr ""
+msgstr "SIGSEGV"
 
 #. Comment
 #: developerrc:33
diff --git a/translations/desktop_files/kappfinder-data/af.po b/translations/desktop_files/kappfinder-data/af.po
index d6f0503d8..90cfb4875 100644
--- a/translations/desktop_files/kappfinder-data/af.po
+++ b/translations/desktop_files/kappfinder-data/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ar.po b/translations/desktop_files/kappfinder-data/ar.po
index df4ace937..fd0b5132c 100644
--- a/translations/desktop_files/kappfinder-data/ar.po
+++ b/translations/desktop_files/kappfinder-data/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/az.po b/translations/desktop_files/kappfinder-data/az.po
index f1a099b5e..78ade8cd0 100644
--- a/translations/desktop_files/kappfinder-data/az.po
+++ b/translations/desktop_files/kappfinder-data/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/be.po b/translations/desktop_files/kappfinder-data/be.po
index ce11367fe..f617311b9 100644
--- a/translations/desktop_files/kappfinder-data/be.po
+++ b/translations/desktop_files/kappfinder-data/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/bg.po b/translations/desktop_files/kappfinder-data/bg.po
index c177a58ec..97389db13 100644
--- a/translations/desktop_files/kappfinder-data/bg.po
+++ b/translations/desktop_files/kappfinder-data/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\n"
+"POT-Creation-Date: 2021-07-07 18:16+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/"
diff --git a/translations/desktop_files/kappfinder-data/bn.po b/translations/desktop_files/kappfinder-data/bn.po
index 6f7d08935..cfe385fc6 100644
--- a/translations/desktop_files/kappfinder-data/bn.po
+++ b/translations/desktop_files/kappfinder-data/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/br.po b/translations/desktop_files/kappfinder-data/br.po
index 4d8fced2d..f97e9a548 100644
--- a/translations/desktop_files/kappfinder-data/br.po
+++ b/translations/desktop_files/kappfinder-data/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/bs.po b/translations/desktop_files/kappfinder-data/bs.po
index c331366b3..27d10d828 100644
--- a/translations/desktop_files/kappfinder-data/bs.po
+++ b/translations/desktop_files/kappfinder-data/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ca.po b/translations/desktop_files/kappfinder-data/ca.po
index e1226e2b2..37471670c 100644
--- a/translations/desktop_files/kappfinder-data/ca.po
+++ b/translations/desktop_files/kappfinder-data/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/cs.po b/translations/desktop_files/kappfinder-data/cs.po
index 174a9d152..e524b53eb 100644
--- a/translations/desktop_files/kappfinder-data/cs.po
+++ b/translations/desktop_files/kappfinder-data/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/csb.po b/translations/desktop_files/kappfinder-data/csb.po
index 895e68c44..448d8e41e 100644
--- a/translations/desktop_files/kappfinder-data/csb.po
+++ b/translations/desktop_files/kappfinder-data/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/cy.po b/translations/desktop_files/kappfinder-data/cy.po
index 824685027..1247e736b 100644
--- a/translations/desktop_files/kappfinder-data/cy.po
+++ b/translations/desktop_files/kappfinder-data/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/da.po b/translations/desktop_files/kappfinder-data/da.po
index f966e2c99..58d2acc26 100644
--- a/translations/desktop_files/kappfinder-data/da.po
+++ b/translations/desktop_files/kappfinder-data/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/de.po b/translations/desktop_files/kappfinder-data/de.po
index 478a1a0a8..bf28fa6eb 100644
--- a/translations/desktop_files/kappfinder-data/de.po
+++ b/translations/desktop_files/kappfinder-data/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/el.po b/translations/desktop_files/kappfinder-data/el.po
index 6ed9412b1..318daa4de 100644
--- a/translations/desktop_files/kappfinder-data/el.po
+++ b/translations/desktop_files/kappfinder-data/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/en_GB.po b/translations/desktop_files/kappfinder-data/en_GB.po
index 1e4649a5f..f75b184e1 100644
--- a/translations/desktop_files/kappfinder-data/en_GB.po
+++ b/translations/desktop_files/kappfinder-data/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/eo.po b/translations/desktop_files/kappfinder-data/eo.po
index 5632dfe2b..f67d21c12 100644
--- a/translations/desktop_files/kappfinder-data/eo.po
+++ b/translations/desktop_files/kappfinder-data/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/es.po b/translations/desktop_files/kappfinder-data/es.po
index d86db5a4d..1ab7487c3 100644
--- a/translations/desktop_files/kappfinder-data/es.po
+++ b/translations/desktop_files/kappfinder-data/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/et.po b/translations/desktop_files/kappfinder-data/et.po
index e0f55fb6b..59209e51e 100644
--- a/translations/desktop_files/kappfinder-data/et.po
+++ b/translations/desktop_files/kappfinder-data/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/eu.po b/translations/desktop_files/kappfinder-data/eu.po
index 438156316..d4ffafe88 100644
--- a/translations/desktop_files/kappfinder-data/eu.po
+++ b/translations/desktop_files/kappfinder-data/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/fa.po b/translations/desktop_files/kappfinder-data/fa.po
index 33f66c0e2..a53865392 100644
--- a/translations/desktop_files/kappfinder-data/fa.po
+++ b/translations/desktop_files/kappfinder-data/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/fi.po b/translations/desktop_files/kappfinder-data/fi.po
index fc8ac0e47..ef1ca70ac 100644
--- a/translations/desktop_files/kappfinder-data/fi.po
+++ b/translations/desktop_files/kappfinder-data/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/fo.po b/translations/desktop_files/kappfinder-data/fo.po
index 19abdf6c4..b8ddb91a2 100644
--- a/translations/desktop_files/kappfinder-data/fo.po
+++ b/translations/desktop_files/kappfinder-data/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/fr.po b/translations/desktop_files/kappfinder-data/fr.po
index fbfdecaef..f78ac6ff3 100644
--- a/translations/desktop_files/kappfinder-data/fr.po
+++ b/translations/desktop_files/kappfinder-data/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/fy.po b/translations/desktop_files/kappfinder-data/fy.po
index 0419a8d0c..9e38b494e 100644
--- a/translations/desktop_files/kappfinder-data/fy.po
+++ b/translations/desktop_files/kappfinder-data/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ga.po b/translations/desktop_files/kappfinder-data/ga.po
index 573c2390e..ddd98e37c 100644
--- a/translations/desktop_files/kappfinder-data/ga.po
+++ b/translations/desktop_files/kappfinder-data/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/gl.po b/translations/desktop_files/kappfinder-data/gl.po
index 68604e72f..d68558dca 100644
--- a/translations/desktop_files/kappfinder-data/gl.po
+++ b/translations/desktop_files/kappfinder-data/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/he.po b/translations/desktop_files/kappfinder-data/he.po
index 08890c82f..7bc76bb71 100644
--- a/translations/desktop_files/kappfinder-data/he.po
+++ b/translations/desktop_files/kappfinder-data/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/hi.po b/translations/desktop_files/kappfinder-data/hi.po
index 35e51a3cf..0840600d6 100644
--- a/translations/desktop_files/kappfinder-data/hi.po
+++ b/translations/desktop_files/kappfinder-data/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/hr.po b/translations/desktop_files/kappfinder-data/hr.po
index 40bc9d080..23170e29a 100644
--- a/translations/desktop_files/kappfinder-data/hr.po
+++ b/translations/desktop_files/kappfinder-data/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/hsb.po b/translations/desktop_files/kappfinder-data/hsb.po
index 15e009d2c..e5ad59c8d 100644
--- a/translations/desktop_files/kappfinder-data/hsb.po
+++ b/translations/desktop_files/kappfinder-data/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/hu.po b/translations/desktop_files/kappfinder-data/hu.po
index b00b94b84..2fd54429f 100644
--- a/translations/desktop_files/kappfinder-data/hu.po
+++ b/translations/desktop_files/kappfinder-data/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/id.po b/translations/desktop_files/kappfinder-data/id.po
index db595ac9e..a4a2d6167 100644
--- a/translations/desktop_files/kappfinder-data/id.po
+++ b/translations/desktop_files/kappfinder-data/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/is.po b/translations/desktop_files/kappfinder-data/is.po
index d9275106a..03b57f25a 100644
--- a/translations/desktop_files/kappfinder-data/is.po
+++ b/translations/desktop_files/kappfinder-data/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/it.po b/translations/desktop_files/kappfinder-data/it.po
index 67166f20e..2f6ac90dc 100644
--- a/translations/desktop_files/kappfinder-data/it.po
+++ b/translations/desktop_files/kappfinder-data/it.po
@@ -1,25 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
+# Leandro Nini <drfiemost@email.it>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22: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"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2021-11-21 09:59+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/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.9\n"
 
 #. Name
 #: Development/Forte.desktop:2
 msgid "Forte"
-msgstr ""
+msgstr "Forte"
 
 #. GenericName
 #: Development/Forte.desktop:3
@@ -29,7 +32,7 @@ msgstr "Ambiente di sviluppo integrato Java"
 #. Name
 #: Development/assistant.desktop:2
 msgid "Qt Assistant"
-msgstr ""
+msgstr "Assistente Qt"
 
 #. GenericName
 #: Development/assistant.desktop:3
@@ -39,12 +42,12 @@ msgstr "Visualizzatore di documenti"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
 msgid "Data Display Debugger"
-msgstr ""
+msgstr "Data Display Debugger"
 
 #. Name
 #: Development/designer.desktop:2
@@ -58,9 +61,8 @@ msgstr "Disegnatore di interfacce"
 
 #. Name
 #: Development/dlgedit.desktop:2
-#, fuzzy
 msgid "Qt DlgEdit"
-msgstr "Editor delle finestre di dialogo"
+msgstr "Editor di chat per giochi"
 
 #. GenericName
 #: Development/dlgedit.desktop:3
@@ -69,9 +71,8 @@ msgstr "Editor delle finestre di dialogo"
 
 #. Name
 #: Development/eclipse.desktop:3
-#, fuzzy
 msgid "Eclipse"
-msgstr "IDE Eclipse"
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
@@ -80,14 +81,13 @@ msgstr "IDE Eclipse"
 
 #. Name
 #: Development/fdesign.desktop:2
-#, fuzzy
 msgid "FormDesigner"
-msgstr "Designer Qt"
+msgstr "FormDesigner"
 
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -97,7 +97,7 @@ msgstr "Toolkit J2ME"
 #. Name
 #: Development/linguist.desktop:2
 msgid "Qt Linguist"
-msgstr ""
+msgstr "Linguista Qt"
 
 #. GenericName
 #: Development/linguist.desktop:3
@@ -107,7 +107,7 @@ msgstr "Strumento per le traduzioni"
 #. Name
 #: Development/pose.desktop:2
 msgid "Pose"
-msgstr ""
+msgstr "Posa"
 
 #. GenericName
 #: Development/pose.desktop:3
@@ -117,7 +117,7 @@ msgstr "Emulatore Palm/Wireless"
 #. Name
 #: Development/sced.desktop:2
 msgid "Sced"
-msgstr ""
+msgstr "Sced"
 
 #. GenericName
 #: Development/sced.desktop:3
@@ -127,7 +127,7 @@ msgstr "Modellatore di scene"
 #. Name
 #: Games/Arcade/ClanBomber.desktop:2
 msgid "ClanBomber"
-msgstr ""
+msgstr "ClanBomber"
 
 #. GenericName
 #: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -143,7 +143,7 @@ msgstr "Gioco arcade"
 #. Name
 #: Games/Arcade/FrozenBubble.desktop:2
 msgid "Frozen Bubble"
-msgstr ""
+msgstr "Bolla congelata"
 
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
@@ -153,7 +153,7 @@ msgstr "Gioco tipo-tetris"
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Gnibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
@@ -163,27 +163,27 @@ msgstr "Gioco nibbles di 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 "Fratelli Super Metano"
 
 #. Name
 #: Games/Arcade/Trophy.desktop:2
 msgid "Trophy"
-msgstr ""
+msgstr "Trophy"
 
 #. Name
 #: Games/Arcade/TuxRacer.desktop:2
 msgid "TuxRacer"
-msgstr ""
+msgstr "Trophy"
 
 #. GenericName
 #: Games/Arcade/TuxRacer.desktop:3
@@ -193,17 +193,17 @@ msgstr "Gara di corsa"
 #. 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 +226,12 @@ msgstr ""
 #. Name
 #: Games/Arcade/battalion.desktop:2
 msgid "Batallion"
-msgstr ""
+msgstr "Battaglione"
 
 #. Name
 #: Games/Arcade/battleball.desktop:2
 msgid "Battleball"
-msgstr ""
+msgstr "Battleball"
 
 #. GenericName
 #: Games/Arcade/battleball.desktop:3
@@ -241,12 +241,12 @@ msgstr "Gioco di palla"
 #. Name
 #: Games/Arcade/cxhextris.desktop:2
 msgid "cxhextris"
-msgstr ""
+msgstr "cxhextris"
 
 #. Name
 #: Games/Arcade/rocksndiamonds.desktop:2
 msgid "Rocks n Diamonds"
-msgstr ""
+msgstr "Rocce e Diamanti"
 
 #. GenericName
 #: Games/Arcade/rocksndiamonds.desktop:3 Games/Board/Glines.desktop:3
@@ -256,29 +256,27 @@ msgstr "Gioco di tattica"
 #. 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
-#, fuzzy
 msgid "GNOME Chess"
-msgstr "Who di GNOME"
+msgstr "Scacchi di GNOME"
 
 #. Name
 #: Games/Board/Glines.desktop:2
 msgid "Glines"
-msgstr ""
+msgstr "Glines"
 
 #. Name
 #: Games/Board/Gmahjongg.desktop:2
-#, fuzzy
 msgid "GNOME Mahjongg"
-msgstr "Who di GNOME"
+msgstr "Mahjongg di GNOME"
 
 #. GenericName
 #: Games/Board/Gmahjongg.desktop:3
@@ -287,9 +285,8 @@ msgstr "Gioco di tessere"
 
 #. Name
 #: Games/Board/Gmines.desktop:2
-#, fuzzy
 msgid "GNOME Mines"
-msgstr "Telnet di GNOME"
+msgstr "GNOME Miniere"
 
 #. GenericName
 #: Games/Board/Gmines.desktop:3
@@ -299,12 +296,12 @@ msgstr "Gioco di logica"
 #. 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
@@ -313,14 +310,13 @@ msgstr "Gioco Klotski di GNOME"
 
 #. Name
 #: Games/Board/Gstones.desktop:2
-#, fuzzy
 msgid "GNOME Stones"
-msgstr "Telnet di GNOME"
+msgstr "GNOME Pietre"
 
 #. Name
 #: Games/Board/Iagno.desktop:2
 msgid "Iagno"
-msgstr ""
+msgstr "Iagno"
 
 #. GenericName
 #: Games/Board/Iagno.desktop:3 Games/Board/SameGnome.desktop:3
@@ -331,12 +327,12 @@ msgstr "Gioco da tavola"
 #. 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
@@ -351,7 +347,7 @@ msgstr "Gioco di scacchi"
 #. Name
 #: Games/Card/AisleRiot.desktop:2
 msgid "AisleRiot"
-msgstr ""
+msgstr "Rivolta del corridoio"
 
 #. GenericName
 #: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
@@ -362,28 +358,27 @@ msgstr "Gioco di carte"
 #. 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 "Gioco di scacchi"
+msgstr "Scacchi"
 
 #. GenericName
 #: Games/Emulators/cmail.desktop:3
@@ -393,7 +388,7 @@ msgstr "Posta elettronica per gli scacchi"
 #. Name
 #: Games/Emulators/qmamecat.desktop:2
 msgid "Qmamecat"
-msgstr ""
+msgstr "Qmamecat"
 
 #. GenericName
 #: Games/Emulators/qmamecat.desktop:3
@@ -403,7 +398,7 @@ msgstr "Emulatore arcade"
 #. Name
 #: Games/GTali.desktop:2
 msgid "GTali"
-msgstr ""
+msgstr "GTali"
 
 #. GenericName
 #: Games/GTali.desktop:3
@@ -413,7 +408,7 @@ msgstr "Gioco di dadi"
 #. Name
 #: Games/Roguelikes/angband.desktop:2
 msgid "Angband"
-msgstr ""
+msgstr "Angband"
 
 #. Comment
 #: Games/Roguelikes/angband.desktop:3
@@ -423,7 +418,7 @@ msgstr "Tuffati dentro Angband e sconfiggi Morgoth"
 #. Name
 #: Games/Roguelikes/moria.desktop:2
 msgid "Moria"
-msgstr ""
+msgstr "Moria"
 
 #. Comment
 #: Games/Roguelikes/moria.desktop:3
@@ -433,7 +428,7 @@ msgstr "Tuffati dentro Moria e sconfiggi il Balrog"
 #. Name
 #: Games/Roguelikes/nethack.desktop:2
 msgid "NetHack"
-msgstr ""
+msgstr "NetHack"
 
 #. GenericName
 #: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
@@ -443,7 +438,7 @@ msgstr "Gioco di avventura"
 #. Name
 #: Games/Roguelikes/rogue.desktop:2
 msgid "Rogue"
-msgstr ""
+msgstr "Rogue"
 
 #. GenericName
 #: Games/Roguelikes/rogue.desktop:3
@@ -453,12 +448,12 @@ msgstr "L'originale"
 #. 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
@@ -468,7 +463,7 @@ msgstr "Sconfiggi il Serpente del Caos"
 #. Name
 #: Games/TacticStrategy/freeciv.desktop:3
 msgid "Freeciv"
-msgstr ""
+msgstr "Freeciv"
 
 #. GenericName
 #: Games/TacticStrategy/freeciv.desktop:4 Games/xshipwars.desktop:4
@@ -488,7 +483,7 @@ msgstr "Un server per Free Civ"
 #. Name
 #: Games/TacticStrategy/xscorch.desktop:3
 msgid "XScorch"
-msgstr ""
+msgstr "XScorch"
 
 #. Comment
 #: Games/TacticStrategy/xscorch.desktop:4
@@ -498,12 +493,12 @@ msgstr "Un clone per UNIX e X di Scorched Earth"
 #. Name
 #: Games/Toys/xeyes.desktop:2
 msgid "X Eyes"
-msgstr ""
+msgstr "Occhi X"
 
 #. Name
 #: Games/Toys/xpinguin.desktop:2
 msgid "Tux"
-msgstr ""
+msgstr "Tux"
 
 #. GenericName
 #: Games/Toys/xpinguin.desktop:3
@@ -513,7 +508,7 @@ msgstr "Mascotte di Linux"
 #. Name
 #: Games/defendguin.desktop:3
 msgid "Defendguin"
-msgstr ""
+msgstr "Defendguin"
 
 #. GenericName
 #: Games/defendguin.desktop:4
@@ -523,17 +518,17 @@ msgstr "Gioco"
 #. Name
 #: Games/penguin-command.desktop:3
 msgid "Penguin Command"
-msgstr ""
+msgstr "Commando Pinguini"
 
 #. Name
 #: Games/xshipwars.desktop:3
 msgid "XShipWars"
-msgstr ""
+msgstr "ShipWars X"
 
 #. Name
 #: Graphics/ElectricEyes.desktop:2
 msgid "Electric Eyes"
-msgstr ""
+msgstr "Occhi elettrici"
 
 #. GenericName
 #: Graphics/ElectricEyes.desktop:3
@@ -543,7 +538,7 @@ msgstr "Visualizzatore di immagini"
 #. Name
 #: Graphics/GPhoto.desktop:2
 msgid "GPhoto"
-msgstr ""
+msgstr "GPhoto"
 
 #. GenericName
 #: Graphics/GPhoto.desktop:3
@@ -563,7 +558,7 @@ msgstr "Editor di icone di GNOME"
 #. Name
 #: Graphics/Gqview.desktop:2
 msgid "Gqview"
-msgstr ""
+msgstr "Gqview"
 
 #. GenericName
 #: Graphics/Gqview.desktop:3
@@ -573,7 +568,7 @@ msgstr "Browser di immagini"
 #. Name
 #: Graphics/Sketch.desktop:2
 msgid "Sketch"
-msgstr ""
+msgstr "Schizza"
 
 #. GenericName
 #: Graphics/Sketch.desktop:3
@@ -583,7 +578,7 @@ msgstr "Programma di disegno vettoriale"
 #. Name
 #: Graphics/Xpcd.desktop:2
 msgid "Xpcd"
-msgstr ""
+msgstr "Xpcd"
 
 #. GenericName
 #: Graphics/Xpcd.desktop:3
@@ -593,7 +588,7 @@ msgstr "Strumenti per PhotoCD"
 #. Name
 #: Graphics/Xwpick.desktop:2
 msgid "Xwpick"
-msgstr ""
+msgstr "Xwpick"
 
 #. GenericName
 #: Graphics/Xwpick.desktop:3
@@ -603,7 +598,7 @@ msgstr "Programma per fare foto allo schermo"
 #. Name
 #: Graphics/bitmap.desktop:2
 msgid "X Bitmap"
-msgstr ""
+msgstr "Bitmap X"
 
 #. GenericName
 #: Graphics/bitmap.desktop:3
@@ -613,7 +608,7 @@ msgstr "Creatore di bitmap"
 #. Name
 #: Graphics/blender.desktop:2
 msgid "Blender"
-msgstr ""
+msgstr "Blender"
 
 #. GenericName
 #: Graphics/blender.desktop:3
@@ -623,7 +618,7 @@ msgstr "Modellatore e render 3D"
 #. Name
 #: Graphics/ghostview.desktop:2
 msgid "GhostView"
-msgstr ""
+msgstr "GhostView"
 
 #. GenericName
 #: Graphics/ghostview.desktop:3
@@ -633,7 +628,7 @@ msgstr "Visualizzatore PostScript"
 #. Name
 #: Graphics/gimp.desktop:2
 msgid "Gimp"
-msgstr ""
+msgstr "Gimp"
 
 #. GenericName
 #: Graphics/gimp.desktop:3
@@ -643,7 +638,7 @@ msgstr "Programma di manipolazione immagini"
 #. Name
 #: Graphics/gv.desktop:2
 msgid "GV"
-msgstr ""
+msgstr "GV"
 
 #. GenericName
 #: Graphics/gv.desktop:3
@@ -653,7 +648,7 @@ msgstr "Visualizzatore PostScript"
 #. Name
 #: Graphics/inkscape.desktop:2
 msgid "Inkscape"
-msgstr ""
+msgstr "Inkscape"
 
 #. GenericName
 #: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
@@ -663,12 +658,12 @@ msgstr "Grafica vettoriale"
 #. 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
@@ -678,7 +673,7 @@ msgstr "Programma di disegno"
 #. Name
 #: Graphics/xdvi.desktop:2
 msgid "X DVI"
-msgstr ""
+msgstr "X DVI"
 
 #. GenericName
 #: Graphics/xdvi.desktop:3
@@ -688,12 +683,12 @@ msgstr "Visualizzatore DVI"
 #. Name
 #: Graphics/xfig.desktop:2
 msgid "Xfig"
-msgstr ""
+msgstr "Xfig"
 
 #. Name
 #: Graphics/xpaint.desktop:2
 msgid "X Paint"
-msgstr ""
+msgstr "Paint X"
 
 #. GenericName
 #: Graphics/xpaint.desktop:3
@@ -703,7 +698,7 @@ msgstr "Programma di disegno"
 #. Name
 #: Graphics/xv.desktop:2
 msgid "XV"
-msgstr ""
+msgstr "XV"
 
 #. GenericName
 #: Graphics/xv.desktop:3
@@ -713,7 +708,7 @@ msgstr "Visualizzatore di immagini"
 #. Name
 #: Internet/BlueFish.desktop:2
 msgid "BlueFish"
-msgstr ""
+msgstr "BlueFish"
 
 #. GenericName
 #: Internet/BlueFish.desktop:3
@@ -723,7 +718,7 @@ msgstr "Editor HTML"
 #. Name
 #: Internet/Dpsftp.desktop:2
 msgid "Dpsftp"
-msgstr ""
+msgstr "Dpsftp"
 
 #. GenericName
 #: Internet/Dpsftp.desktop:3 Internet/gFTP.desktop:3 Internet/xftp.desktop:3
@@ -733,7 +728,7 @@ msgstr "Browser FTP"
 #. Name
 #: Internet/DrakSync.desktop:2
 msgid "DrakSync"
-msgstr ""
+msgstr "DrakSync"
 
 #. GenericName
 #: Internet/DrakSync.desktop:3
@@ -743,7 +738,7 @@ msgstr "Sincronizzazione cartelle"
 #. Name
 #: Internet/Evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. GenericName
 #: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
@@ -756,7 +751,7 @@ msgstr "Programma di posta elettronica"
 #. Name
 #: Internet/Faces.desktop:2
 msgid "Faces"
-msgstr ""
+msgstr "Faces"
 
 #. GenericName
 #: Internet/Faces.desktop:3 Internet/coolmail.desktop:3
@@ -766,7 +761,6 @@ msgstr "Programma per controllare la posta"
 
 #. Name
 #: Internet/Fetchmailconf.desktop:2
-#, fuzzy
 msgid "Fetchmailconf"
 msgstr "Configurazione di fetchmail"
 
@@ -778,7 +772,7 @@ msgstr "Configurazione di fetchmail"
 #. Name
 #: Internet/Gabber.desktop:2
 msgid "Gabber"
-msgstr ""
+msgstr "Gabber"
 
 #. GenericName
 #: Internet/Gabber.desktop:3 Internet/gaim.desktop:3
@@ -788,7 +782,7 @@ msgstr "Messaggistica istantanea"
 #. Name
 #: Internet/Galeon.desktop:2
 msgid "Galeon"
-msgstr ""
+msgstr "Galeon"
 
 #. GenericName
 #: Internet/Galeon.desktop:3 Internet/Terminal/Links.desktop:3
@@ -803,7 +797,7 @@ msgstr "Browser Web"
 #. Name
 #: Internet/GnomeICU.desktop:2
 msgid "GNOMEICU"
-msgstr ""
+msgstr "GNOMEICU"
 
 #. GenericName
 #: Internet/GnomeICU.desktop:3 Internet/licq.desktop:3
@@ -812,14 +806,13 @@ msgstr "Messaggistica ICQ"
 
 #. Name
 #: Internet/Netscapemessenger.desktop:2
-#, fuzzy
 msgid "Netscape Messenger"
-msgstr "Messaggistica istantanea"
+msgstr "Netscape Messenger"
 
 #. Name
 #: Internet/Nmapfe.desktop:2
 msgid "Nmapfe"
-msgstr ""
+msgstr "Nmapfe"
 
 #. GenericName
 #: Internet/Nmapfe.desktop:3
@@ -829,7 +822,7 @@ msgstr "Port scanner"
 #. Name
 #: Internet/Pan.desktop:2
 msgid "Pan"
-msgstr ""
+msgstr "Pan"
 
 #. GenericName
 #: Internet/Pan.desktop:3 Internet/knews.desktop:3
@@ -839,17 +832,17 @@ msgstr "Lettore news 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
@@ -865,7 +858,7 @@ msgstr "GUI per BitTorrent"
 #. Name
 #: Internet/Terminal/lftp.desktop:2
 msgid "Lftp"
-msgstr ""
+msgstr "Lftp"
 
 #. GenericName
 #: Internet/Terminal/lftp.desktop:3 Internet/Terminal/ncftp.desktop:3
@@ -875,22 +868,22 @@ msgstr "Client 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
@@ -900,7 +893,7 @@ msgstr "Client SILC"
 #. Name
 #: Internet/Terminal/slrn.desktop:2
 msgid "Slrn"
-msgstr ""
+msgstr "Slrn"
 
 #. GenericName
 #: Internet/Terminal/slrn.desktop:3
@@ -910,17 +903,17 @@ msgstr "Lettore newsgroup"
 #. 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
@@ -930,12 +923,12 @@ msgstr "GUI in python e wxGTK per 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
@@ -955,12 +948,12 @@ msgstr "GUI di 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
@@ -970,17 +963,17 @@ msgstr "Analizzatore di rete"
 #. 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
@@ -1005,7 +998,7 @@ msgstr "Accesso remoto"
 #. Name
 #: Internet/ickle.desktop:2
 msgid "ickle"
-msgstr ""
+msgstr "ickle"
 
 #. GenericName
 #: Internet/ickle.desktop:3
@@ -1015,17 +1008,17 @@ msgstr "Chat ICQ2000"
 #. Name
 #: Internet/javaws.desktop:2
 msgid "Java Web Start"
-msgstr ""
+msgstr "Java Web Start"
 
 #. 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
@@ -1040,48 +1033,47 @@ msgstr "GUI di 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
 msgid "X Biff"
-msgstr ""
+msgstr "X Biff"
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
-msgstr "Chat IRC"
+msgstr "XChat"
 
 #. GenericName
 #: Internet/xchat.desktop:3
@@ -1091,17 +1083,17 @@ msgstr "Chat 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
@@ -1111,7 +1103,7 @@ msgstr "Mixer"
 #. Name
 #: Multimedia/Grip.desktop:2
 msgid "Grip"
-msgstr ""
+msgstr "Grip"
 
 #. GenericName
 #: Multimedia/Grip.desktop:3
@@ -1126,7 +1118,7 @@ msgstr "Informazioni MP3"
 #. Name
 #: Multimedia/XMovie.desktop:2
 msgid "XMovie"
-msgstr ""
+msgstr "XMovie"
 
 #. GenericName
 #: Multimedia/XMovie.desktop:3 Multimedia/mplayer.desktop:3
@@ -1138,7 +1130,7 @@ msgstr "Lettore di video"
 #. Name
 #: Multimedia/alevt.desktop:2
 msgid "AleVT"
-msgstr ""
+msgstr "AleVT"
 
 #. GenericName
 #: Multimedia/alevt.desktop:3
@@ -1158,7 +1150,7 @@ msgstr "Interfaccia mixer di Alsa"
 #. Name
 #: Multimedia/audacity.desktop:2
 msgid "Audacity"
-msgstr ""
+msgstr "Audacity"
 
 #. GenericName
 #: Multimedia/audacity.desktop:3 Multimedia/rezound.desktop:3
@@ -1169,7 +1161,7 @@ msgstr "Editor audio"
 #. Name
 #: Multimedia/aviplay.desktop:2
 msgid "Aviplay"
-msgstr ""
+msgstr "Aviplay"
 
 #. GenericName
 #: Multimedia/aviplay.desktop:3
@@ -1179,7 +1171,7 @@ msgstr "Lettore di video AVI"
 #. Name
 #: Multimedia/bcast2000.desktop:2
 msgid "Broadcast 2000"
-msgstr ""
+msgstr "Broadcast 2000"
 
 #. GenericName
 #: Multimedia/bcast2000.desktop:3
@@ -1189,7 +1181,7 @@ msgstr "Ambiente di sviluppo per audio e video"
 #. Name
 #: Multimedia/enjoympeg.desktop:2
 msgid "EnjoyMPEG"
-msgstr ""
+msgstr "EnjoyMPEG"
 
 #. GenericName
 #: Multimedia/enjoympeg.desktop:3 Multimedia/gtv.desktop:3
@@ -1199,12 +1191,12 @@ msgstr "Lettore 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
@@ -1213,19 +1205,18 @@ msgstr "Elaborazione suoni"
 
 #. Name
 #: Multimedia/mplayer.desktop:2
-#, fuzzy
 msgid "MPlayer"
-msgstr "Lettore 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
@@ -1234,9 +1225,8 @@ msgstr "Lettore DVD"
 
 #. Name
 #: Multimedia/oqtplayer.desktop:2
-#, fuzzy
 msgid "OQTPlayer"
-msgstr "Lettore DVD"
+msgstr "OQTPlayer"
 
 #. GenericName
 #: Multimedia/oqtplayer.desktop:3
@@ -1245,19 +1235,18 @@ msgstr "Lettore di video MOV"
 
 #. Name
 #: Multimedia/realplayer.desktop:2
-#, fuzzy
 msgid "RealPlayer"
-msgstr "Lettore di video"
+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
@@ -1267,12 +1256,12 @@ msgstr "Registratore audio"
 #. 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
@@ -1282,7 +1271,7 @@ msgstr "Guarda la TV!"
 #. Name
 #: Multimedia/xcam.desktop:2
 msgid "XCam"
-msgstr ""
+msgstr "XCam"
 
 #. GenericName
 #: Multimedia/xcam.desktop:3
@@ -1292,7 +1281,7 @@ msgstr "Programma per le macchine fotografiche"
 #. Name
 #: Multimedia/xine.desktop:2
 msgid "Xine"
-msgstr ""
+msgstr "Xine"
 
 #. Name
 #: Multimedia/xmms-enqueue.desktop:2
@@ -1307,7 +1296,7 @@ msgstr "Strumento per le playlist"
 #. Name
 #: Multimedia/xmms.desktop:2
 msgid "XMMS"
-msgstr ""
+msgstr "XMMS"
 
 #. GenericName
 #: Multimedia/xmms.desktop:3
@@ -1317,7 +1306,7 @@ msgstr "Lettore multimediale"
 #. Name
 #: Office/Applix.desktop:2
 msgid "Applix"
-msgstr ""
+msgstr "Applix"
 
 #. GenericName
 #: Office/Applix.desktop:3
@@ -1327,7 +1316,7 @@ msgstr "Programmi per l'ufficio"
 #. Name
 #: Office/Dia.desktop:2
 msgid "Dia"
-msgstr ""
+msgstr "Dia"
 
 #. GenericName
 #: Office/Dia.desktop:3 Office/Guppi.desktop:3
@@ -1336,9 +1325,8 @@ msgstr "Programma per i diagrammi"
 
 #. Name
 #: Office/Gnome-Cal.desktop:2
-#, fuzzy
 msgid "GNOME-Cal"
-msgstr "Talk di GNOME"
+msgstr "GNOME Cal"
 
 #. GenericName
 #: Office/Gnome-Cal.desktop:3
@@ -1347,9 +1335,8 @@ msgstr "Calendario personale"
 
 #. Name
 #: Office/Gnome-Card.desktop:2
-#, fuzzy
 msgid "GNOME-Card"
-msgstr "Talk di GNOME"
+msgstr "GNOME Carta"
 
 #. GenericName
 #: Office/Gnome-Card.desktop:3
@@ -1364,7 +1351,7 @@ msgstr "Segnatempo di GNOME"
 #. Name
 #: Office/Gnumeric.desktop:2
 msgid "Gnumeric"
-msgstr ""
+msgstr "Gnumeric"
 
 #. GenericName
 #: Office/Gnumeric.desktop:3 Office/XsLite.desktop:3
@@ -1374,12 +1361,12 @@ msgstr "Foglio elettronico"
 #. 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 +1376,7 @@ msgstr "Programma calendario"
 #. Name
 #: Office/WordPerfect.desktop:2
 msgid "WordPerfect"
-msgstr ""
+msgstr "WordPerfect"
 
 #. GenericName
 #: Office/WordPerfect.desktop:3 Office/WordPerfect2000.desktop:3
@@ -1400,12 +1387,12 @@ msgstr "Videoscrittura"
 #. 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 +1402,17 @@ msgstr "Programma per la contabilità personale"
 #. 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
@@ -1435,7 +1422,7 @@ msgstr "Visualizzatore PDF"
 #. Name
 #: Office/gnucash.desktop:2
 msgid "GnuCash"
-msgstr ""
+msgstr "GnuCash"
 
 #. GenericName
 #: Office/gnucash.desktop:3
@@ -1445,12 +1432,12 @@ msgstr "Gestione finanze"
 #. 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 +1452,7 @@ msgstr "Rubrica degli indirizzi di Netscape"
 #. Name
 #: Office/plan.desktop:2
 msgid "Plan"
-msgstr ""
+msgstr "Plan"
 
 #. GenericName
 #: Office/plan.desktop:3
@@ -1474,9 +1461,8 @@ msgstr "Gestione del calendario"
 
 #. Name
 #: Office/pybliographic.desktop:2
-#, fuzzy
 msgid "Pybliographic"
-msgstr "Database bibliografico"
+msgstr "Pybliographic"
 
 #. GenericName
 #: Office/pybliographic.desktop:3
@@ -1486,7 +1472,7 @@ msgstr "Database bibliografico"
 #. Name
 #: Office/scribus.desktop:2
 msgid "Scribus"
-msgstr ""
+msgstr "Scribus"
 
 #. GenericName
 #: Office/scribus.desktop:3
@@ -1496,7 +1482,7 @@ msgstr "Pubblicazioni"
 #. Name
 #: Office/xpdf.desktop:2
 msgid "X PDF"
-msgstr ""
+msgstr "X PDF"
 
 #. Name
 #: System/Terminal/aterm.desktop:2
@@ -1511,7 +1497,7 @@ msgstr "Programma terminale"
 #. Name
 #: System/Terminal/procinfo.desktop:2
 msgid "Procinfo"
-msgstr ""
+msgstr "Procinfo"
 
 #. GenericName
 #: System/Terminal/procinfo.desktop:3
@@ -1521,7 +1507,7 @@ msgstr "Informazioni sui processi di sistema"
 #. Name
 #: System/Terminal/rxvt.desktop:2
 msgid "RXVT"
-msgstr ""
+msgstr "RXVT"
 
 #. GenericName
 #: System/Terminal/rxvt.desktop:3
@@ -1531,7 +1517,7 @@ msgstr "Terminale esteso"
 #. Name
 #: System/Terminal/vmstat.desktop:2
 msgid "Vmstat"
-msgstr ""
+msgstr "Vmstat"
 
 #. GenericName
 #: System/Terminal/vmstat.desktop:3
@@ -1551,7 +1537,7 @@ msgstr "Client WTS"
 #. Name
 #: System/editres.desktop:2
 msgid "EditXRes"
-msgstr ""
+msgstr "EditXRes"
 
 #. GenericName
 #: System/editres.desktop:3
@@ -1566,7 +1552,7 @@ msgstr "Amministrazione di sistema SAM"
 #. Name
 #: System/wine.desktop:2
 msgid "Wine"
-msgstr ""
+msgstr "Wine"
 
 #. GenericName
 #: System/wine.desktop:3
@@ -1576,7 +1562,7 @@ msgstr "Esecuzione programmi Windows"
 #. Name
 #: System/xosview.desktop:2
 msgid "X osview"
-msgstr ""
+msgstr "X osview"
 
 #. GenericName
 #: System/xosview.desktop:3
@@ -1586,7 +1572,7 @@ msgstr "Monitor di sistema"
 #. Name
 #: Utilities/Editors/emacs.desktop:2
 msgid "Emacs"
-msgstr ""
+msgstr "Emacs"
 
 #. GenericName
 #: Utilities/Editors/emacs.desktop:3 Utilities/Editors/gedit.desktop:3
@@ -1599,9 +1585,8 @@ msgstr "Editor di testi"
 
 #. Name
 #: Utilities/Editors/gedit.desktop:2
-#, fuzzy
 msgid "gEdit"
-msgstr "Editor X"
+msgstr "gEdit"
 
 #. Name
 #: Utilities/Editors/gvim.desktop:2
@@ -1611,22 +1596,22 @@ msgstr "Vi iMproved"
 #. 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 +1621,12 @@ msgstr "Editor 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
@@ -1671,7 +1656,7 @@ msgstr "Visualizzatore dei log di sistema"
 #. Name
 #: Utilities/XUtilities/Xkill.desktop:2
 msgid "X Kill"
-msgstr ""
+msgstr "Kill X"
 
 #. GenericName
 #: Utilities/XUtilities/Xkill.desktop:3
@@ -1680,9 +1665,8 @@ msgstr "Strumento per uccidere le finestre"
 
 #. Name
 #: Utilities/XUtilities/Xrefresh.desktop:2
-#, fuzzy
 msgid "X Refresh"
-msgstr "Aggiorna lo schermo"
+msgstr "X Refresh"
 
 #. GenericName
 #: Utilities/XUtilities/Xrefresh.desktop:3
@@ -1692,7 +1676,7 @@ msgstr "Aggiorna lo schermo"
 #. Name
 #: Utilities/XUtilities/Xtraceroute.desktop:2
 msgid "X Traceroute"
-msgstr ""
+msgstr "Traceroute X"
 
 #. GenericName
 #: Utilities/XUtilities/Xtraceroute.desktop:3
@@ -1702,7 +1686,7 @@ msgstr "Strumento di rete"
 #. Name
 #: Utilities/XUtilities/xcalc.desktop:2
 msgid "X Calc"
-msgstr ""
+msgstr "Calcolatrice"
 
 #. GenericName
 #: Utilities/XUtilities/xcalc.desktop:3 Utilities/calctool.desktop:3
@@ -1711,9 +1695,8 @@ msgstr "Calcolatrice"
 
 #. Name
 #: Utilities/XUtilities/xclipboard.desktop:2
-#, fuzzy
 msgid "X Clipboard"
-msgstr "XBoard"
+msgstr "Clipboard"
 
 #. GenericName
 #: Utilities/XUtilities/xclipboard.desktop:3
@@ -1722,9 +1705,8 @@ msgstr "Visualizzatore degli appunti"
 
 #. Name
 #: Utilities/XUtilities/xclock.desktop:2
-#, fuzzy
 msgid "X Clock"
-msgstr "Orologio"
+msgstr "Orologio X"
 
 #. GenericName
 #: Utilities/XUtilities/xclock.desktop:3 Utilities/oclock.desktop:3
@@ -1734,7 +1716,7 @@ msgstr "Orologio"
 #. Name
 #: Utilities/XUtilities/xconsole.desktop:2
 msgid "X Console"
-msgstr ""
+msgstr "Console X"
 
 #. GenericName
 #: Utilities/XUtilities/xconsole.desktop:3
@@ -1744,7 +1726,7 @@ msgstr "Visualizzatore messaggi della console"
 #. Name
 #: Utilities/XUtilities/xload.desktop:2
 msgid "X Load"
-msgstr ""
+msgstr "X Load"
 
 #. GenericName
 #: Utilities/XUtilities/xload.desktop:3
@@ -1763,20 +1745,18 @@ msgstr "Lente di ingrandimento del desktop"
 
 #. Name
 #: Utilities/XUtilities/xterm.desktop:2
-#, fuzzy
 msgid "X Terminal"
-msgstr "Terminale"
+msgstr "Terminale X"
 
 #. Name
 #: Utilities/calctool.desktop:2
-#, fuzzy
 msgid "Calctool"
 msgstr "Calcolatrice"
 
 #. Name
 #: Utilities/e-notes.desktop:2
 msgid "E-Notes"
-msgstr ""
+msgstr "E-Notes"
 
 #. GenericName
 #: Utilities/e-notes.desktop:3
@@ -1785,14 +1765,13 @@ msgstr "Note personali"
 
 #. Name
 #: Utilities/oclock.desktop:2
-#, fuzzy
 msgid "OClock"
-msgstr "Orologio"
+msgstr "Orologio O"
 
 #. 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/ja.po b/translations/desktop_files/kappfinder-data/ja.po
index c13d3de9d..c4797da3f 100644
--- a/translations/desktop_files/kappfinder-data/ja.po
+++ b/translations/desktop_files/kappfinder-data/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ka.po b/translations/desktop_files/kappfinder-data/ka.po
index 5592faea6..7e5e49a8e 100644
--- a/translations/desktop_files/kappfinder-data/ka.po
+++ b/translations/desktop_files/kappfinder-data/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/kappfinder-data.pot b/translations/desktop_files/kappfinder-data/kappfinder-data.pot
index b68ac296f..aea71c1cb 100644
--- a/translations/desktop_files/kappfinder-data/kappfinder-data.pot
+++ b/translations/desktop_files/kappfinder-data/kappfinder-data.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
@@ -127,17 +127,12 @@ msgid "ClanBomber"
 msgstr ""
 
 #. GenericName
-#: Games/Arcade/ClanBomber.desktop:3
-#: Games/Arcade/GnobotsII.desktop:3
-#: Games/Arcade/Mures.desktop:3
-#: Games/Arcade/SuperMethaneBrothers.desktop:3
+#: 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/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 ""
@@ -249,8 +244,7 @@ msgid "Rocks n Diamonds"
 msgstr ""
 
 #. GenericName
-#: Games/Arcade/rocksndiamonds.desktop:3
-#: Games/Board/Glines.desktop:3
+#: Games/Arcade/rocksndiamonds.desktop:3 Games/Board/Glines.desktop:3
 msgid "Tactical Game"
 msgstr ""
 
@@ -320,8 +314,7 @@ msgid "Iagno"
 msgstr ""
 
 #. GenericName
-#: Games/Board/Iagno.desktop:3
-#: Games/Board/SameGnome.desktop:3
+#: Games/Board/Iagno.desktop:3 Games/Board/SameGnome.desktop:3
 #: Games/Board/Xgammon.desktop:3
 msgid "Board Game"
 msgstr ""
@@ -352,9 +345,8 @@ msgid "AisleRiot"
 msgstr ""
 
 #. GenericName
-#: Games/Card/AisleRiot.desktop:3
-#: Games/Card/FreeCell.desktop:3 Games/Card/PySol.desktop:3
-#: Games/Card/XPat2.desktop:3
+#: Games/Card/AisleRiot.desktop:3 Games/Card/FreeCell.desktop:3
+#: Games/Card/PySol.desktop:3 Games/Card/XPat2.desktop:3
 msgid "Card Game"
 msgstr ""
 
@@ -434,8 +426,7 @@ msgid "NetHack"
 msgstr ""
 
 #. GenericName
-#: Games/Roguelikes/nethack.desktop:3
-#: Games/Roguelikes/tome.desktop:3
+#: Games/Roguelikes/nethack.desktop:3 Games/Roguelikes/tome.desktop:3
 msgid "Quest Game"
 msgstr ""
 
@@ -470,8 +461,7 @@ msgid "Freeciv"
 msgstr ""
 
 #. GenericName
-#: Games/TacticStrategy/freeciv.desktop:4
-#: Games/xshipwars.desktop:4
+#: Games/TacticStrategy/freeciv.desktop:4 Games/xshipwars.desktop:4
 msgid "Strategy Game"
 msgstr ""
 
@@ -726,8 +716,7 @@ msgid "Dpsftp"
 msgstr ""
 
 #. GenericName
-#: Internet/Dpsftp.desktop:3 Internet/gFTP.desktop:3
-#: Internet/xftp.desktop:3
+#: Internet/Dpsftp.desktop:3 Internet/gFTP.desktop:3 Internet/xftp.desktop:3
 msgid "FTP Browser"
 msgstr ""
 
@@ -747,13 +736,10 @@ msgid "Evolution"
 msgstr ""
 
 #. GenericName
-#: Internet/Evolution.desktop:3
-#: Internet/Netscapemessenger.desktop:3
-#: Internet/Sylpheed.desktop:3
-#: Internet/Terminal/mutt.desktop:3
+#: 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
+#: Internet/mozilla-thunderbird.desktop:3 Internet/xfmail.desktop:3
 msgid "Mail Client"
 msgstr ""
 
@@ -794,14 +780,12 @@ msgid "Galeon"
 msgstr ""
 
 #. 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
+#: 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 ""
 
@@ -872,8 +856,7 @@ msgid "Lftp"
 msgstr ""
 
 #. GenericName
-#: Internet/Terminal/lftp.desktop:3
-#: Internet/Terminal/ncftp.desktop:3
+#: Internet/Terminal/lftp.desktop:3 Internet/Terminal/ncftp.desktop:3
 msgid "FTP Client"
 msgstr ""
 
@@ -1391,9 +1374,8 @@ msgid "WordPerfect"
 msgstr ""
 
 #. GenericName
-#: Office/WordPerfect.desktop:3
-#: Office/WordPerfect2000.desktop:3 Office/abiword.desktop:3
-#: Office/lyx.desktop:3
+#: Office/WordPerfect.desktop:3 Office/WordPerfect2000.desktop:3
+#: Office/abiword.desktop:3 Office/lyx.desktop:3
 msgid "Word Processor"
 msgstr ""
 
@@ -1503,8 +1485,7 @@ msgid "Terminal"
 msgstr ""
 
 #. GenericName
-#: System/Terminal/aterm.desktop:3
-#: Utilities/XUtilities/xterm.desktop:3
+#: System/Terminal/aterm.desktop:3 Utilities/XUtilities/xterm.desktop:3
 msgid "Terminal Program"
 msgstr ""
 
@@ -1589,14 +1570,10 @@ msgid "Emacs"
 msgstr ""
 
 #. 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/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 ""
@@ -1707,8 +1684,7 @@ msgid "X Calc"
 msgstr ""
 
 #. GenericName
-#: Utilities/XUtilities/xcalc.desktop:3
-#: Utilities/calctool.desktop:3
+#: Utilities/XUtilities/xcalc.desktop:3 Utilities/calctool.desktop:3
 msgid "Calculator"
 msgstr ""
 
@@ -1728,8 +1704,7 @@ msgid "X Clock"
 msgstr ""
 
 #. GenericName
-#: Utilities/XUtilities/xclock.desktop:3
-#: Utilities/oclock.desktop:3
+#: Utilities/XUtilities/xclock.desktop:3 Utilities/oclock.desktop:3
 msgid "Clock"
 msgstr ""
 
diff --git a/translations/desktop_files/kappfinder-data/kk.po b/translations/desktop_files/kappfinder-data/kk.po
index 01d8f55eb..b9a93f5b1 100644
--- a/translations/desktop_files/kappfinder-data/kk.po
+++ b/translations/desktop_files/kappfinder-data/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/km.po b/translations/desktop_files/kappfinder-data/km.po
index 1fd3897cc..967d38494 100644
--- a/translations/desktop_files/kappfinder-data/km.po
+++ b/translations/desktop_files/kappfinder-data/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ko.po b/translations/desktop_files/kappfinder-data/ko.po
index c46c2c99b..4b1143821 100644
--- a/translations/desktop_files/kappfinder-data/ko.po
+++ b/translations/desktop_files/kappfinder-data/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/lo.po b/translations/desktop_files/kappfinder-data/lo.po
index c5dcd98d6..91ba0451a 100644
--- a/translations/desktop_files/kappfinder-data/lo.po
+++ b/translations/desktop_files/kappfinder-data/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/lt.po b/translations/desktop_files/kappfinder-data/lt.po
index 64156464d..e554b6008 100644
--- a/translations/desktop_files/kappfinder-data/lt.po
+++ b/translations/desktop_files/kappfinder-data/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/lv.po b/translations/desktop_files/kappfinder-data/lv.po
index 81b7f25aa..4ea13f388 100644
--- a/translations/desktop_files/kappfinder-data/lv.po
+++ b/translations/desktop_files/kappfinder-data/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/mk.po b/translations/desktop_files/kappfinder-data/mk.po
index e6c0c6aa5..b04a6fe1a 100644
--- a/translations/desktop_files/kappfinder-data/mk.po
+++ b/translations/desktop_files/kappfinder-data/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/mn.po b/translations/desktop_files/kappfinder-data/mn.po
index 1b90a6ed8..76655613a 100644
--- a/translations/desktop_files/kappfinder-data/mn.po
+++ b/translations/desktop_files/kappfinder-data/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ms.po b/translations/desktop_files/kappfinder-data/ms.po
index 3f2e6977e..f1f4c52fa 100644
--- a/translations/desktop_files/kappfinder-data/ms.po
+++ b/translations/desktop_files/kappfinder-data/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/mt.po b/translations/desktop_files/kappfinder-data/mt.po
index 3b6e02336..a973eca92 100644
--- a/translations/desktop_files/kappfinder-data/mt.po
+++ b/translations/desktop_files/kappfinder-data/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/nb.po b/translations/desktop_files/kappfinder-data/nb.po
index e9336a71b..6a12711ea 100644
--- a/translations/desktop_files/kappfinder-data/nb.po
+++ b/translations/desktop_files/kappfinder-data/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/nds.po b/translations/desktop_files/kappfinder-data/nds.po
index ab473888f..753b3815f 100644
--- a/translations/desktop_files/kappfinder-data/nds.po
+++ b/translations/desktop_files/kappfinder-data/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ne.po b/translations/desktop_files/kappfinder-data/ne.po
index cacaf559a..d791abc1e 100644
--- a/translations/desktop_files/kappfinder-data/ne.po
+++ b/translations/desktop_files/kappfinder-data/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/nl.po b/translations/desktop_files/kappfinder-data/nl.po
index 5af49571c..9470deb34 100644
--- a/translations/desktop_files/kappfinder-data/nl.po
+++ b/translations/desktop_files/kappfinder-data/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/nn.po b/translations/desktop_files/kappfinder-data/nn.po
index 4ba1ad0ef..e200d2b66 100644
--- a/translations/desktop_files/kappfinder-data/nn.po
+++ b/translations/desktop_files/kappfinder-data/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/nso.po b/translations/desktop_files/kappfinder-data/nso.po
index 676af83f7..869a66c06 100644
--- a/translations/desktop_files/kappfinder-data/nso.po
+++ b/translations/desktop_files/kappfinder-data/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/oc.po b/translations/desktop_files/kappfinder-data/oc.po
index a7e18d29c..a29b4b29b 100644
--- a/translations/desktop_files/kappfinder-data/oc.po
+++ b/translations/desktop_files/kappfinder-data/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/pa.po b/translations/desktop_files/kappfinder-data/pa.po
index cebada150..728c187d6 100644
--- a/translations/desktop_files/kappfinder-data/pa.po
+++ b/translations/desktop_files/kappfinder-data/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/pl.po b/translations/desktop_files/kappfinder-data/pl.po
index 2e0361291..cdb3bb475 100644
--- a/translations/desktop_files/kappfinder-data/pl.po
+++ b/translations/desktop_files/kappfinder-data/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22: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"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/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.13.1\n"
 
 #. Name
 #: Development/Forte.desktop:2
@@ -29,7 +31,7 @@ msgstr "Åšrodowisko Javy"
 #. Name
 #: Development/assistant.desktop:2
 msgid "Qt Assistant"
-msgstr ""
+msgstr "Qt Assistant"
 
 #. GenericName
 #: Development/assistant.desktop:3
@@ -39,7 +41,7 @@ msgstr "Przeglądarka dokumentów"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
@@ -48,9 +50,8 @@ msgstr "Debuger danych"
 
 #. Name
 #: Development/designer.desktop:2
-#, fuzzy
 msgid "Qt Designer"
-msgstr "Projektant okien"
+msgstr "Qt designer"
 
 #. GenericName
 #: Development/designer.desktop:3
@@ -69,9 +70,8 @@ msgstr "Edytor okien dialogowych"
 
 #. Name
 #: Development/eclipse.desktop:3
-#, fuzzy
 msgid "Eclipse"
-msgstr "Åšrodowisko programowania Eclipse"
+msgstr "Eclipse"
 
 #. GenericName
 #: Development/eclipse.desktop:4
@@ -86,7 +86,7 @@ msgstr "Projektant okien"
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -920,9 +920,8 @@ msgstr "Interfejs graficzny do BitTorrent używający wxGTK"
 
 #. Name
 #: Internet/coolmail.desktop:2
-#, fuzzy
 msgid "Coolmail"
-msgstr "coolmail"
+msgstr "Coolmail"
 
 #. Name
 #: Internet/dc_gui.desktop:2
@@ -1493,7 +1492,7 @@ msgstr ""
 #: System/Terminal/aterm.desktop:2
 #, fuzzy
 msgid "Terminal"
-msgstr "Oryginał"
+msgstr "Terminal"
 
 #. GenericName
 #: System/Terminal/aterm.desktop:3 Utilities/XUtilities/xterm.desktop:3
@@ -1755,9 +1754,8 @@ msgstr "Powiększenie pulpitu"
 
 #. Name
 #: Utilities/XUtilities/xterm.desktop:2
-#, fuzzy
 msgid "X Terminal"
-msgstr "Oryginał"
+msgstr "Terminal X"
 
 #. Name
 #: Utilities/calctool.desktop:2
diff --git a/translations/desktop_files/kappfinder-data/pt.po b/translations/desktop_files/kappfinder-data/pt.po
index b2dc6d889..7f4a5e652 100644
--- a/translations/desktop_files/kappfinder-data/pt.po
+++ b/translations/desktop_files/kappfinder-data/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/pt_BR.po b/translations/desktop_files/kappfinder-data/pt_BR.po
index de2dfc00a..e8e704ccc 100644
--- a/translations/desktop_files/kappfinder-data/pt_BR.po
+++ b/translations/desktop_files/kappfinder-data/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-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ro.po b/translations/desktop_files/kappfinder-data/ro.po
index 0941b6ac9..97e5ef7cb 100644
--- a/translations/desktop_files/kappfinder-data/ro.po
+++ b/translations/desktop_files/kappfinder-data/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ru.po b/translations/desktop_files/kappfinder-data/ru.po
index 857dca08b..67a1718e1 100644
--- a/translations/desktop_files/kappfinder-data/ru.po
+++ b/translations/desktop_files/kappfinder-data/ru.po
@@ -1,30 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 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: 2020-06-17 22: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"
+"POT-Creation-Date: 2021-07-07 18:16+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/kappfinder-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"
 
 #. Name
 #: Development/Forte.desktop:2
 msgid "Forte"
-msgstr ""
+msgstr "Forte"
 
 #. GenericName
 #: Development/Forte.desktop:3
 msgid "Java IDE"
-msgstr ""
+msgstr "IDE дл� Java"
 
 #. Name
 #: Development/assistant.desktop:2
@@ -39,7 +42,7 @@ msgstr "Программа про�мотра документов"
 #. Name
 #: Development/ddd.desktop:2
 msgid "DDD"
-msgstr ""
+msgstr "DDD"
 
 #. GenericName
 #: Development/ddd.desktop:3
@@ -48,9 +51,8 @@ msgstr "Экранный отладчик DDD"
 
 #. Name
 #: Development/designer.desktop:2
-#, fuzzy
 msgid "Qt Designer"
-msgstr "Редактор форм"
+msgstr "Qt Designer"
 
 #. GenericName
 #: Development/designer.desktop:3
@@ -71,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
@@ -86,7 +88,7 @@ msgstr "Редактор форм"
 #. Name
 #: Development/j2mewtk.desktop:2
 msgid "J2ME"
-msgstr ""
+msgstr "J2ME"
 
 #. GenericName
 #: Development/j2mewtk.desktop:3
@@ -106,7 +108,7 @@ msgstr "Переводчик дл� Qt"
 #. Name
 #: Development/pose.desktop:2
 msgid "Pose"
-msgstr ""
+msgstr "Pose"
 
 #. GenericName
 #: Development/pose.desktop:3
@@ -116,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
@@ -142,7 +144,7 @@ msgstr "�ркадна� игра"
 #. Name
 #: Games/Arcade/FrozenBubble.desktop:2
 msgid "Frozen Bubble"
-msgstr ""
+msgstr "Frozen Bubble"
 
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
@@ -152,7 +154,7 @@ msgstr "Тетри�-подобна� игра"
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
 msgid "Gnibbles"
-msgstr ""
+msgstr "Gnibbles"
 
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
@@ -162,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
@@ -192,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
@@ -228,7 +230,7 @@ msgstr "Батальон"
 #. Name
 #: Games/Arcade/battleball.desktop:2
 msgid "Battleball"
-msgstr ""
+msgstr "Battleball"
 
 #. GenericName
 #: Games/Arcade/battleball.desktop:3
@@ -238,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
@@ -253,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
@@ -268,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
@@ -289,17 +290,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
@@ -308,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
@@ -326,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
@@ -347,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
@@ -358,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
@@ -389,7 +387,7 @@ msgstr "Сообщение email дл� шахмат"
 #. Name
 #: Games/Emulators/qmamecat.desktop:2
 msgid "Qmamecat"
-msgstr ""
+msgstr "Qmamecat"
 
 #. GenericName
 #: Games/Emulators/qmamecat.desktop:3
@@ -399,7 +397,7 @@ msgstr "Эмул�тор аркадных игр"
 #. Name
 #: Games/GTali.desktop:2
 msgid "GTali"
-msgstr ""
+msgstr "GTali"
 
 #. GenericName
 #: Games/GTali.desktop:3
@@ -429,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
@@ -439,7 +437,7 @@ msgstr "Приключение (кве�т)"
 #. Name
 #: Games/Roguelikes/rogue.desktop:2
 msgid "Rogue"
-msgstr ""
+msgstr "Rogue"
 
 #. GenericName
 #: Games/Roguelikes/rogue.desktop:3
@@ -450,7 +448,7 @@ msgstr "Терминал"
 #. Name
 #: Games/Roguelikes/tome.desktop:2
 msgid "ToME"
-msgstr ""
+msgstr "ToME"
 
 #. Name
 #: Games/Roguelikes/zangband.desktop:2
@@ -466,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
@@ -486,7 +484,7 @@ msgstr "Сервер дл� FreeCiv"
 #. Name
 #: Games/TacticStrategy/xscorch.desktop:3
 msgid "XScorch"
-msgstr ""
+msgstr "XScorch"
 
 #. Comment
 #: Games/TacticStrategy/xscorch.desktop:4
@@ -526,7 +524,7 @@ msgstr ""
 #. Name
 #: Games/xshipwars.desktop:3
 msgid "XShipWars"
-msgstr ""
+msgstr "XShipWars"
 
 #. Name
 #: Graphics/ElectricEyes.desktop:2
@@ -541,7 +539,7 @@ msgstr "Программа про�мотра ри�унков"
 #. Name
 #: Graphics/GPhoto.desktop:2
 msgid "GPhoto"
-msgstr ""
+msgstr "GPhoto"
 
 #. GenericName
 #: Graphics/GPhoto.desktop:3
@@ -581,7 +579,7 @@ msgstr "Программа векторной графики"
 #. Name
 #: Graphics/Xpcd.desktop:2
 msgid "Xpcd"
-msgstr ""
+msgstr "Xpcd"
 
 #. GenericName
 #: Graphics/Xpcd.desktop:3
@@ -611,7 +609,7 @@ msgstr "Создание ра�тровых ри�унков"
 #. Name
 #: Graphics/blender.desktop:2
 msgid "Blender"
-msgstr ""
+msgstr "Blender"
 
 #. GenericName
 #: Graphics/blender.desktop:3
@@ -621,7 +619,7 @@ msgstr "3D рендерер/моделер"
 #. Name
 #: Graphics/ghostview.desktop:2
 msgid "GhostView"
-msgstr ""
+msgstr "GhostView"
 
 #. GenericName
 #: Graphics/ghostview.desktop:3
@@ -631,7 +629,7 @@ msgstr "Программа про�мотра PostScript"
 #. Name
 #: Graphics/gimp.desktop:2
 msgid "Gimp"
-msgstr ""
+msgstr "Gimp"
 
 #. GenericName
 #: Graphics/gimp.desktop:3
@@ -641,7 +639,7 @@ msgstr "Редактор ри�унков"
 #. Name
 #: Graphics/gv.desktop:2
 msgid "GV"
-msgstr ""
+msgstr "GV"
 
 #. GenericName
 #: Graphics/gv.desktop:3
@@ -651,7 +649,7 @@ msgstr "Программа про�мотра Postscript"
 #. Name
 #: Graphics/inkscape.desktop:2
 msgid "Inkscape"
-msgstr ""
+msgstr "Inkscape"
 
 #. GenericName
 #: Graphics/inkscape.desktop:3 Graphics/sodipodi.desktop:3
@@ -676,7 +674,7 @@ msgstr "Программа дл� ри�овани�"
 #. Name
 #: Graphics/xdvi.desktop:2
 msgid "X DVI"
-msgstr ""
+msgstr "X DVI"
 
 #. GenericName
 #: Graphics/xdvi.desktop:3
@@ -691,7 +689,7 @@ msgstr ""
 #. Name
 #: Graphics/xpaint.desktop:2
 msgid "X Paint"
-msgstr ""
+msgstr "X Paint"
 
 #. GenericName
 #: Graphics/xpaint.desktop:3
@@ -701,7 +699,7 @@ msgstr "Графиче�кий редактор"
 #. Name
 #: Graphics/xv.desktop:2
 msgid "XV"
-msgstr ""
+msgstr "XV"
 
 #. GenericName
 #: Graphics/xv.desktop:3
@@ -741,7 +739,7 @@ msgstr "Синхронизаци� папок"
 #. Name
 #: Internet/Evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. GenericName
 #: Internet/Evolution.desktop:3 Internet/Netscapemessenger.desktop:3
@@ -776,7 +774,7 @@ msgstr "�а�тройка fetchmail"
 #. Name
 #: Internet/Gabber.desktop:2
 msgid "Gabber"
-msgstr ""
+msgstr "Gabber"
 
 #. GenericName
 #: Internet/Gabber.desktop:3 Internet/gaim.desktop:3
@@ -843,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
@@ -874,7 +872,7 @@ msgstr "Клиент FTP"
 #. Name
 #: Internet/Terminal/mutt.desktop:2
 msgid "Mutt"
-msgstr ""
+msgstr "Mutt"
 
 #. Name
 #: Internet/Terminal/ncftp.desktop:2
@@ -889,7 +887,7 @@ msgstr ""
 #. Name
 #: Internet/Terminal/silc.desktop:2
 msgid "Silc"
-msgstr ""
+msgstr "Silc"
 
 #. GenericName
 #: Internet/Terminal/silc.desktop:3
@@ -909,7 +907,7 @@ msgstr "Программа дл� чтени� ново�тей"
 #. Name
 #: Internet/Terminal/w3m.desktop:2
 msgid "w3m"
-msgstr ""
+msgstr "w3m"
 
 #. Name
 #: Internet/arena.desktop:2
@@ -954,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
@@ -969,7 +967,7 @@ msgstr "�нализатор �етевого трафика"
 #. Name
 #: Internet/gFTP.desktop:2
 msgid "gFTP"
-msgstr ""
+msgstr "gFTP"
 
 #. Name
 #: Internet/gaim.desktop:2
@@ -1021,7 +1019,7 @@ msgstr "Запу�к приложений Java из �ети"
 #. Name
 #: Internet/knews.desktop:2
 msgid "KNews"
-msgstr ""
+msgstr "KNews"
 
 #. Name
 #: Internet/licq.desktop:2
@@ -1041,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
@@ -1080,9 +1078,8 @@ msgstr ""
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
-msgstr "Клиент IRC"
+msgstr "XChat"
 
 #. GenericName
 #: Internet/xchat.desktop:3
@@ -1122,7 +1119,7 @@ msgstr "CD плейер/риппер"
 #. Name
 #: Multimedia/MP3info.desktop:2
 msgid "MP3 Info"
-msgstr ""
+msgstr "MP3 Info"
 
 #. Name
 #: Multimedia/XMovie.desktop:2
@@ -1170,7 +1167,7 @@ msgstr "Звуковой редактор"
 #. Name
 #: Multimedia/aviplay.desktop:2
 msgid "Aviplay"
-msgstr ""
+msgstr "Aviplay"
 
 #. GenericName
 #: Multimedia/aviplay.desktop:3
@@ -1205,7 +1202,7 @@ msgstr ""
 #. Name
 #: Multimedia/jazz.desktop:2
 msgid "Jazz"
-msgstr ""
+msgstr "Jazz"
 
 #. GenericName
 #: Multimedia/jazz.desktop:3
@@ -1214,9 +1211,8 @@ msgstr "Звуковой проце��ор"
 
 #. Name
 #: Multimedia/mplayer.desktop:2
-#, fuzzy
 msgid "MPlayer"
-msgstr "Проигрыватель MPEG"
+msgstr "MPlayer"
 
 #. Name
 #: Multimedia/mtv.desktop:2
@@ -1293,7 +1289,7 @@ msgstr "Камера"
 #. Name
 #: Multimedia/xine.desktop:2
 msgid "Xine"
-msgstr ""
+msgstr "Xine"
 
 #. Name
 #: Multimedia/xmms-enqueue.desktop:2
@@ -1308,7 +1304,7 @@ msgstr "Спи�ок пе�ен"
 #. Name
 #: Multimedia/xmms.desktop:2
 msgid "XMMS"
-msgstr ""
+msgstr "XMMS"
 
 #. GenericName
 #: Multimedia/xmms.desktop:3
@@ -1328,7 +1324,7 @@ msgstr "Офи�ный пакет"
 #. Name
 #: Office/Dia.desktop:2
 msgid "Dia"
-msgstr ""
+msgstr "Dia"
 
 #. GenericName
 #: Office/Dia.desktop:3 Office/Guppi.desktop:3
@@ -1363,7 +1359,7 @@ msgstr "Учёт времени GNOME"
 #. Name
 #: Office/Gnumeric.desktop:2
 msgid "Gnumeric"
-msgstr ""
+msgstr "Gnumeric"
 
 #. GenericName
 #: Office/Gnumeric.desktop:3 Office/XsLite.desktop:3
@@ -1378,7 +1374,7 @@ msgstr ""
 #. Name
 #: Office/Ical.desktop:2
 msgid "Ical"
-msgstr ""
+msgstr "Ical"
 
 #. GenericName
 #: Office/Ical.desktop:3
@@ -1404,7 +1400,7 @@ msgstr ""
 #. Name
 #: Office/XAcc.desktop:2
 msgid "xacc"
-msgstr ""
+msgstr "xacc"
 
 #. GenericName
 #: Office/XAcc.desktop:3
@@ -1419,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
@@ -1433,8 +1429,9 @@ msgstr "Про�мотр PDF"
 
 #. Name
 #: Office/gnucash.desktop:2
+#, fuzzy
 msgid "GnuCash"
-msgstr ""
+msgstr "GnuCash"
 
 #. GenericName
 #: Office/gnucash.desktop:3
@@ -1444,7 +1441,7 @@ msgstr "Менеджер финан�ов"
 #. Name
 #: Office/lyx.desktop:2
 msgid "LyX"
-msgstr ""
+msgstr "LyX"
 
 #. Name
 #: Office/mrproject.desktop:2
@@ -1495,7 +1492,7 @@ msgstr "�а�тольное издатель�тво"
 #. Name
 #: Office/xpdf.desktop:2
 msgid "X PDF"
-msgstr ""
+msgstr "X PDF"
 
 #. Name
 #: System/Terminal/aterm.desktop:2
@@ -1510,7 +1507,7 @@ msgstr "Терминал"
 #. Name
 #: System/Terminal/procinfo.desktop:2
 msgid "Procinfo"
-msgstr ""
+msgstr "Procinfo"
 
 #. GenericName
 #: System/Terminal/procinfo.desktop:3
@@ -1520,7 +1517,7 @@ msgstr "Сведени� о �и�темных проце��ах"
 #. Name
 #: System/Terminal/rxvt.desktop:2
 msgid "RXVT"
-msgstr ""
+msgstr "RXVT"
 
 #. GenericName
 #: System/Terminal/rxvt.desktop:3
@@ -1530,7 +1527,7 @@ msgstr "Ра�ширенный �мул�тор терминала"
 #. Name
 #: System/Terminal/vmstat.desktop:2
 msgid "Vmstat"
-msgstr ""
+msgstr "Vmstat"
 
 #. GenericName
 #: System/Terminal/vmstat.desktop:3
@@ -1565,7 +1562,7 @@ msgstr "Си�темное админи�трирование SAM"
 #. Name
 #: System/wine.desktop:2
 msgid "Wine"
-msgstr ""
+msgstr "Wine"
 
 #. GenericName
 #: System/wine.desktop:3
@@ -1585,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
@@ -1598,9 +1595,8 @@ msgstr "Тек�товый редактор"
 
 #. Name
 #: Utilities/Editors/gedit.desktop:2
-#, fuzzy
 msgid "gEdit"
-msgstr "Редактор X"
+msgstr "gEdit"
 
 #. Name
 #: Utilities/Editors/gvim.desktop:2
@@ -1615,7 +1611,7 @@ msgstr ""
 #. Name
 #: Utilities/Editors/nano.desktop:2
 msgid "Nano"
-msgstr ""
+msgstr "Nano"
 
 #. Name
 #: Utilities/Editors/nedit.desktop:2
@@ -1625,7 +1621,7 @@ msgstr "NEdit"
 #. Name
 #: Utilities/Editors/pico.desktop:2
 msgid "Pico"
-msgstr ""
+msgstr "Pico"
 
 #. Name
 #: Utilities/Editors/xedit.desktop:2
@@ -1635,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
@@ -1671,7 +1667,7 @@ msgstr "Про�мотр �и�темных журналов"
 #. Name
 #: Utilities/XUtilities/Xkill.desktop:2
 msgid "X Kill"
-msgstr ""
+msgstr "X Kill"
 
 #. GenericName
 #: Utilities/XUtilities/Xkill.desktop:3
@@ -1782,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/rw.po b/translations/desktop_files/kappfinder-data/rw.po
index 0cc13cb62..7c88b44d7 100644
--- a/translations/desktop_files/kappfinder-data/rw.po
+++ b/translations/desktop_files/kappfinder-data/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/se.po b/translations/desktop_files/kappfinder-data/se.po
index 65c9a0903..6f8b7499b 100644
--- a/translations/desktop_files/kappfinder-data/se.po
+++ b/translations/desktop_files/kappfinder-data/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/sk.po b/translations/desktop_files/kappfinder-data/sk.po
index ea7edbea1..f12f4a29f 100644
--- a/translations/desktop_files/kappfinder-data/sk.po
+++ b/translations/desktop_files/kappfinder-data/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22: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"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"PO-Revision-Date: 2020-10-16 15:13+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-data/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Name
 #: Development/Forte.desktop:2
@@ -34,7 +35,7 @@ msgstr ""
 #. GenericName
 #: Development/assistant.desktop:3
 msgid "Document Browser"
-msgstr "Prehliada� dokumentácie"
+msgstr ""
 
 #. Name
 #: Development/ddd.desktop:2
@@ -44,46 +45,42 @@ msgstr ""
 #. GenericName
 #: Development/ddd.desktop:3
 msgid "Data Display Debugger"
-msgstr "Debugger zobrazujúci dáta"
+msgstr ""
 
 #. Name
 #: Development/designer.desktop:2
-#, fuzzy
 msgid "Qt Designer"
-msgstr "Návrh rozhrania"
+msgstr ""
 
 #. GenericName
 #: Development/designer.desktop:3
 msgid "Interface Designer"
-msgstr "Návrh rozhrania"
+msgstr ""
 
 #. Name
 #: Development/dlgedit.desktop:2
-#, fuzzy
 msgid "Qt DlgEdit"
-msgstr "Editor dialógov"
+msgstr ""
 
 #. GenericName
 #: Development/dlgedit.desktop:3
 msgid "Dialog Editor"
-msgstr "Editor dialógov"
+msgstr ""
 
 #. Name
 #: Development/eclipse.desktop:3
-#, fuzzy
 msgid "Eclipse"
-msgstr "IDE Eclipse"
+msgstr ""
 
 #. GenericName
 #: Development/eclipse.desktop:4
 msgid "Eclipse IDE"
-msgstr "IDE Eclipse"
+msgstr ""
 
 #. Name
 #: Development/fdesign.desktop:2
-#, fuzzy
 msgid "FormDesigner"
-msgstr "Návrh rozhrania"
+msgstr ""
 
 #. Name
 #: Development/j2mewtk.desktop:2
@@ -103,7 +100,7 @@ msgstr ""
 #. GenericName
 #: Development/linguist.desktop:3
 msgid "Translation Tool"
-msgstr "Prekladací nástroj"
+msgstr ""
 
 #. Name
 #: Development/pose.desktop:2
@@ -123,13 +120,12 @@ msgstr ""
 #. GenericName
 #: Development/sced.desktop:3
 msgid "Scene Modeler"
-msgstr "Modelovanie scén"
+msgstr ""
 
 #. Name
 #: Games/Arcade/ClanBomber.desktop:2
-#, fuzzy
 msgid "ClanBomber"
-msgstr "ClanBomber"
+msgstr ""
 
 #. GenericName
 #: Games/Arcade/ClanBomber.desktop:3 Games/Arcade/GnobotsII.desktop:3
@@ -140,7 +136,7 @@ msgstr "ClanBomber"
 #: Games/Board/Gataxx.desktop:3 Games/Board/Gnotravex.desktop:3
 #: Games/penguin-command.desktop:4
 msgid "Arcade Game"
-msgstr "Dobrodružná hra"
+msgstr ""
 
 #. Name
 #: Games/Arcade/FrozenBubble.desktop:2
@@ -150,7 +146,7 @@ msgstr ""
 #. GenericName
 #: Games/Arcade/FrozenBubble.desktop:3
 msgid "Tetris-Like Game"
-msgstr "Hra v štýle Tetris"
+msgstr ""
 
 #. Name
 #: Games/Arcade/Gnibbles.desktop:2
@@ -160,7 +156,7 @@ msgstr ""
 #. GenericName
 #: Games/Arcade/Gnibbles.desktop:3
 msgid "GNOME Nibbles Game"
-msgstr "Hra GNOME Nibbles"
+msgstr ""
 
 #. Name
 #: Games/Arcade/GnobotsII.desktop:2
@@ -190,7 +186,7 @@ msgstr ""
 #. GenericName
 #: Games/Arcade/TuxRacer.desktop:3
 msgid "Racing Game"
-msgstr "Závody"
+msgstr ""
 
 #. Name
 #: Games/Arcade/XKobo.desktop:2
@@ -281,13 +277,12 @@ msgstr ""
 #. GenericName
 #: Games/Board/Gmahjongg.desktop:3
 msgid "Tile Game"
-msgstr "Stolová hra"
+msgstr "Hra s dlaždicami"
 
 #. Name
 #: Games/Board/Gmines.desktop:2
-#, fuzzy
 msgid "GNOME Mines"
-msgstr "Hra GNOME Nibbles"
+msgstr ""
 
 #. GenericName
 #: Games/Board/Gmines.desktop:3
@@ -378,9 +373,8 @@ msgstr "ClanBomber"
 
 #. Name
 #: Games/Emulators/cmail.desktop:2
-#, fuzzy
 msgid "ChessMail"
-msgstr "Å ach"
+msgstr ""
 
 #. GenericName
 #: Games/Emulators/cmail.desktop:3
@@ -495,7 +489,7 @@ msgstr "Voľný klon Scorched Earth pre UNIX a X"
 #. Name
 #: Games/Toys/xeyes.desktop:2
 msgid "X Eyes"
-msgstr "O�i"
+msgstr ""
 
 #. Name
 #: Games/Toys/xpinguin.desktop:2
@@ -714,9 +708,8 @@ msgstr ""
 
 #. GenericName
 #: Internet/BlueFish.desktop:3
-#, fuzzy
 msgid "HTML Editor"
-msgstr "Textový editor"
+msgstr ""
 
 #. Name
 #: Internet/Dpsftp.desktop:2
@@ -764,9 +757,8 @@ msgstr "Upozornenie na poštu"
 
 #. Name
 #: Internet/Fetchmailconf.desktop:2
-#, fuzzy
 msgid "Fetchmailconf"
-msgstr "Konfigurácia Fetchmail"
+msgstr ""
 
 #. GenericName
 #: Internet/Fetchmailconf.desktop:3
@@ -810,9 +802,8 @@ msgstr ""
 
 #. Name
 #: Internet/Netscapemessenger.desktop:2
-#, fuzzy
 msgid "Netscape Messenger"
-msgstr "Kniha adries Nescape"
+msgstr ""
 
 #. Name
 #: Internet/Nmapfe.desktop:2
@@ -832,7 +823,7 @@ msgstr ""
 #. GenericName
 #: Internet/Pan.desktop:3 Internet/knews.desktop:3
 msgid "Usenet News Reader"
-msgstr "Klient pre News"
+msgstr "Klient pre Usenet News"
 
 #. Name
 #: Internet/Sylpheed.desktop:2
@@ -993,9 +984,8 @@ msgstr ""
 
 #. Name
 #: Internet/gtelnet.desktop:2
-#, fuzzy
 msgid "GNOME Telnet"
-msgstr "GNOME Výber farby"
+msgstr ""
 
 #. GenericName
 #: Internet/gtelnet.desktop:3
@@ -1010,7 +1000,7 @@ msgstr ""
 #. GenericName
 #: Internet/ickle.desktop:3
 msgid "ICQ2000 Chat"
-msgstr "ICQ2000 chat"
+msgstr ""
 
 #. Name
 #: Internet/javaws.desktop:2
@@ -1079,9 +1069,8 @@ msgstr ""
 
 #. Name
 #: Internet/xchat.desktop:2
-#, fuzzy
 msgid "XChat"
-msgstr "IRC chat"
+msgstr ""
 
 #. GenericName
 #: Internet/xchat.desktop:3
@@ -1213,9 +1202,8 @@ msgstr "Zvukový procesor"
 
 #. Name
 #: Multimedia/mplayer.desktop:2
-#, fuzzy
 msgid "MPlayer"
-msgstr "Prehráva� MPEG"
+msgstr ""
 
 #. Name
 #: Multimedia/mtv.desktop:2
@@ -1234,9 +1222,8 @@ msgstr "DVD prehráva�"
 
 #. Name
 #: Multimedia/oqtplayer.desktop:2
-#, fuzzy
 msgid "OQTPlayer"
-msgstr "DVD prehráva�"
+msgstr ""
 
 #. GenericName
 #: Multimedia/oqtplayer.desktop:3
@@ -1245,9 +1232,8 @@ msgstr "Video prehráva� MOV"
 
 #. Name
 #: Multimedia/realplayer.desktop:2
-#, fuzzy
 msgid "RealPlayer"
-msgstr "Video prehráva�"
+msgstr ""
 
 #. Name
 #: Multimedia/rezound.desktop:2
@@ -1297,7 +1283,7 @@ msgstr ""
 #. Name
 #: Multimedia/xmms-enqueue.desktop:2
 msgid "Enqueue in XMMS"
-msgstr "Enqueue v XMMS"
+msgstr "Zaradiť skladbu do XMMS"
 
 #. GenericName
 #: Multimedia/xmms-enqueue.desktop:3
@@ -1332,7 +1318,7 @@ msgstr ""
 #. GenericName
 #: Office/Dia.desktop:3 Office/Guppi.desktop:3
 msgid "Program for Diagrams"
-msgstr "Diagramy"
+msgstr "Program pre Grafy"
 
 #. Name
 #: Office/Gnome-Cal.desktop:2
@@ -1356,9 +1342,8 @@ msgstr "Správca kontaktov"
 
 #. Name
 #: Office/GnomeTimeTracker.desktop:2
-#, fuzzy
 msgid "GNOME Time Tracker"
-msgstr "Hra GNOME Nibbles"
+msgstr ""
 
 #. Name
 #: Office/Gnumeric.desktop:2
@@ -1473,9 +1458,8 @@ msgstr "Plánovací kalendár"
 
 #. Name
 #: Office/pybliographic.desktop:2
-#, fuzzy
 msgid "Pybliographic"
-msgstr "Bibliografická databáza"
+msgstr ""
 
 #. GenericName
 #: Office/pybliographic.desktop:3
@@ -1560,7 +1544,7 @@ msgstr "Editor zdrojov X"
 #. Name
 #: System/sam.desktop:2
 msgid "SAM System-Administration"
-msgstr "Systémový Administrátor"
+msgstr "Správca systému SAM"
 
 #. Name
 #: System/wine.desktop:2
@@ -1570,7 +1554,7 @@ msgstr ""
 #. GenericName
 #: System/wine.desktop:3
 msgid "Run Windows Programs"
-msgstr "Beh aplikácií Windows"
+msgstr "Spustiť aplikácie Windows"
 
 #. Name
 #: System/xosview.desktop:2
@@ -1628,9 +1612,8 @@ msgstr ""
 
 #. Name
 #: Utilities/Editors/xedit.desktop:2
-#, fuzzy
 msgid "X Editor"
-msgstr "Textový editor"
+msgstr ""
 
 #. Name
 #: Utilities/Editors/xemacs.desktop:2
@@ -1675,13 +1658,12 @@ msgstr ""
 #. GenericName
 #: Utilities/XUtilities/Xkill.desktop:3
 msgid "Window Termination Tool"
-msgstr "Zatváranie okien"
+msgstr "Nástroj na zatváranie okien"
 
 #. Name
 #: Utilities/XUtilities/Xrefresh.desktop:2
-#, fuzzy
 msgid "X Refresh"
-msgstr "Prekreslenie obrazovky"
+msgstr ""
 
 #. GenericName
 #: Utilities/XUtilities/Xrefresh.desktop:3
@@ -1710,9 +1692,8 @@ msgstr "Kalkula�ka"
 
 #. Name
 #: Utilities/XUtilities/xclipboard.desktop:2
-#, fuzzy
 msgid "X Clipboard"
-msgstr "Prehliada� schránky"
+msgstr ""
 
 #. GenericName
 #: Utilities/XUtilities/xclipboard.desktop:3
@@ -1721,9 +1702,8 @@ msgstr "Prehliada� schránky"
 
 #. Name
 #: Utilities/XUtilities/xclock.desktop:2
-#, fuzzy
 msgid "X Clock"
-msgstr "Hodiny"
+msgstr ""
 
 #. GenericName
 #: Utilities/XUtilities/xclock.desktop:3 Utilities/oclock.desktop:3
@@ -1767,9 +1747,8 @@ msgstr "X Terminál"
 
 #. Name
 #: Utilities/calctool.desktop:2
-#, fuzzy
 msgid "Calctool"
-msgstr "Kalkula�ka"
+msgstr ""
 
 #. Name
 #: Utilities/e-notes.desktop:2
@@ -1783,9 +1762,8 @@ msgstr "Osobné poznámky"
 
 #. Name
 #: Utilities/oclock.desktop:2
-#, fuzzy
 msgid "OClock"
-msgstr "Hodiny"
+msgstr ""
 
 #. Name
 #: Utilities/xgnokii.desktop:2
diff --git a/translations/desktop_files/kappfinder-data/sl.po b/translations/desktop_files/kappfinder-data/sl.po
index 48af93da9..8d503b775 100644
--- a/translations/desktop_files/kappfinder-data/sl.po
+++ b/translations/desktop_files/kappfinder-data/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/sr.po b/translations/desktop_files/kappfinder-data/sr.po
index 4115dca5c..151db71ba 100644
--- a/translations/desktop_files/kappfinder-data/sr.po
+++ b/translations/desktop_files/kappfinder-data/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/sr@Latn.po b/translations/desktop_files/kappfinder-data/sr@Latn.po
index 43666bc32..0c07852e1 100644
--- a/translations/desktop_files/kappfinder-data/sr@Latn.po
+++ b/translations/desktop_files/kappfinder-data/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-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ss.po b/translations/desktop_files/kappfinder-data/ss.po
index d9ccf7d0e..388a57f6f 100644
--- a/translations/desktop_files/kappfinder-data/ss.po
+++ b/translations/desktop_files/kappfinder-data/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/sv.po b/translations/desktop_files/kappfinder-data/sv.po
index ff96ec1fc..a1a1862e2 100644
--- a/translations/desktop_files/kappfinder-data/sv.po
+++ b/translations/desktop_files/kappfinder-data/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ta.po b/translations/desktop_files/kappfinder-data/ta.po
index 973095326..f437bb76c 100644
--- a/translations/desktop_files/kappfinder-data/ta.po
+++ b/translations/desktop_files/kappfinder-data/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/te.po b/translations/desktop_files/kappfinder-data/te.po
index c13420fe8..05070ed70 100644
--- a/translations/desktop_files/kappfinder-data/te.po
+++ b/translations/desktop_files/kappfinder-data/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/tg.po b/translations/desktop_files/kappfinder-data/tg.po
index fbd286cbd..709746f4b 100644
--- a/translations/desktop_files/kappfinder-data/tg.po
+++ b/translations/desktop_files/kappfinder-data/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/th.po b/translations/desktop_files/kappfinder-data/th.po
index 8eb46ea51..dcba3c166 100644
--- a/translations/desktop_files/kappfinder-data/th.po
+++ b/translations/desktop_files/kappfinder-data/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/tr.po b/translations/desktop_files/kappfinder-data/tr.po
index fd4947c20..6838f0a4a 100644
--- a/translations/desktop_files/kappfinder-data/tr.po
+++ b/translations/desktop_files/kappfinder-data/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/tt.po b/translations/desktop_files/kappfinder-data/tt.po
index cc7e06b0d..f259f7096 100644
--- a/translations/desktop_files/kappfinder-data/tt.po
+++ b/translations/desktop_files/kappfinder-data/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/uk.po b/translations/desktop_files/kappfinder-data/uk.po
index 47b75e543..d1c814dff 100644
--- a/translations/desktop_files/kappfinder-data/uk.po
+++ b/translations/desktop_files/kappfinder-data/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\n"
+"POT-Creation-Date: 2021-07-07 18:16+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/kappfinder-data/uz.po b/translations/desktop_files/kappfinder-data/uz.po
index b8db786b2..7a0ac8d37 100644
--- a/translations/desktop_files/kappfinder-data/uz.po
+++ b/translations/desktop_files/kappfinder-data/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/uz@cyrillic.po b/translations/desktop_files/kappfinder-data/uz@cyrillic.po
index 34d72b05a..101924a93 100644
--- a/translations/desktop_files/kappfinder-data/uz@cyrillic.po
+++ b/translations/desktop_files/kappfinder-data/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-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/ven.po b/translations/desktop_files/kappfinder-data/ven.po
index 07191b070..dbd90cb30 100644
--- a/translations/desktop_files/kappfinder-data/ven.po
+++ b/translations/desktop_files/kappfinder-data/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/vi.po b/translations/desktop_files/kappfinder-data/vi.po
index 77332d191..5a5cdd0f0 100644
--- a/translations/desktop_files/kappfinder-data/vi.po
+++ b/translations/desktop_files/kappfinder-data/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/wa.po b/translations/desktop_files/kappfinder-data/wa.po
index fca1205a0..5f4130650 100644
--- a/translations/desktop_files/kappfinder-data/wa.po
+++ b/translations/desktop_files/kappfinder-data/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/xh.po b/translations/desktop_files/kappfinder-data/xh.po
index 78a39ffa8..b23b98292 100644
--- a/translations/desktop_files/kappfinder-data/xh.po
+++ b/translations/desktop_files/kappfinder-data/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/zh_CN.po b/translations/desktop_files/kappfinder-data/zh_CN.po
index 83fc008ec..07da33146 100644
--- a/translations/desktop_files/kappfinder-data/zh_CN.po
+++ b/translations/desktop_files/kappfinder-data/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-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/zh_TW.po b/translations/desktop_files/kappfinder-data/zh_TW.po
index 481c52265..219ae50c9 100644
--- a/translations/desktop_files/kappfinder-data/zh_TW.po
+++ b/translations/desktop_files/kappfinder-data/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-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder-data/zu.po b/translations/desktop_files/kappfinder-data/zu.po
index dcc38eb30..c1419ba72 100644
--- a/translations/desktop_files/kappfinder-data/zu.po
+++ b/translations/desktop_files/kappfinder-data/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-17 22:13+0200\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"
diff --git a/translations/desktop_files/kappfinder.desktop/cs.po b/translations/desktop_files/kappfinder.desktop/cs.po
index 57feeac93..44678e4e6 100644
--- a/translations/desktop_files/kappfinder.desktop/cs.po
+++ b/translations/desktop_files/kappfinder.desktop/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kappfinder-kappfinderdesktop/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.2.2\n"
 
 #. Name
 #: kappfinder.desktop:2
 msgid "KAppfinder"
-msgstr ""
+msgstr "KAppfinder"
 
 #. GenericName
 #: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/it.po b/translations/desktop_files/kappfinder.desktop/it.po
index 6463c8368..bebce041b 100644
--- a/translations/desktop_files/kappfinder.desktop/it.po
+++ b/translations/desktop_files/kappfinder.desktop/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
 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: 2021-04-18 18:00+0000\n"
+"Last-Translator: Fiflagar Lorizen <fiflagar.lorizen@posteo.net>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/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.5.3\n"
 
 #. Name
 #: kappfinder.desktop:2
 msgid "KAppfinder"
-msgstr ""
+msgstr "KAppfinder"
 
 #. GenericName
 #: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/pl.po b/translations/desktop_files/kappfinder.desktop/pl.po
index 54b47d541..a0e376ee0 100644
--- a/translations/desktop_files/kappfinder.desktop/pl.po
+++ b/translations/desktop_files/kappfinder.desktop/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/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.1.1\n"
 
 #. Name
 #: kappfinder.desktop:2
 msgid "KAppfinder"
-msgstr ""
+msgstr "Wyszukiwanie aplikacji"
 
 #. GenericName
 #: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/ru.po b/translations/desktop_files/kappfinder.desktop/ru.po
index bba5a2de3..f7eef618f 100644
--- a/translations/desktop_files/kappfinder.desktop/ru.po
+++ b/translations/desktop_files/kappfinder.desktop/ru.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2022.
 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: 2022-02-14 23:01+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/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.10.1\n"
 
 #. Name
 #: kappfinder.desktop:2
 msgid "KAppfinder"
-msgstr ""
+msgstr "KAppfinder"
 
 #. GenericName
 #: kappfinder.desktop:3
diff --git a/translations/desktop_files/kappfinder.desktop/sk.po b/translations/desktop_files/kappfinder.desktop/sk.po
index eb11432a3..6d0c1efe4 100644
--- a/translations/desktop_files/kappfinder.desktop/sk.po
+++ b/translations/desktop_files/kappfinder.desktop/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 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: 2020-10-16 15:13+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kappfinder-kappfinderdesktop/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Name
 #: kappfinder.desktop:2
@@ -24,4 +25,4 @@ msgstr ""
 #. GenericName
 #: kappfinder.desktop:3
 msgid "Menu Updating Tool"
-msgstr "Nástroj na aktualizáciu menu"
+msgstr "Nástroj na aktualizáciu ponuky"
diff --git a/translations/desktop_files/kate-desktops/cs.po b/translations/desktop_files/kate-desktops/cs.po
index 899ebea5b..86d2d950f 100644
--- a/translations/desktop_files/kate-desktops/cs.po
+++ b/translations/desktop_files/kate-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-10-07 19:02+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kate-desktop-files/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.2.2\n"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -24,7 +25,7 @@ msgstr "Pokro�ilý textový editor"
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
@@ -39,4 +40,4 @@ msgstr "Textový editor"
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/it.po b/translations/desktop_files/kate-desktops/it.po
index 25593ea19..a98daa05f 100644
--- a/translations/desktop_files/kate-desktops/it.po
+++ b/translations/desktop_files/kate-desktops/it.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2021.
 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: 2021-10-24 06:30+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kate-desktop-files/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.8.1\n"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -24,7 +26,7 @@ msgstr "Editor di testi avanzato"
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
@@ -39,4 +41,4 @@ msgstr "Editor di testi"
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/pl.po b/translations/desktop_files/kate-desktops/pl.po
index 2c9859c6e..594e501a6 100644
--- a/translations/desktop_files/kate-desktops/pl.po
+++ b/translations/desktop_files/kate-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 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: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kate-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.13.1\n"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -24,7 +26,7 @@ msgstr "Zaawansowany edytor tekstu"
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
@@ -39,4 +41,4 @@ msgstr "Edytor tekstu"
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/ru.po b/translations/desktop_files/kate-desktops/ru.po
index 537882289..f18ccd22a 100644
--- a/translations/desktop_files/kate-desktops/ru.po
+++ b/translations/desktop_files/kate-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>, 2022.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 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: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kate-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"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -24,7 +27,7 @@ msgstr "Улучшенный тек�товый редактор"
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
@@ -39,4 +42,4 @@ msgstr "Тек�товый редактор"
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/sk.po b/translations/desktop_files/kate-desktops/sk.po
index 415272014..ff9258708 100644
--- a/translations/desktop_files/kate-desktops/sk.po
+++ b/translations/desktop_files/kate-desktops/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 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: 2020-10-22 06:05+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kate-desktop-files/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -24,7 +25,7 @@ msgstr "Pokro�ilý textový editor"
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
@@ -39,4 +40,4 @@ msgstr "Textový editor"
 #. Name
 #: data/kwrite.desktop:3
 msgid "KWrite"
-msgstr ""
+msgstr "KWrite"
diff --git a/translations/desktop_files/kate-desktops/tr.po b/translations/desktop_files/kate-desktops/tr.po
index ff2ea30f7..20f75683c 100644
--- a/translations/desktop_files/kate-desktops/tr.po
+++ b/translations/desktop_files/kate-desktops/tr.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Erdem Ersoy <erdemersoy@erdemersoy.net>, 2021.
 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: 2021-04-20 20:01+0000\n"
+"Last-Translator: Erdem Ersoy <erdemersoy@erdemersoy.net>\n"
+"Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kate-desktop-files/tr/>\n"
 "Language: tr\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.5.3\n"
 
 #. GenericName
 #: data/kate.desktop:2
@@ -24,7 +25,7 @@ msgstr "Gelişmiş Metin Düzenleyici"
 #. Name
 #: data/kate.desktop:3
 msgid "Kate"
-msgstr ""
+msgstr "Kate"
 
 #. Comment
 #: data/kateplugin.desktop:5
@@ -39,4 +40,4 @@ msgstr "Metin Düzenleyici"
 #. 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 c3cc359c0..3840a3b42 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "Evex"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "Kde 1"
@@ -90,6 +95,16 @@ msgid "Keramik White"
 msgstr "Keramik Wit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media Perske"
@@ -110,6 +125,11 @@ msgid "Plastik"
 msgstr "Plastiek"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Punt Strale Groen"
@@ -120,6 +140,11 @@ msgid "Pumpkin"
 msgstr "Pampoen"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -135,6 +160,11 @@ msgid "System"
 msgstr "Stelsel"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hoë kontras wit teks"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ar.po b/translations/desktop_files/kcontrol-color-schemes/ar.po
index 6fe86c385..2652aa5ec 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "قرميدي أبيض"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "بلاستيك"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "يقطيني"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "النظام"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "نص أبيض عالي التباين"
diff --git a/translations/desktop_files/kcontrol-color-schemes/az.po b/translations/desktop_files/kcontrol-color-schemes/az.po
index a10cfeea2..f482ef2d7 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik AÄŸ"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes Yaşılı"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris CDE"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/be.po b/translations/desktop_files/kcontrol-color-schemes/be.po
index 6f1dc742e..54f4f8c21 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Бела� кераміка"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тык"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Гарбуз"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Сі�т�ма"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Вы�ока кантра�тна� \"белы т�к�т\""
diff --git a/translations/desktop_files/kcontrol-color-schemes/bg.po b/translations/desktop_files/kcontrol-color-schemes/bg.po
index 41681f6a0..36f33f8a8 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: 2020-06-18 21:04+0200\n"
+"POT-Creation-Date: 2023-11-02 18:13+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/"
@@ -63,6 +63,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Керамика в б�ло"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "Пла�тика"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Тиква"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Си�тема"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Б�л тек�т � ви�ок контра�т"
diff --git a/translations/desktop_files/kcontrol-color-schemes/bn.po b/translations/desktop_files/kcontrol-color-schemes/bn.po
index 4b7a13495..ff6b8a7b3 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "কে.ডি.ই. ১"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "কেরামিক সাদা"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "মিডিয়া পীচ"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "প�লাস�টিক"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "পাম�পকিন"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "সোলারিস"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "সিস�টেম"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "হাই কনট�রাস�ট সাদা লেখা"
diff --git a/translations/desktop_files/kcontrol-color-schemes/br.po b/translations/desktop_files/kcontrol-color-schemes/br.po
index 80370c31e..6c014566f 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik gwenn"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Reizhiad"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/bs.po b/translations/desktop_files/kcontrol-color-schemes/bs.po
index c8accd749..b031ff346 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik bijela"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media breskva"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes zelena"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Visoki kontrast, bijeli tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ca.po b/translations/desktop_files/kcontrol-color-schemes/ca.po
index d8a3fa82b..9b3b1195f 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik blanc"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verd Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Carabassa"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Text blanc d'alt contrast"
diff --git a/translations/desktop_files/kcontrol-color-schemes/cs.po b/translations/desktop_files/kcontrol-color-schemes/cs.po
index 599f2a96f..ccc183366 100644
--- a/translations/desktop_files/kcontrol-color-schemes/cs.po
+++ b/translations/desktop_files/kcontrol-color-schemes/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+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: 2023-11-02 18:13+0000\n"
+"PO-Revision-Date: 2020-12-23 13:59+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"
 "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.4\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -24,7 +25,7 @@ msgstr "Atlasově zelená"
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
@@ -39,7 +40,7 @@ msgstr "Modrá plískanice"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -54,22 +55,27 @@ msgstr "Pouštní �ervená"
 #. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
-msgstr ""
+msgstr "CDE Digital"
 
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
+msgstr "EveX"
+
+#. Name
+#: Human.kcsrc:2
+msgid "Human"
 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
@@ -79,7 +85,7 @@ msgstr "Keramika"
 #. Name
 #: KeramikEmerald.kcsrc:2
 msgid "Keramik Emerald"
-msgstr "Keramika (emerald)"
+msgstr "Keramika (smaragdová)"
 
 #. Name
 #: KeramikWhite.kcsrc:2
@@ -87,14 +93,24 @@ msgid "Keramik White"
 msgstr "Keramika (bílá)"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
-msgstr ""
+msgstr "Pastelově broskvová"
 
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -104,12 +120,17 @@ msgstr "Bledě šedá"
 #. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
+msgstr "Plastický"
+
+#. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
 msgstr ""
 
 #. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
-msgstr "Point Reyes zelená"
+msgstr "Zelená Point Reyes"
 
 #. Name
 #: Pumpkin.kcsrc:3
@@ -117,9 +138,14 @@ msgid "Pumpkin"
 msgstr "Dýně"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
@@ -132,6 +158,11 @@ msgid "System"
 msgstr "Systém"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Vysoký kontrast, bílý text"
@@ -139,17 +170,17 @@ msgstr "Vysoký kontrast, bílý text"
 #. 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/csb.po b/translations/desktop_files/kcontrol-color-schemes/csb.po
index 527972c32..0ab321869 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik Biôłi"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Zelonosc pùnktu Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Bania"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Systema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Kòntrastowi biôłi tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/cy.po b/translations/desktop_files/kcontrol-color-schemes/cy.po
index e4b9c7016..327d07df3 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik Gwyn"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Eirynen Wlanog Cyfryngau"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Gwyrdd Point Reyes "
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Pwmpen"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Cysawd"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/da.po b/translations/desktop_files/kcontrol-color-schemes/da.po
index 7353311f9..74dbc6496 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik hvid"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hvid tekst med høj kontrast"
diff --git a/translations/desktop_files/kcontrol-color-schemes/de.po b/translations/desktop_files/kcontrol-color-schemes/de.po
index 76d42e31e..f4f006d11 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Porzellanweiß"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Mittlere Pfirsichfarbe"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes-Grün"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Kürbis"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hoher Kontrast, Weiß auf Schwarz"
diff --git a/translations/desktop_files/kcontrol-color-schemes/el.po b/translations/desktop_files/kcontrol-color-schemes/el.po
index ce21e78fe..f0819fbe6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/el.po
+++ b/translations/desktop_files/kcontrol-color-schemes/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>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+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: 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"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/color-schemes/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.10.1\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -24,7 +25,7 @@ msgstr "Atlas π�άσινο"
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
@@ -39,7 +40,7 @@ msgstr "Μπλε Slate"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -62,20 +63,24 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+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 άσπ�ο"
+msgstr "Κε�αμικό"
 
 #. Name
 #: KeramikEmerald.kcsrc:2
@@ -88,14 +93,24 @@ msgid "Keramik White"
 msgstr "Keramik άσπ�ο"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
-msgstr ""
+msgstr "Βε�ίκοκο παστέλ"
 
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "NeXT"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -105,12 +120,17 @@ msgstr "Χλωμό γκ�ι"
 #. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
+msgstr "Πλαστικό"
+
+#. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
 msgstr ""
 
 #. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
-msgstr ""
+msgstr "Π�άσινο Point Reyes"
 
 #. Name
 #: Pumpkin.kcsrc:3
@@ -118,9 +138,14 @@ msgid "Pumpkin"
 msgstr "Κολοκ�θα"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Σ�στημα"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Άσπ�ο κείμενο υψηλής αντίθεσης"
@@ -140,17 +170,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/en_GB.po b/translations/desktop_files/kcontrol-color-schemes/en_GB.po
index 65b228073..7c0293f4b 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/eo.po b/translations/desktop_files/kcontrol-color-schemes/eo.po
index 8f33c70ed..150773c83 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Ceramika blanko"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Persiko"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastiko"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verdaj tonoj"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Kukurbo"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solariso"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistemo"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Alt-kontrasta Blanka Teksto"
diff --git a/translations/desktop_files/kcontrol-color-schemes/es.po b/translations/desktop_files/kcontrol-color-schemes/es.po
index addbdd69c..974ef787e 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik blanco"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Melocotón multimedia"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Calabaza"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Texto blanco de alto contraste"
diff --git a/translations/desktop_files/kcontrol-color-schemes/es_AR.po b/translations/desktop_files/kcontrol-color-schemes/es_AR.po
new file mode 100644
index 000000000..7b3ee5cbf
--- /dev/null
+++ b/translations/desktop_files/kcontrol-color-schemes/es_AR.po
@@ -0,0 +1,188 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Sergio Ricardo Vicari <sercari@gmail.com>, 2020.
+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"
+"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/color-schemes/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.3.2\n"
+
+#. Name
+#: AtlasGreen.kcsrc:3
+msgid "Atlas Green"
+msgstr "Atlas verde"
+
+#. Name
+#: BeOS.kcsrc:3
+msgid "BeOS"
+msgstr "BeOS"
+
+#. Name
+#: BlackOnWhite.kcsrc:2
+msgid "High Contrast Black Text"
+msgstr "Texto negro de alto contraste"
+
+#. Name
+#: BlueSlate.kcsrc:3
+msgid "Blue Slate"
+msgstr "Azul Pizarra"
+
+#. Name
+#: CDE.kcsrc:3
+msgid "CDE"
+msgstr "CDE"
+
+#. Name
+#: DarkBlue.kcsrc:2
+msgid "Dark Blue"
+msgstr "Azul oscuro"
+
+#. Name
+#: DesertRed.kcsrc:3
+msgid "Desert Red"
+msgstr "Rojo desierto"
+
+#. Name
+#: DigitalCDE.kcsrc:3
+msgid "Digital CDE"
+msgstr "CDE Digital"
+
+#. Name
+#: EveX.kcsrc:2
+msgid "EveX"
+msgstr "EveX"
+
+#. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
+#: KDEOne.kcsrc:2
+msgid "KDE 1"
+msgstr "TDE 1"
+
+#. Name
+#: KDETwo.kcsrc:2
+msgid "KDE 2"
+msgstr "TDE 2"
+
+#. Name
+#: Keramik.kcsrc:2
+msgid "Keramik"
+msgstr "Keramik"
+
+#. Name
+#: KeramikEmerald.kcsrc:2
+msgid "Keramik Emerald"
+msgstr "Keramik Esmeralda"
+
+#. Name
+#: KeramikWhite.kcsrc:2
+msgid "Keramik White"
+msgstr "Keramik Blanca"
+
+#. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
+#: MediaPeach.kcsrc:2
+msgid "Media Peach"
+msgstr ""
+
+#. Name
+#: Next.kcsrc:2
+msgid "Next"
+msgstr "Siguiente"
+
+#. Name
+#: PaleGray.kcsrc:3
+msgid "Pale Gray"
+msgstr "Gris pálido"
+
+#. Name
+#: Plastik.kcsrc:2
+msgid "Plastik"
+msgstr ""
+
+#. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
+#: PointReyesGreen.kcsrc:2
+msgid "Point Reyes Green"
+msgstr ""
+
+#. Name
+#: Pumpkin.kcsrc:3
+msgid "Pumpkin"
+msgstr ""
+
+#. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
+#: SolarisCDE.kcsrc:2
+msgid "Solaris"
+msgstr ""
+
+#. Name
+#: Storm.kcsrc:3
+msgid "Storm"
+msgstr "Tormenta"
+
+#. Name
+#: System.kcsrc:2
+msgid "System"
+msgstr "Sistema"
+
+#. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
+#: WhiteOnBlack.kcsrc:2
+msgid "High Contrast White Text"
+msgstr "Texto blanco de alto contraste"
+
+#. Name
+#: Windows2000.kcsrc:2
+msgid "Redmond 2000"
+msgstr ""
+
+#. Name
+#: Windows95.kcsrc:3
+msgid "Redmond 95"
+msgstr ""
+
+#. Name
+#: WindowsXP.kcsrc:2
+msgid "Redmond XP"
+msgstr ""
+
+#. Name
+#: YellowOnBlue.kcsrc:2
+msgid "High Contrast Yellow on Blue"
+msgstr "Alto contraste amarillo en azul"
diff --git a/translations/desktop_files/kcontrol-color-schemes/et.po b/translations/desktop_files/kcontrol-color-schemes/et.po
index 586ee0f74..8a7979623 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Valge Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes roheline"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Kõrvits"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Süsteem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Väga kontrastne valge tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/eu.po b/translations/desktop_files/kcontrol-color-schemes/eu.po
index 60314c221..f7d55c284 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik zuria"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Multimedia mertxika"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes berdea"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Kalabaza"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Kontraste handiko testu zuria"
diff --git a/translations/desktop_files/kcontrol-color-schemes/fa.po b/translations/desktop_files/kcontrol-color-schemes/fa.po
index 9d33b7195..268e1d1f1 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE Û±"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "س�ید کرامیک"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "پلاستیک"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "سبز نقطه-نقطه"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "کدو حلوایی"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "سولاریس"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "سیستم"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "متن س�ید با سایه روشن بالا"
diff --git a/translations/desktop_files/kcontrol-color-schemes/fi.po b/translations/desktop_files/kcontrol-color-schemes/fi.po
index 0163180bb..0ef6df59b 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik valkoinen"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Kurpitsa"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Järjestelmä"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Suuren värikontrastin valkoinen teksti"
diff --git a/translations/desktop_files/kcontrol-color-schemes/fo.po b/translations/desktop_files/kcontrol-color-schemes/fo.po
index 0be529428..a3f1bf73f 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Kervi"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/fr.po b/translations/desktop_files/kcontrol-color-schemes/fr.po
index 0336d363e..b8fd519bc 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik blanc"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pêche pastel"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Vert doux"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Potiron"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Système"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Texte en blanc avec contraste élevé"
diff --git a/translations/desktop_files/kcontrol-color-schemes/fy.po b/translations/desktop_files/kcontrol-color-schemes/fy.po
index a0feb26a5..d02907876 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Keramyk-wit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastyk"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Dúngrien"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "klabats"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Systeem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Heech kontrast wite tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ga.po b/translations/desktop_files/kcontrol-color-schemes/ga.po
index ef831564b..f8b620968 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Bán Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Puimcín"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Córas"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/gl.po b/translations/desktop_files/kcontrol-color-schemes/gl.po
index 8e553f1c9..5a81d5770 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramic Branco"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Texto Branco de Alto Contraste"
diff --git a/translations/desktop_files/kcontrol-color-schemes/he.po b/translations/desktop_files/kcontrol-color-schemes/he.po
index d133afb61..b81c4d9f6 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "�פרסק"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "ירוק י�"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "דלעת"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "מערכת"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "ניגודיות גבוהה ע� טקסט לבן"
diff --git a/translations/desktop_files/kcontrol-color-schemes/hi.po b/translations/desktop_files/kcontrol-color-schemes/hi.po
index 51874518a..844adb587 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "�वेक�स"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "केडीई 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "केरमिक सफेद"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "मीडिया पीच"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "प�लास�टिक"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "प�वाइंट रेस हरा"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "क�म�हड़ा"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "सोलारिस"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "तंत�र"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/hr.po b/translations/desktop_files/kcontrol-color-schemes/hr.po
index 7c55fc064..40e7a91e7 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik bijela"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Medijska breskva"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Plastika"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes zeleno"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Bundeva"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sustav"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Bijeli tekst visokog kontrasta"
diff --git a/translations/desktop_files/kcontrol-color-schemes/hu.po b/translations/desktop_files/kcontrol-color-schemes/hu.po
index 11306dfd0..57539f2e9 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik (fehér)"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Barackszínű"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Zöldes árnyalat"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Házitök"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Rendszer"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Erősen kontrasztos fehér szöveg"
diff --git a/translations/desktop_files/kcontrol-color-schemes/id.po b/translations/desktop_files/kcontrol-color-schemes/id.po
index a69aa1bf1..9dbc920ae 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/is.po b/translations/desktop_files/kcontrol-color-schemes/is.po
index d468f409b..e1c551bf5 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik hvítt"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Plast"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes grænt"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Grasker"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Kerfi"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Há birtuskila hvítur texti"
diff --git a/translations/desktop_files/kcontrol-color-schemes/it.po b/translations/desktop_files/kcontrol-color-schemes/it.po
index 71756c2cc..56ee0d0d8 100644
--- a/translations/desktop_files/kcontrol-color-schemes/it.po
+++ b/translations/desktop_files/kcontrol-color-schemes/it.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+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: 2023-11-02 18:13+0000\n"
+"PO-Revision-Date: 2023-11-08 01:13+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"
 "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
 #: AtlasGreen.kcsrc:3
@@ -24,7 +26,7 @@ msgstr "Atlante verde"
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
@@ -39,7 +41,7 @@ msgstr "Blu ardesia"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -54,22 +56,27 @@ msgstr "Rosso deserto"
 #. Name
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
-msgstr ""
+msgstr "CDE Digitale"
 
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
-msgstr ""
+msgstr "EveX"
+
+#. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr "Umano"
 
 #. 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
@@ -87,6 +94,16 @@ msgid "Keramik White"
 msgstr "Ceramica bianca"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr "Lucertola"
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pesca"
@@ -94,7 +111,7 @@ msgstr "Pesca"
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -107,6 +124,11 @@ msgid "Plastik"
 msgstr "Plastica"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr "Platino"
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde Point Reyes"
@@ -117,9 +139,14 @@ msgid "Pumpkin"
 msgstr "Zucca"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr "Sienna"
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
@@ -132,6 +159,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr "WedgieWeb"
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Testo bianco ad alto contrasto"
@@ -139,17 +171,17 @@ msgstr "Testo bianco ad alto contrasto"
 #. 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/ja.po b/translations/desktop_files/kcontrol-color-schemes/ja.po
index 320a0c81a..6e82decd1 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "�イントレイズグリーン"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "���ゃ色"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "システム"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "�イコントラスト�白�テキスト"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ka.po b/translations/desktop_files/kcontrol-color-schemes/ka.po
index 40b285fa5..f51a17183 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ka.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "სისტემ�"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "მ�ღ�ლკ�ნსტრ�სტული თეთრი ტექტი"
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 2c9449596..bc28357e2 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/kk.po b/translations/desktop_files/kcontrol-color-schemes/kk.po
index e17bd723f..cfa5f26d7 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "��қабақ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Сол�ри�"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Жүйелік"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Контра�тығы жоғары ақ мәтін"
diff --git a/translations/desktop_files/kcontrol-color-schemes/km.po b/translations/desktop_files/kcontrol-color-schemes/km.po
index 054c858c1..29cfb83d3 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE ១"
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik ស"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "ប្ល៉ាស្ទិក"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "ល្ពៅ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "ប្រព�ន្ធ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "អ�្�បទ​ពណ៌​ស កម្រិ�​ពណ៌​�្ពស់"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ko.po b/translations/desktop_files/kcontrol-color-schemes/ko.po
index f3add73b1..81f933e4d 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "시스템"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/lo.po b/translations/desktop_files/kcontrol-color-schemes/lo.po
index 79d59f881..f8d704876 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "�ບບ EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "ໂປຣ��ຣມຈັດ�ານຫນ້າຕ່າງ KDE 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "ເຄຣາມິ� - K"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "ລູ�ທ�້"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "ຈຸດຂງວປະ�າ�"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "ຫມາ�ອຶ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "ໂຊລາຣິສ"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "ຈັດ�ານລະບົບ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/lt.po b/translations/desktop_files/kcontrol-color-schemes/lt.po
index 342911d0b..ce9c3ff3f 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik baltas"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media persiko"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "Plastikinis"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes žalia"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solario CDE"
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Didelio kontrasto baltas tekstas"
diff --git a/translations/desktop_files/kcontrol-color-schemes/lv.po b/translations/desktop_files/kcontrol-color-schemes/lv.po
index e82d42516..318f08fae 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Balta Keramika"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "MÄ“diju Persiks"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastika"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes Zaļš"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Ķirbis"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistēma"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/mk.po b/translations/desktop_files/kcontrol-color-schemes/mk.po
index 35dbe019b..e8d067a2b 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Керамик бело"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Тиквичка"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Си�тем"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Бел тек�т �о ви�ок контра�т"
diff --git a/translations/desktop_files/kcontrol-color-schemes/mn.po b/translations/desktop_files/kcontrol-color-schemes/mn.po
index 4dba036b5..1a5add8c2 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "КДЭ 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Шаазан цагаан"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes-�огоон"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Хулуу"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Си�тем"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/ms.po b/translations/desktop_files/kcontrol-color-schemes/ms.po
index c66642cf8..91e969086 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Putih Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pic Sederhana"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Labu"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Teks Putih Kontras Tinggi"
diff --git a/translations/desktop_files/kcontrol-color-schemes/mt.po b/translations/desktop_files/kcontrol-color-schemes/mt.po
index b95b25055..daf00e49b 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik Abjad"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Aħdar Point Reyes"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Qargħa Ħamra"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/nb.po b/translations/desktop_files/kcontrol-color-schemes/nb.po
index a65e21244..7a4d44d42 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Keramikk, hvit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Mediefersken"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plast"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Grønn og rosa"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Gresskar"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Høykontrast, hvit tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nds.po b/translations/desktop_files/kcontrol-color-schemes/nds.po
index 8b1dda5f9..d0a767b9e 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramikwitt"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Middelpeersch"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes-Gröön"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Körbs"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Systeem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hogen Kontrast, witt Text"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ne.po b/translations/desktop_files/kcontrol-color-schemes/ne.po
index d125d7f5b..7d4328737 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "केरामिक सेतो"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "मिडिया पिच"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "प�लास�टिक"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "बिन�द� रेइज हरियो"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "पम�पकिन"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "सोलारिस"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "प�रणाली"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "उच�च व�यतिरेक सेतो पाठ"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nl.po b/translations/desktop_files/kcontrol-color-schemes/nl.po
index a69bae666..189991ec6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/nl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik-wit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Duingroen"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Pompoen"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Systeem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Hoog contrast witte tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nn.po b/translations/desktop_files/kcontrol-color-schemes/nn.po
index 4a148d254..3a4d0a8d0 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Keramikk kvit"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Mediefersken"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plast"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Grøn og rosa"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Graskar"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Høgkontrast, kvit tekst"
diff --git a/translations/desktop_files/kcontrol-color-schemes/nso.po b/translations/desktop_files/kcontrol-color-schemes/nso.po
index 7fda9a302..58b6d66a5 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Boshweu bja Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Lephutsi"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/oc.po b/translations/desktop_files/kcontrol-color-schemes/oc.po
index 7898a6e92..9e6594dcc 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistemo"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/pa.po b/translations/desktop_files/kcontrol-color-schemes/pa.po
index 3de389ee7..580747870 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "ਕੀਰਾਮਿਕ ਸਫੈਦ"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "ਮੀਡਿਆ ਪੀਂਚ"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "ਪਲਾਸਟਿਕ"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "ਬਿੰਦੂ ਰੀਆਈਸ ਹਰਾ"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "ਪੰਪਕਿਨ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "ਸਿਸਟਮ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "ਜਿਆਦਾ ਗੂੜਾ ਪਾਠ ਸਫੈਦ"
diff --git a/translations/desktop_files/kcontrol-color-schemes/pl.po b/translations/desktop_files/kcontrol-color-schemes/pl.po
index 86ab87b3a..3ca34bb1a 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pl.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+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: 2023-11-02 18:13+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/"
+"projects/tdebase/color-schemes/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.8.1\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -24,7 +26,7 @@ msgstr "Atłasowa zieleń"
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
@@ -39,7 +41,7 @@ msgstr "Niebieska dachówka"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -62,26 +64,29 @@ msgid "EveX"
 msgstr "WigiliaX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+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 Biały"
+msgstr "Keramik"
 
 #. Name
 #: KeramikEmerald.kcsrc:2
-#, fuzzy
 msgid "Keramik Emerald"
-msgstr "Keramik Biały"
+msgstr "Keramik Niebieski"
 
 #. Name
 #: KeramikWhite.kcsrc:2
@@ -89,14 +94,24 @@ msgid "Keramik White"
 msgstr "Keramik Biały"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
-msgstr ""
+msgstr "Media - brzoskwiniowy"
 
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -106,6 +121,11 @@ msgstr "Bladoszary"
 #. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
+msgstr "Plastik"
+
+#. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
 msgstr ""
 
 #. Name
@@ -119,9 +139,14 @@ msgid "Pumpkin"
 msgstr "Dynia"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
@@ -131,6 +156,11 @@ msgstr "Burza"
 #. Name
 #: System.kcsrc:2
 msgid "System"
+msgstr "System"
+
+#. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
 msgstr ""
 
 #. Name
@@ -141,17 +171,17 @@ msgstr "Kontrastowy biały 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
diff --git a/translations/desktop_files/kcontrol-color-schemes/pt.po b/translations/desktop_files/kcontrol-color-schemes/pt.po
index 49de5dcff..4bf452766 100644
--- a/translations/desktop_files/kcontrol-color-schemes/pt.po
+++ b/translations/desktop_files/kcontrol-color-schemes/pt.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+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: 2023-11-02 18:13+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"
 "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
 #: AtlasGreen.kcsrc:3
@@ -24,7 +25,7 @@ msgstr "Verde Atlas"
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
@@ -39,7 +40,7 @@ msgstr "Azul Forte"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -59,23 +60,27 @@ msgstr "CDE da Digital"
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
-msgstr ""
+msgstr "EveX"
+
+#. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr "Human"
 
 #. 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 Branco"
+msgstr "Keramik"
 
 #. Name
 #: KeramikEmerald.kcsrc:2
@@ -88,14 +93,24 @@ msgid "Keramik White"
 msgstr "Keramik Branco"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr "Lizard"
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
-msgstr ""
+msgstr "Media Peach"
 
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -105,7 +120,12 @@ msgstr "Cinzento Pálido"
 #. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
-msgstr ""
+msgstr "Plastik"
+
+#. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr "Platinum"
 
 #. Name
 #: PointReyesGreen.kcsrc:2
@@ -118,9 +138,14 @@ msgid "Pumpkin"
 msgstr "Abóbora"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr "Sienna"
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr "WedgieWeb"
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Alto Contraste Texto Branco"
@@ -140,17 +170,17 @@ msgstr "Alto Contraste Texto Branco"
 #. 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/pt_BR.po b/translations/desktop_files/kcontrol-color-schemes/pt_BR.po
index ea3a80aa1..1cfdb51f2 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik Branco"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Pêssego"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Abóbora"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sistema"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Alto Contraste do Texto Branco"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ro.po b/translations/desktop_files/kcontrol-color-schemes/ro.po
index 13c2b5ce3..1c4dee37f 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik alb"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Piersică"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Plastic"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Verde Point Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Dovlecel"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Contrast mare text alb"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ru.po b/translations/desktop_files/kcontrol-color-schemes/ru.po
index dfba02acd..3f0e6a76b 100644
--- a/translations/desktop_files/kcontrol-color-schemes/ru.po
+++ b/translations/desktop_files/kcontrol-color-schemes/ru.po
@@ -1,30 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 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: 2020-06-18 21:04+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: 2023-11-02 18:13+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"
 "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
 #: AtlasGreen.kcsrc:3
 msgid "Atlas Green"
-msgstr ""
+msgstr "Зелёный атла�"
 
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
@@ -34,72 +37,87 @@ 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
 #: DigitalCDE.kcsrc:3
 msgid "Digital CDE"
-msgstr ""
+msgstr "Цифровой CDE"
 
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
-msgstr ""
+msgstr "Ева X"
+
+#. Name
+#: Human.kcsrc:2
+msgid "Human"
+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 "Last.fm"
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr "Ящерица"
 
 #. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
-msgstr ""
+msgstr "Медиапер�ик"
 
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "NeXT"
 
 #. Name
 #: PaleGray.kcsrc:3
 msgid "Pale Gray"
-msgstr ""
+msgstr "Ту�клый �ерый"
 
 #. Name
 #: Plastik.kcsrc:2
@@ -107,9 +125,14 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr "Платина"
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
-msgstr ""
+msgstr "Зелёный из Point Reyes"
 
 #. Name
 #: Pumpkin.kcsrc:3
@@ -117,6 +140,11 @@ msgid "Pumpkin"
 msgstr "Тыква"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr "Сиена"
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Сол�ри�"
@@ -132,6 +160,11 @@ msgid "System"
 msgstr "Си�тема"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr "WedgieWeb"
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Вы�ококонтра�тный белый тек�т"
@@ -139,17 +172,17 @@ 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/rw.po b/translations/desktop_files/kcontrol-color-schemes/rw.po
index c9aae4920..ae40f3e55 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Umweru Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Akadomo Reyes Icyatsi"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr ""
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "Sisitemu"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Umwandiko w'Umweru Inyuranyamigaragarire yo Hejuru"
diff --git a/translations/desktop_files/kcontrol-color-schemes/se.po b/translations/desktop_files/kcontrol-color-schemes/se.po
index adb43b538..950f971f1 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Vilges bálseduoddji"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Mediapersihkka"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastihkka"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Ruoná ja guvgesrukses"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Gurbbet"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Vuogádat"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Alla vuostálasvuohta, vilges teaksta"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sk.po b/translations/desktop_files/kcontrol-color-schemes/sk.po
index 500a8f88b..5064ea031 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sk.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+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: 2023-11-02 18:13+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/"
+"projects/tdebase/color-schemes/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -39,7 +40,7 @@ msgstr "Modrá bridlica"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -62,31 +63,44 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+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 Biely"
+msgstr "Keramika"
 
 #. Name
 #: KeramikEmerald.kcsrc:2
-#, fuzzy
 msgid "Keramik Emerald"
-msgstr "Keramik Biely"
+msgstr "Keramika Smaragd"
 
 #. Name
 #: KeramikWhite.kcsrc:2
 msgid "Keramik White"
-msgstr "Keramik Biely"
+msgstr "Keramika Biela"
+
+#. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
 
 #. Name
 #: MediaPeach.kcsrc:2
@@ -96,7 +110,7 @@ msgstr ""
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -109,9 +123,14 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
-msgstr "Point Reyes zelená"
+msgstr "Point Reyes Zelená"
 
 #. Name
 #: Pumpkin.kcsrc:3
@@ -119,9 +138,14 @@ msgid "Pumpkin"
 msgstr "Tekvica"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
@@ -134,6 +158,11 @@ msgid "System"
 msgstr "Systém"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Vysokokontrastný biely text"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sl.po b/translations/desktop_files/kcontrol-color-schemes/sl.po
index 54fccfa98..9847fd4e8 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik bela"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Zelena Point Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Bu�a"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Visoko kontrastno belo besedilo"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sr.po b/translations/desktop_files/kcontrol-color-schemes/sr.po
index dee85d68a..0aefb3194 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Бела керамика"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тика"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes зелена"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Бундева"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Си�тем"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Бели тек�т ви�оког контра�та"
diff --git a/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po b/translations/desktop_files/kcontrol-color-schemes/sr@Latn.po
index bfe0eb154..1067dd4dc 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Bela keramika"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Plastika"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes zelena"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Bundeva"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Beli tekst visokog kontrasta"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ss.po b/translations/desktop_files/kcontrol-color-schemes/ss.po
index bc1fdc53f..10247f99c 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Litsanga"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Umshini"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/sv.po b/translations/desktop_files/kcontrol-color-schemes/sv.po
index 09d932eef..25aa358d7 100644
--- a/translations/desktop_files/kcontrol-color-schemes/sv.po
+++ b/translations/desktop_files/kcontrol-color-schemes/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Vit Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes-grön"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "Pumpa"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr ""
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Vit text med hög kontrast"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ta.po b/translations/desktop_files/kcontrol-color-schemes/ta.po
index 95e265c20..185d42844 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "கேரமிக� வெள�ளை"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "ஊடக பீச�"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "திட�டம�"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "பூசணிக�காய�"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "சோலாரிஸ�"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "அமைப�ப�"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "அதிக மாற�பட�ட வெள�ளை உரை"
diff --git a/translations/desktop_files/kcontrol-color-schemes/te.po b/translations/desktop_files/kcontrol-color-schemes/te.po
index 0db79e2d7..1278c283e 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "ఈవెక�స�"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "కెడిఈ 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "కెరామిక� తెల�ప�"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "మీడియా పీచ�"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "ప�లాస�టిక�"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "పాయింట� రెయిస� పచ�చ"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "గ�మ�మడి"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "సొలారిస�"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "వ�యవస�థ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/tg.po b/translations/desktop_files/kcontrol-color-schemes/tg.po
index 1bd40758d..e200e80a6 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik-и �афед"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Сабзи нуқта нуқта"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Каду"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Сол�ри�"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Си�тема"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 #, fuzzy
 msgid "High Contrast White Text"
diff --git a/translations/desktop_files/kcontrol-color-schemes/th.po b/translations/desktop_files/kcontrol-color-schemes/th.po
index 7074209ba..ca097aacd 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr "�บบ EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "�บบ KDE 1"
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "เครามิ�ขาว"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "ลู�ท้อ"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "พลาสติ�"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "จุดเขียวประปราย"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "ฟั�ทอง"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "โซลาริส"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "ระบบ"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "ตัวอั�ษรขาวคอนทราสสูง"
diff --git a/translations/desktop_files/kcontrol-color-schemes/tr.po b/translations/desktop_files/kcontrol-color-schemes/tr.po
index d2f2168dc..1fc9b7d31 100644
--- a/translations/desktop_files/kcontrol-color-schemes/tr.po
+++ b/translations/desktop_files/kcontrol-color-schemes/tr.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Muha Aliss <muhaaliss@gmail.com>, 2020.
+# Erdem Ersoy <erdemersoy@erdemersoy.net>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+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: 2023-11-02 18:13+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/"
+"projects/tdebase/color-schemes/tr/>\n"
 "Language: tr\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.5.3\n"
 
 #. Name
 #: AtlasGreen.kcsrc:3
@@ -24,7 +26,7 @@ msgstr "Atlas YeÅŸili"
 #. Name
 #: BeOS.kcsrc:3
 msgid "BeOS"
-msgstr ""
+msgstr "BeOS"
 
 #. Name
 #: BlackOnWhite.kcsrc:2
@@ -39,7 +41,7 @@ msgstr "Mavi Tahta"
 #. Name
 #: CDE.kcsrc:3
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Name
 #: DarkBlue.kcsrc:2
@@ -59,29 +61,32 @@ msgstr "Dijital CDE"
 #. Name
 #: EveX.kcsrc:2
 msgid "EveX"
+msgstr "EveX"
+
+#. Name
+#: Human.kcsrc:2
+msgid "Human"
 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 "Beyaz Keramik"
+msgstr "Keramik"
 
 #. Name
 #: KeramikEmerald.kcsrc:2
-#, fuzzy
 msgid "Keramik Emerald"
-msgstr "Beyaz Keramik"
+msgstr "Zümrüt Keramik"
 
 #. Name
 #: KeramikWhite.kcsrc:2
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Beyaz Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Medya Åžeftalisi"
@@ -96,7 +111,7 @@ msgstr "Medya Åžeftalisi"
 #. Name
 #: Next.kcsrc:2
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #. Name
 #: PaleGray.kcsrc:3
@@ -106,6 +121,11 @@ msgstr "Açık Gri"
 #. Name
 #: Plastik.kcsrc:2
 msgid "Plastik"
+msgstr "Plastik"
+
+#. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
 msgstr ""
 
 #. Name
@@ -116,12 +136,17 @@ msgstr "Point Reyes YeÅŸili"
 #. Name
 #: Pumpkin.kcsrc:3
 msgid "Pumpkin"
+msgstr "Kabak"
+
+#. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
 msgstr ""
 
 #. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
-msgstr ""
+msgstr "Solaris"
 
 #. Name
 #: Storm.kcsrc:3
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Yüksek Kontrast Beyaz Metin"
@@ -141,17 +171,17 @@ msgstr "Yüksek Kontrast Beyaz Metin"
 #. 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/tt.po b/translations/desktop_files/kcontrol-color-schemes/tt.po
index 058715db9..3bbd089c5 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr ""
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Qabaq"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Qoyaşlı"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Sistem"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Kisken Aq"
diff --git a/translations/desktop_files/kcontrol-color-schemes/uk.po b/translations/desktop_files/kcontrol-color-schemes/uk.po
index df24055d9..f257c3746 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 21:04+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2023-11-02 18:13+0000\n"
+"PO-Revision-Date: 2024-03-29 18:40+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
@@ -64,6 +64,11 @@ msgid "EveX"
 msgstr "EveX"
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr "Людина"
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr "KDE 1"
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Білий Керамік"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr "Ящірка"
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Медіа Пер�ик"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr "Платина"
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Пойнт-Рейе� Зелений"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Гарбузовий"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr "Сиена"
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solaris"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Си�тема"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr "WedgieWeb"
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Ви�ококонтра�тний білий тек�т"
diff --git a/translations/desktop_files/kcontrol-color-schemes/uz.po b/translations/desktop_files/kcontrol-color-schemes/uz.po
index 1905012f7..dc8dffc37 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Oq keramika"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Shaftoli"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Qovoq"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Tizim"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Yuqori kontrastli oq matn"
diff --git a/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po b/translations/desktop_files/kcontrol-color-schemes/uz@cyrillic.po
index 9abbb4b92..e4d87fdef 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Оқ керамика"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Шафтоли"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Пла�тик"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Қовоқ"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Тизим"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Юқори контра�тли оқ матн"
diff --git a/translations/desktop_files/kcontrol-color-schemes/ven.po b/translations/desktop_files/kcontrol-color-schemes/ven.po
index 6ca5eac44..8d5780701 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr ""
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Beregisi Zwimvumvusi"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Kha Muvhala mudala"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Fhuri"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Solarisi"
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Maitele"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/vi.po b/translations/desktop_files/kcontrol-color-schemes/vi.po
index c73a04a95..76b8749cc 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -87,6 +92,16 @@ msgid "Keramik White"
 msgstr "Gốm trắng"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Hồng đào"
@@ -107,6 +122,11 @@ msgid "Plastik"
 msgstr "Chất dẻo"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Màu xanh Point Reyes"
@@ -117,6 +137,11 @@ msgid "Pumpkin"
 msgstr "Bí đ�"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -132,6 +157,11 @@ msgid "System"
 msgstr "Hệ thống"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Chữ trắng trên n�n đen"
diff --git a/translations/desktop_files/kcontrol-color-schemes/wa.po b/translations/desktop_files/kcontrol-color-schemes/wa.po
index 8cf74e85a..af4568fc5 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Blanc Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Petche media"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Vert Point Reyes"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Potiron"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Sistinme"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "Blanc so noer"
diff --git a/translations/desktop_files/kcontrol-color-schemes/xh.po b/translations/desktop_files/kcontrol-color-schemes/xh.po
index 1ea48e079..3e97b2a5a 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Keramik Emhlophe"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Peach Esesiphakathini"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes Green (okwengca)"
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Ithanga"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr "Isikhanyiso esenziwa lilanga"
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Indlela esestyenziswayo"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-color-schemes/zh_CN.po b/translations/desktop_files/kcontrol-color-schemes/zh_CN.po
index af876077b..b04e875d6 100644
--- a/translations/desktop_files/kcontrol-color-schemes/zh_CN.po
+++ b/translations/desktop_files/kcontrol-color-schemes/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-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik 白"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media 桃色"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr "å¡‘æ–™"
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "�瓜黄"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "系统"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "高对比度白色文字"
diff --git a/translations/desktop_files/kcontrol-color-schemes/zh_TW.po b/translations/desktop_files/kcontrol-color-schemes/zh_TW.po
index dfc13d669..09d238def 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -88,6 +93,16 @@ msgid "Keramik White"
 msgstr "Keramik 白"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Media 桃紅"
@@ -108,6 +123,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr "Point Reyes 綠"
@@ -118,6 +138,11 @@ msgid "Pumpkin"
 msgstr "�瓜黃"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -133,6 +158,11 @@ msgid "System"
 msgstr "系統"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr "高�比�白文字"
diff --git a/translations/desktop_files/kcontrol-color-schemes/zu.po b/translations/desktop_files/kcontrol-color-schemes/zu.po
index 8f51abbd7..1a279b340 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: 2020-06-18 21:04+0200\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"
@@ -62,6 +62,11 @@ msgid "EveX"
 msgstr ""
 
 #. Name
+#: Human.kcsrc:2
+msgid "Human"
+msgstr ""
+
+#. Name
 #: KDEOne.kcsrc:2
 msgid "KDE 1"
 msgstr ""
@@ -89,6 +94,16 @@ msgid "Keramik White"
 msgstr "Okumhlophe kwe-Keramik"
 
 #. Name
+#: Last.fm.kcsrc:2
+msgid "Last.fm"
+msgstr ""
+
+#. Name
+#: Lizard.kcsrc:2
+msgid "Lizard"
+msgstr ""
+
+#. Name
 #: MediaPeach.kcsrc:2
 msgid "Media Peach"
 msgstr "Unozindaba osapetshisi"
@@ -109,6 +124,11 @@ msgid "Plastik"
 msgstr ""
 
 #. Name
+#: Platinum.kcsrc:2
+msgid "Platinum"
+msgstr ""
+
+#. Name
 #: PointReyesGreen.kcsrc:2
 msgid "Point Reyes Green"
 msgstr ""
@@ -119,6 +139,11 @@ msgid "Pumpkin"
 msgstr "Ithanga"
 
 #. Name
+#: Sienna.kcsrc:2
+msgid "Sienna"
+msgstr ""
+
+#. Name
 #: SolarisCDE.kcsrc:2
 msgid "Solaris"
 msgstr ""
@@ -134,6 +159,11 @@ msgid "System"
 msgstr "Isistimu"
 
 #. Name
+#: WedgieWeb.kcsrc:2
+msgid "WedgieWeb"
+msgstr ""
+
+#. Name
 #: WhiteOnBlack.kcsrc:2
 msgid "High Contrast White Text"
 msgstr ""
diff --git a/translations/desktop_files/kcontrol-desktops/af.po b/translations/desktop_files/kcontrol-desktops/af.po
index 0aabf0de4..c44398502 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: 2020-06-18 13:00+0200\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"
@@ -1938,7 +1938,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Amerikaanse Engels"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ar.po b/translations/desktop_files/kcontrol-desktops/ar.po
index cc6adf20a..8cb163170 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: 2020-06-18 13:00+0200\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"
@@ -1969,7 +1969,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "إنكليزية الولايات المتحدة الأمريكية"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/as.po b/translations/desktop_files/kcontrol-desktops/as.po
index fe8e70907..888ac4e26 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ast.po b/translations/desktop_files/kcontrol-desktops/ast.po
index 708f50533..f59ac0d9c 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/az.po b/translations/desktop_files/kcontrol-desktops/az.po
index 18781a19b..ddf99f0d8 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: 2020-06-18 13:00+0200\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"
@@ -1967,7 +1967,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "ABŞ İngiliscəsi"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/be.po b/translations/desktop_files/kcontrol-desktops/be.po
index 0f55b4ce9..ce546b6c0 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: 2020-06-18 13:00+0200\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"
@@ -2026,7 +2026,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�нгель�ка� (ЗШ�)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/be@latin.po b/translations/desktop_files/kcontrol-desktops/be@latin.po
index 957f97b9a..994223a90 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/bg.po b/translations/desktop_files/kcontrol-desktops/bg.po
index 06e32ae07..3e81c6f7c 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: 2020-06-18 13:00+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+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/"
@@ -2008,7 +2008,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�мерикан�ки англий�ки"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/bn.po b/translations/desktop_files/kcontrol-desktops/bn.po
index bedaad2c4..a294d2a38 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: 2020-06-18 13:00+0200\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"
@@ -1931,7 +1931,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/bn_IN.po b/translations/desktop_files/kcontrol-desktops/bn_IN.po
index dd2a82e3e..201ce42f3 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/br.po b/translations/desktop_files/kcontrol-desktops/br.po
index b25a70af4..3096ccef4 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: 2020-06-18 13:00+0200\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"
@@ -1935,7 +1935,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Saozneg SUA"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/bs.po b/translations/desktop_files/kcontrol-desktops/bs.po
index 68bb1d0d5..c1564e986 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: 2020-06-18 13:00+0200\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"
@@ -1982,7 +1982,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Engleski US"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ca.po b/translations/desktop_files/kcontrol-desktops/ca.po
index 457fecd0e..d19f7696d 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: 2020-06-18 13:00+0200\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"
@@ -1989,7 +1989,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Anglès US"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ca@valencia.po b/translations/desktop_files/kcontrol-desktops/ca@valencia.po
index d59ab22a5..2d0ad8017 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: 2020-06-18 13:00+0200\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"
@@ -1903,7 +1903,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/cs.po b/translations/desktop_files/kcontrol-desktops/cs.po
index 5400e553a..3eec32c95 100644
--- a/translations/desktop_files/kcontrol-desktops/cs.po
+++ b/translations/desktop_files/kcontrol-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2021-09-07 01:16+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"
 "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.8\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -29,7 +30,7 @@ msgstr "Zpřístupnění"
 #. Comment
 #: access/kcmaccess.desktop:14
 msgid "Improve accessibility for disabled persons"
-msgstr "Zlepšení přístupnosti pro osoby s postižením"
+msgstr "Zlepšení přístupnosti pro osoby s postižením"
 
 #. Keywords
 #: access/kcmaccess.desktop:16
@@ -38,7 +39,7 @@ msgid ""
 "keys;sticky keys;bounce keys;slow keys;mouse navigation;num pad;"
 msgstr ""
 "Zpřístupnění;Hluchý;Slepý;Postižený;Zvonek;Slyšitelný zvonek;Viditelný "
-"zvonek;Klávesnice;Pomalé klávesy;Navigace myši;Num pad;"
+"zvonek;Klávesnice;Pomalé klávesy;Navigace myši;Numerická klávesnice;"
 
 #. Name
 #: arts/arts.desktop:12
@@ -75,7 +76,8 @@ msgstr "Změna nastavení pozadí"
 msgid ""
 "background;desktops;colors;colours;images;wallpapers;blending;balance;cache;"
 "multiple wallpapers;pixmap;"
-msgstr "Pozadí;Plochy;Barvy;Obrázky;Tapety;Směšování;Vyvážení;Cache;Pixmapa;"
+msgstr ""
+"Pozadí;Plochy;Barvy;Obrázky;Tapety;Směšování;Vyvážení;Keš;Více tapet;Pixmapa;"
 
 #. Name
 #: bell/bell.desktop:13
@@ -90,7 +92,7 @@ msgstr "Nastavení systémového zvonku"
 #. Keywords
 #: bell/bell.desktop:17
 msgid "Bell;Audio;Sound;Volume;Pitch;Duration;"
-msgstr "Systémový zvonek;Audio;Zvuk;Hlasitost;Trvání;"
+msgstr "Systémový zvonek;Zvonek;Audio;Zvuk;Hlasitost;Trvání;"
 
 #. Name
 #: clock/clock.desktop:13
@@ -105,7 +107,7 @@ msgstr "Nastavení data a �asu"
 #. Keywords
 #: clock/clock.desktop:17
 msgid "clock;date;time;time zone;"
-msgstr "Datum;Čas;Časová zóna;"
+msgstr "Hodiny;Datum;Čas;Časová zóna;"
 
 #. Name
 #: colors/colors.desktop:12
@@ -130,7 +132,7 @@ msgstr "Hezký název pro vaše rozhraní"
 #. Comment
 #: componentchooser/EXAMPLE.desktop:2
 msgid "A helpful description of the interface for the top right info box"
-msgstr "Smysluplný popis vašeho rozhraní pro informa�ní box"
+msgstr "Smysluplný popis vašeho rozhraní pro pravý horní informa�ní box"
 
 #. Name
 #: componentchooser/componentchooser.desktop:10
@@ -150,8 +152,8 @@ msgid ""
 "manager;URL;hyperlinks;"
 msgstr ""
 "výchozí aplikace;komponenty;výběr komponent;zdroje;e-mail;emailový klient;"
-"editor textu;komunikátor;emulátor terminálů;webový prohlíže�;správce souborů;"
-"URL;odkazy;"
+"textový editor;komunikátor;emulátor terminálů;webový prohlíže�;správce "
+"souborů;URL;odkazy;"
 
 #. Name
 #: componentchooser/componentservices/kcm_browser.desktop:1
@@ -164,9 +166,9 @@ msgid ""
 "Here you can configure your default web browser. All TDE applications in "
 "which you can select hyperlinks should honor this setting."
 msgstr ""
-"Tato služba umožňuje nastavit si výchozí prohlíže�. Všechny TDE aplikace, "
-"které vyžadují přístup k hypertextovým odkazům, by měly používat toto "
-"nastavení."
+"Tato služba umožňuje nastavit si výchozí prohlíže� webu. Všechny TDE "
+"aplikace, které vyžadují přístup k hypertextovým odkazům, by měly používat "
+"toto nastavení."
 
 #. Name
 #: componentchooser/componentservices/kcm_filemanager.desktop:1
@@ -187,7 +189,7 @@ msgstr ""
 #. Name
 #: componentchooser/componentservices/kcm_kemail.desktop:1
 msgid "Email Client"
-msgstr "Emailový klient"
+msgstr "Poštovní klient"
 
 #. Comment
 #: componentchooser/componentservices/kcm_kemail.desktop:3
@@ -196,9 +198,9 @@ msgid ""
 "applications which need access to an email client application should honor "
 "this setting."
 msgstr ""
-"Tato služba umožňuje nastavit si výchozího klienta emailu. Všechny TDE "
-"aplikace, které vyžadují přístup k emailové aplikaci, by měly používat toto "
-"nastavení."
+"Tato služba umožňuje nastavit si výchozího poštovního klienta. Všechny TDE "
+"aplikace, které vyžadují přístup k poštovnímu klientovi, by měly používat "
+"toto nastavení."
 
 #. Name
 #: componentchooser/componentservices/kcm_terminal.desktop:1
@@ -212,7 +214,7 @@ msgid ""
 "applications which invoke a terminal emulator application should honor this "
 "setting."
 msgstr ""
-"Tato služba umožňuje nastavit si výchozího emulátor terminálu. Všechny TDE "
+"Tato služba umožňuje nastavit si výchozí emulátor terminálu. Všechny TDE "
 "aplikace, které spouští emulátor terminálu, by měly používat toto nastavení."
 
 #. Name
@@ -231,7 +233,8 @@ msgid ""
 "Crypto;Krypto;Cryptography;encryption;SSL;https;certificates;ciphers;TLS;"
 "secure;security;"
 msgstr ""
-"Kryptografie;Šifrování;SSL;https;Certifikáty;Kódy;Krypto;TLS;bezpe�nost;"
+"Krypto;Kryptografie;Šifrování;SSL;https;Certifikáty;Šifry;TLS;Zabezpe�ení;"
+"Bezpe�nost;"
 
 #. Name
 #: css/kcmcss.desktop:12
@@ -261,23 +264,22 @@ msgstr "Nastavení obrazovky"
 #. Name
 #: displayconfig/displayconfig.desktop:12
 msgid "Monitor & Display"
-msgstr ""
+msgstr "Monitor a zobrazení"
 
 #. Comment
 #: displayconfig/displayconfig.desktop:14
-#, fuzzy
 msgid "Configure display"
-msgstr "Nastavení hledání služeb"
+msgstr "Nastavení monitoru a zobrazení"
 
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "monitor;rozlišení;zobrazení;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
 msgid "Zeroconf Service Discovery"
-msgstr "Hledání služeb"
+msgstr "Hledání služeb (zeroconf)"
 
 #. Comment
 #: dnssd/kcm_tdednssd.desktop:20
@@ -301,17 +303,17 @@ msgid ""
 "Network;Search Engines;Shortcuts;"
 msgstr ""
 "Rozšířené procházení;Procházení;WWW;Internet;Klí�ová slova internetu;"
-"Internetové filtry;Síť;Zkratky;Vyhledávací stroje;"
+"Internetové filtry;Síť;Vyhledávací stroje;Zkratky;"
 
 #. Name
 #: ebrowsing/plugins/ikws/kuriikwsfilter.desktop:3
 msgid "InternetKeywordsFilter"
-msgstr ""
+msgstr "Filtr klí�ových slov pro internet"
 
 #. Name
 #: ebrowsing/plugins/ikws/kurisearchfilter.desktop:3
 msgid "SearchKeywordsFilter"
-msgstr ""
+msgstr "Filtr klí�ových slov pro vyhledávání"
 
 #. Comment
 #: ebrowsing/plugins/ikws/searchprovider.desktop:4
@@ -321,7 +323,7 @@ msgstr "Vyhledávací stroj"
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:3
 msgid "Acronym Database"
-msgstr "Databáze akronymů"
+msgstr "Databáze zkratek"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/acronym.desktop:6
@@ -331,7 +333,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:3
 msgid "Alexa"
-msgstr ""
+msgstr "Alexa"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6
@@ -341,7 +343,7 @@ msgstr ""
 #. 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
@@ -351,7 +353,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:3
 msgid "AllTheWeb fast"
-msgstr ""
+msgstr "AllTheWeb (rychlé)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop:6
@@ -362,7 +364,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:3
 msgid "AltaVista"
-msgstr ""
+msgstr "AltaVista"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/altavista.desktop:6
@@ -372,7 +374,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:4
 msgid "All Music Guide"
-msgstr ""
+msgstr "Průvodce All Music"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/amg.desktop:5
@@ -392,7 +394,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:3
 msgid "AustroNaut"
-msgstr ""
+msgstr "AustroNaut"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/austronaut.desktop:6
@@ -402,7 +404,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3
 msgid "Debian Backports Search"
-msgstr "Vyhledávání v Debian Backports"
+msgstr "Vyhledávání v Debian Backports"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4
@@ -412,7 +414,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:3
 msgid "KDE Bug Database Fulltext Search"
-msgstr "Plnotextové vyhledávání v databázi chyb KDE"
+msgstr "Plnotextové vyhledávání v databázi chyb TDE"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:4
@@ -424,7 +426,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:3
 msgid "TDE Bug Database Bug Number Search"
-msgstr "Vyhledávání v databázi chyb TDE podle �ísla chyby"
+msgstr "Vyhledávání v databázi chyb TDE podle �ísla chyby"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/bugno.desktop:4
@@ -457,7 +459,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:5
 msgid "CiteSeer: Scientific Literature Digital Library"
-msgstr "CiteSeer: Vědecká digitální knihovna"
+msgstr "CiteSeer: Digitální knihovna vědecké literatury"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/citeseer.desktop:6
@@ -467,7 +469,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:3
 msgid "CPAN - Comprehensive Perl Archive Network"
-msgstr ""
+msgstr "CPAN – komplexní síť archivů perlu"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/cpan.desktop:4
@@ -478,7 +480,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:3
 msgid "CTAN - Comprehensive TeX Archive Network"
-msgstr ""
+msgstr "CTAN – komplexní síť archivů TeXu"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:4
@@ -511,7 +513,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:5
 msgid "dict.cc Translation: German to English"
-msgstr "Překlad dic.cc: z něm�iny do angli�tiny"
+msgstr "Překlad dic.cc: z něm�iny do angli�tiny"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:6
@@ -522,7 +524,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:3
 msgid "LEO - Translate Between German and French"
-msgstr "LEO - překlad mezi něm�inou a francouzštinou"
+msgstr "LEO – překlad mezi něm�inou a francouzštinou"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:6
@@ -543,7 +545,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:3
 msgid "Open Directory"
-msgstr ""
+msgstr "Otevřený slovník"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6
@@ -553,7 +555,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5
 msgid "DocBook - The Definitive Guide"
-msgstr ""
+msgstr "DocBook – referen�ní příru�ka"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:6
@@ -573,12 +575,12 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:5
 msgid "dict.cc Translation: English to German"
-msgstr "Překlad dict.cc: z angli�tiny do něm�iny"
+msgstr "Překlad dict.cc: z angli�tiny do něm�iny"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:5
 msgid "WordReference.com Translation: English to Spanish"
-msgstr "Překlad WordReference.com: z angli�tiny do španělštiny"
+msgstr "Překlad WordReference.com: z angli�tiny do španělštiny"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2es.desktop:6
@@ -588,7 +590,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:5
 msgid "WordReference.com Translation: English to French"
-msgstr "Překlad WordReference.com: z angli�tiny do francouzštiny"
+msgstr "Překlad WordReference.com: z angli�tiny do francouzštiny"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2fr.desktop:6
@@ -598,7 +600,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:5
 msgid "WordReference.com Translation: English to Italian"
-msgstr "Překlad WordReference.com: z angli�tiny do italštiny"
+msgstr "Překlad WordReference.com: z angli�tiny do italštiny"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/en2it.desktop:6
@@ -618,7 +620,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/excite.desktop:3
 msgid "Excite"
-msgstr ""
+msgstr "Excite"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/excite.desktop:6
@@ -628,7 +630,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:3
 msgid "Feedster"
-msgstr ""
+msgstr "Feedster"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/feedster.desktop:6
@@ -638,7 +640,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:3
 msgid "Free On-Line Dictionary of Computing"
-msgstr "Online slovník výp. techniky"
+msgstr "Online slovník výpo�etní techniky"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/foldoc.desktop:6
@@ -648,12 +650,12 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fr2de.desktop:3
 msgid "LEO - Translate Between French and German"
-msgstr "LEO - překlad mezi francouzštinou a něm�inou"
+msgstr "LEO – překlad mezi francouzštinou a něm�inou"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:5
 msgid "WordReference.com Translation: French to English"
-msgstr "Překlad WordReference.com: z francouzštiny do angli�tiny"
+msgstr "Překlad WordReference.com: z francouzštiny do angli�tiny"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/fr2en.desktop:6
@@ -663,7 +665,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:3
 msgid "FreeDB"
-msgstr ""
+msgstr "FreeDB"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/freedb.desktop:6
@@ -673,7 +675,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:3
 msgid "Freshmeat"
-msgstr ""
+msgstr "Freshmeat"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop:6
@@ -683,7 +685,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:3
 msgid "Froogle"
-msgstr ""
+msgstr "Froogle"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:6
@@ -702,9 +704,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:3
-#, fuzzy
 msgid "Google"
-msgstr "Google - diskuzní skupiny"
+msgstr "Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:6
@@ -729,7 +730,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3
 msgid "Google Groups"
-msgstr "Google - diskuzní skupiny"
+msgstr "Diskuzní skupiny (Google)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:6
@@ -771,9 +772,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:3
-#, fuzzy
 msgid "Google News"
-msgstr "Google filmy"
+msgstr "Google události"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_news.desktop:6
@@ -783,7 +783,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:3
 msgid "Gracenote"
-msgstr ""
+msgstr "Gracenote"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/gracenote.desktop:6
@@ -793,7 +793,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:5
 msgid "Great Dictionary of the Catalan Language (GRan Enciclopèdia  Catalana)"
-msgstr "Velký katalánský slovník (GRan Enciclopèdia  Catalana)"
+msgstr "Velký katalánský slovník (GRan Enciclopèdia Catalana)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:6
@@ -803,7 +803,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:3
 msgid "Hotbot"
-msgstr ""
+msgstr "Hotbot"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hotbot.desktop:6
@@ -812,9 +812,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:3
-#, fuzzy
 msgid "HyperDictionary.com"
-msgstr "Tezaurus HyperDictionary.com"
+msgstr "HyperDictionary.com"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop:6
@@ -844,7 +843,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:5
 msgid "WordReference.com Translation: Italian to English"
-msgstr "Překlad WordReference.com: z italštiny do angli�tiny"
+msgstr "Překlad WordReference.com: z italštiny do angli�tiny"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/it2en.desktop:6
@@ -854,7 +853,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
@@ -866,7 +865,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:3
 msgid "KataTudo"
-msgstr ""
+msgstr "KataTudo"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/katatudo.desktop:6
@@ -876,7 +875,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:5
 msgid "KDE API Documentation"
-msgstr "KDE API dokumentace"
+msgstr "Dokumentace KDE API"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/kde.desktop:6
@@ -886,7 +885,7 @@ msgstr ""
 #. 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
@@ -896,7 +895,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:3
 msgid "LEO-Translate"
-msgstr ""
+msgstr "Překlada� LEO"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/leo.desktop:6
@@ -906,7 +905,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:3
 msgid "Lycos"
-msgstr ""
+msgstr "Lycos"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/lycos.desktop:6
@@ -916,7 +915,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:3
 msgid "Mamma - Mother of all Search Engines"
-msgstr "Mamma"
+msgstr "Mamma – matka všech vyhledávacích strojů"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/mamma.desktop:6
@@ -926,7 +925,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:3
 msgid "MetaCrawler"
-msgstr ""
+msgstr "MetaCrawler"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop:6
@@ -939,7 +938,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3
 msgid "Microsoft Developer Network Search"
-msgstr "Vyhledávání v Microsoft Developer Network"
+msgstr "Vyhledávání v Microsoft Developer Network"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:6
@@ -952,7 +951,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:3
 msgid "Netcraft"
-msgstr ""
+msgstr "Netcraft"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/netcraft.desktop:6
@@ -962,7 +961,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:2
 msgid "Telephonebook Search Provider"
-msgstr "Poskytovatel prohledávání tel. seznamu"
+msgstr "Poskytovatel prohledávání telefonního seznamu"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop:6
@@ -1040,7 +1039,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:5
 msgid "Dictionary of the Spanish Academy (RAE)"
-msgstr "Slovník Špenělské akademie"
+msgstr "Slovník Španělské akademie (RAE)"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rae.desktop:6
@@ -1052,7 +1051,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:3
 msgid "IETF Requests for Comments"
-msgstr ""
+msgstr "Žádosti o komentáře (RFC) IETF"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rfc.desktop:4
@@ -1062,7 +1061,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:3
 msgid "RPM-Find"
-msgstr ""
+msgstr "Vyhledávání RPM"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop:6
@@ -1072,7 +1071,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:3
 msgid "Ruby Application Archive"
-msgstr "Archív aplikací Ruby"
+msgstr "Archiv aplikací Ruby"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop:6
@@ -1082,7 +1081,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/seek.desktop:3
 msgid "GO.com"
-msgstr ""
+msgstr "GO.com"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/seek.desktop:6
@@ -1094,7 +1093,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:3
 msgid "SourceForge"
-msgstr ""
+msgstr "SourceForge"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop:4
@@ -1105,9 +1104,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
-#, fuzzy
 msgid "Technorati"
-msgstr "Technorati zna�ky"
+msgstr "Technorati"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6
@@ -1137,7 +1135,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
@@ -1159,7 +1157,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:3
 msgid "Vivisimo"
-msgstr ""
+msgstr "Vivisimo"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop:6
@@ -1172,7 +1170,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:3
 msgid "Voila"
-msgstr ""
+msgstr "Voila"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/voila.desktop:6
@@ -1194,7 +1192,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:3
 msgid "Whatis Query"
-msgstr "Dotaz 'Co je?'"
+msgstr "Dotaz „Co je?“"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/whatis.desktop:6
@@ -1205,7 +1203,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:3
 msgid "Wikipedia - The Free Encyclopedia"
-msgstr "Wikipedia - volně dostupná encyklopedie"
+msgstr "Wikipedia – volně dostupná encyklopedie"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop:6
@@ -1215,7 +1213,7 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:3
 msgid "Wiktionary - The Free Dictionary"
-msgstr "Wiktionary - volně dostupný slovník"
+msgstr "Wiktionary – volně dostupný slovník"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:6
@@ -1240,7 +1238,7 @@ msgstr "Filtr pro lokální doménu"
 #. Name
 #: ebrowsing/plugins/shorturi/tdeshorturifilter.desktop:3
 msgid "ShortURIFilter"
-msgstr ""
+msgstr "Filtr krátkých URI"
 
 #. Name
 #: energy/energy.desktop:11
@@ -1250,12 +1248,13 @@ msgstr "Správa napájení"
 #. Comment
 #: energy/energy.desktop:13
 msgid "Settings for display power management"
-msgstr "Nastavení pro správu šetření napájení"
+msgstr "Nastavení pro správu napájení obrazovky"
 
 #. Keywords
 #: energy/energy.desktop:15
 msgid "energy;saver;apm;acpi;dpms;timeout;blanking;stand by;suspend;power;"
-msgstr "Energie;Úspora;APM;ACPI;Časový limit;Vypnutí;Napájení;Šetři�;Spoři�;"
+msgstr ""
+"Energie;Úspora;APM;ACPI;DMPS;Časový limit;Vypnutí;Napájení;Šetři�;Spoři�;"
 
 #. Name
 #: filetypes/filetypes.desktop:12
@@ -1295,7 +1294,7 @@ msgstr ""
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:2
 msgid "tdehwdevicetray"
-msgstr ""
+msgstr "tdehwdevicetray"
 
 #. GenericName
 #. Name
@@ -1327,17 +1326,17 @@ msgstr "hardware;zařízení;správce;"
 #. Comment
 #: iccconfig/iccconfig.desktop:14
 msgid "Configure display ICC color profile"
-msgstr ""
+msgstr "Nastavení barevného profilu ICC monitoru"
 
 #. Keywords
 #: iccconfig/iccconfig.desktop:16
 msgid "ICC;display;color;profile;"
-msgstr ""
+msgstr "ICC;monitor;barvy;profil;"
 
 #. Name
 #: iccconfig/iccconfig.desktop:18
 msgid "Color Profile"
-msgstr ""
+msgstr "Barevný profil"
 
 #. Name
 #: icons/icons.desktop:12
@@ -1367,7 +1366,7 @@ msgstr "Kompatibilita CD/DVD mechaniky"
 #. Keywords
 #: info/cdinfo.desktop:16
 msgid "CD-ROM Information;CD-ROM;CD;CD Drive;Writer Capabilities;"
-msgstr "Informace o CD; mechanice a možnostech vypalova�ky;"
+msgstr "Informace o CD-ROM;CD-ROM;CD;CD mechanika;Možnosti vypalova�ky;"
 
 #. Name
 #: info/devices.desktop:13
@@ -1452,7 +1451,7 @@ msgstr ""
 #. Name
 #: info/opengl.desktop:13
 msgid "OpenGL"
-msgstr ""
+msgstr "OpenGL"
 
 #. Comment
 #: info/opengl.desktop:15
@@ -1471,17 +1470,17 @@ msgstr ""
 #. Name
 #: info/partitions.desktop:13
 msgid "Partitions"
-msgstr "Oddíly disků"
+msgstr "Diskové oddíly"
 
 #. Comment
 #: info/partitions.desktop:15
 msgid "Partition information"
-msgstr "Informace o oddílech disků"
+msgstr "Informace o diskových oddílech"
 
 #. Keywords
 #: info/partitions.desktop:17
 msgid "Partitions;Harddrive;HD;System Information;"
-msgstr "Oddíly disku;Pevný disk;HD;Informace o systému;"
+msgstr "Oddíly;Diskové oddíly;Pevný disk;HD;Informace o systému;"
 
 #. Name
 #: info/pci.desktop:12
@@ -1516,7 +1515,7 @@ msgstr "Procesor;CPU;FPU;MHz;Informace o systému;"
 #. Name
 #: info/scsi.desktop:12
 msgid "SCSI"
-msgstr ""
+msgstr "SCSI"
 
 #. Comment
 #: info/scsi.desktop:14
@@ -1546,7 +1545,7 @@ msgstr "Zvuk;Audio;Zvuková karta;Midi;OSS;Informace o systému;"
 #. Name
 #: info/xserver.desktop:12
 msgid "X-Server"
-msgstr ""
+msgstr "X-Server"
 
 #. Comment
 #: info/xserver.desktop:14
@@ -1556,7 +1555,7 @@ msgstr "Informace o X-Serveru"
 #. Keywords
 #: info/xserver.desktop:16
 msgid "X;X-Server;XServer;XFree86;Display;VideoCard;System Information;"
-msgstr "X;X-server;XServer;XFree86;Obrazovka;Informace o systému;Videokarta;"
+msgstr "X;X-server;XServer;XFree86;Obrazovka;Videokarta;Informace o systému;"
 
 #. Name
 #: input/mouse.desktop:13
@@ -1576,13 +1575,13 @@ 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;Dvojité kliknutí;Pravák;"
-"Levák;"
+"zařízení;Mapování tla�ítek;Kurzor;Kliknutí;Odezva;Ukzatele;Poklepání;Dvojité "
+"kliknutí;Pravák;Levák;"
 
 #. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
-msgstr ""
+msgstr "Joystick"
 
 #. Comment
 #: joystick/joystick.desktop:14
@@ -1592,7 +1591,7 @@ msgstr "Ovládací modul pro testování Joysticků"
 #. Keywords
 #: joystick/joystick.desktop:16
 msgid "joystick;gamepad;"
-msgstr ""
+msgstr "joystick;pákový ovlada�;gamepad;herní ovlada�;"
 
 #. Name
 #: kcontrol/KControl.desktop:8 kcontrol/KControl_NoDisplay.desktop:8
@@ -1788,7 +1787,7 @@ msgstr ""
 #. Comment
 #: konq/filebehavior.desktop:13
 msgid "Configure how Konqueror behaves as a file manager"
-msgstr "Zde je možné nastavit správce chování Konqueroru jako správce souborů"
+msgstr "Zde je možné nastavit chování Konqueroru jako správce souborů"
 
 #. Keywords
 #: konq/filebehavior.desktop:15
@@ -1798,7 +1797,7 @@ msgid ""
 "trash can;delete;confirmation;"
 msgstr ""
 "konqueror;správce souborů;kfm;tipy;oddělené okno;chování;využití paměti;"
-"domvské URL;síťové operace;průběh;koš;potvrzení;"
+"domovské URL;síťové operace;průběh;koš;potvrzení;"
 
 #. Comment
 #: konq/filebrowser.desktop:14
@@ -1813,7 +1812,7 @@ msgstr "Náhledy a metadata"
 #. Comment
 #: konq/filepreviews.desktop:13
 msgid "Configure how Konqueror Previews & Meta-data work"
-msgstr "Zde je možné nastavit chování náhledů a metadat v Konqueroru"
+msgstr "Zde je možné nastavit chování náhledů a metadat v Konqueroru"
 
 #. Keywords
 #: konq/filepreviews.desktop:15
@@ -1877,26 +1876,23 @@ msgstr "Konqueror;Kfm;Prohlíže�;HTML;Web;WWW;Java;JavaScript;"
 
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
-#, fuzzy
 msgid "User Interface"
-msgstr "Síťová rozhraní"
+msgstr "Uživatelské rozhraní"
 
 #. Comment
 #: konqhtml/tdehtml_userinterface.desktop:13
-#, fuzzy
 msgid "Configure user interface options"
-msgstr "Nastavení cache pro webové stránky"
+msgstr "Nastavení voleb uživatelského rozhraní"
 
 #. Keywords
 #: konqhtml/tdehtml_userinterface.desktop:15
-#, fuzzy
 msgid "konqueror;kfm;user;interface;tabbed;browsing;"
-msgstr "konqueror;využití;preload;"
+msgstr "konqueror;kfm;uživatel;rozhraní;karty;prohlížení;"
 
 #. Name
 #: konsole/kcmkonsole.desktop:10
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Comment
 #: konsole/kcmkonsole.desktop:12
@@ -1934,7 +1930,7 @@ msgstr "Správce motivů"
 #. Comment
 #: kthememanager/x-ktheme.desktop:3
 msgid "TDE Theme"
-msgstr "TDE motiv"
+msgstr "Motiv TDE"
 
 #. Name
 #: launch/kcmlaunch.desktop:12
@@ -1957,8 +1953,8 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
-msgstr "Americká angli�tina"
+msgid "English (American)"
+msgstr "Angli�tina (Spojené státy)"
 
 #. Name
 #: locale/language.desktop:12
@@ -2000,7 +1996,7 @@ msgstr "Výkon"
 #. Comment
 #: performance/kcmkonqyperformance.desktop:13
 msgid "Configure settings that can improve Konqueror performance"
-msgstr "Zde můžete vylepšit výkon aplikace Konqueror"
+msgstr "Nastavení vylepšující výkon Konqueroru"
 
 #. Keywords
 #: performance/kcmkonqyperformance.desktop:15
@@ -2025,7 +2021,7 @@ msgstr "Soukromí"
 #. Comment
 #: privacy/privacy.desktop:13
 msgid "Clean unwanted traces the user leaves on the system"
-msgstr "Čištění citlivých údajů"
+msgstr "Čištění nežádoucí stop, které uživatel zanechá v systému"
 
 #. Keywords
 #: privacy/privacy.desktop:15
@@ -2050,7 +2046,7 @@ msgstr "velikost;rotace;obrazovka;barva;hloubka;horizontální;vertikální;"
 #. 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
@@ -2060,7 +2056,7 @@ msgstr "Změna velikosti a rotace obrazovky"
 #. Comment
 #: randr/tderandrtray-autostart.desktop:6 randr/tderandrtray.desktop:6
 msgid "Resize and rotate X screens."
-msgstr "Změna velikosti a rotace obrazovky."
+msgstr "Změna velikosti a rotace X obrazovek."
 
 #. Name
 #: samba/smbstatus.desktop:12
@@ -2095,7 +2091,7 @@ msgstr "Šetři�e obrazovky;Priorita;"
 #. Name
 #: smartcard/smartcard.desktop:11
 msgid "Smartcards"
-msgstr ""
+msgstr "Čipové karty"
 
 #. Comment
 #: smartcard/smartcard.desktop:13
@@ -2105,22 +2101,22 @@ msgstr "Nastavení podpory smartcards"
 #. Keywords
 #: smartcard/smartcard.desktop:15
 msgid "Smartcard;PKCS;SSL;reader;smart;card;"
-msgstr ""
+msgstr "Smartcard;PKCS;SSL;�te�ka;karta;�ipová karta;"
 
 #. Name
 #: smserver/kcmsmserver.desktop:12
 msgid "Session Manager"
-msgstr "Správce relace"
+msgstr "Správce sezení"
 
 #. Comment
 #: smserver/kcmsmserver.desktop:14
 msgid "Configure the session manager and logout settings"
-msgstr "Nastavení správce relace a odhlašování"
+msgstr "Nastavení správce sezení a odhlašování"
 
 #. Keywords
 #: smserver/kcmsmserver.desktop:16
 msgid "ksmserver;session;logout;confirmation;save;restore;"
-msgstr "Správce relace;Relace;Odhlášení;Potvrzení;Uložení;Obnovení;"
+msgstr "Správce sezení;Sezení;Odhlášení;Potvrzení;Uložení;Obnovení;"
 
 #. Name
 #: spellchecking/spellchecking.desktop:11
@@ -2212,12 +2208,12 @@ msgstr "Složka se systémovými písmy"
 #. Name
 #: tdefontinst/thumbnail/fontthumbnail.desktop:3
 msgid "Font Files"
-msgstr "Soubory s písmy"
+msgstr "Soubory s písmy"
 
 #. Name
 #: tdefontinst/viewpart/tdefontview.desktop:2
 msgid "TDEFontView"
-msgstr "Prohlíže� písem"
+msgstr "TDEFontView"
 
 #. GenericName
 #. Name
@@ -2229,22 +2225,22 @@ msgstr "Prohlíže� písem"
 #. Name
 #: tdeio/cache.desktop:12
 msgid "Cache"
-msgstr ""
+msgstr "Keš"
 
 #. Comment
 #: tdeio/cache.desktop:14
 msgid "Configure web cache settings"
-msgstr "Nastavení cache pro webové stránky"
+msgstr "Nastavení keše pro webové stránky"
 
 #. Keywords
 #: tdeio/cache.desktop:16
 msgid "Cache;History;Browsing History;Ports;Size;"
-msgstr "Cache;Historie;Porty;Velikost;"
+msgstr "Keš;Historie prohlížení;Historie;Porty;Velikost;"
 
 #. Name
 #: tdeio/cookies.desktop:12
 msgid "Cookies"
-msgstr ""
+msgstr "Cookies"
 
 #. Comment
 #: tdeio/cookies.desktop:14
@@ -2289,7 +2285,7 @@ msgstr "Nastavení připojení"
 #. Name
 #: tdeio/proxy.desktop:12
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #. Comment
 #: tdeio/proxy.desktop:14
@@ -2299,7 +2295,7 @@ msgstr "Nastavení proxy serverů"
 #. Keywords
 #: tdeio/proxy.desktop:16
 msgid "Proxy;Proxy server;Firewall;Squid;proxy;"
-msgstr ""
+msgstr "Proxy;Proxy server;Firewall;Squid;proxy;"
 
 #. Name
 #: tdeio/smb.desktop:12
@@ -2309,7 +2305,7 @@ msgstr "Sdílené disky systému Microsoft Windows"
 #. Comment
 #: tdeio/smb.desktop:14
 msgid "Use to configure which windows (SMB) filesystems you can browse"
-msgstr "Použijte k nastavení systémů Windows (SMB), které chcete procházet"
+msgstr "Slouží k nastavení systémů Windows (SMB), které chcete procházet"
 
 #. Keywords
 #: tdeio/smb.desktop:16
@@ -2403,7 +2399,7 @@ msgstr "Identifikace prohlíže�e"
 #. Comment
 #: tdeio/useragent.desktop:14
 msgid "Configure the way Konqueror reports itself"
-msgstr "Zde můžete jak se bude Konqueror hlásit webovým serverům"
+msgstr "Nastavení, jak se bude Konqueror představovat serverům"
 
 #. Keywords
 #: tdeio/useragent.desktop:16
@@ -2429,7 +2425,7 @@ msgid ""
 "fonts;background;wallpapers;sessions;shutdown;restart;"
 msgstr ""
 "tdm;Správce obrazovky;xdm;Uživatelé;Přihlášení;Uvítání;Logo;Styly;Jazyk;Země;"
-"Písma;pozadí;Tapety;Relace;Sezení;Vypnutí;Restart;"
+"Písma;pozadí;Tapety;Sezení;Vypnutí;Restart;"
 
 #. Name
 #: usbview/kcmusb.desktop:10
@@ -2439,7 +2435,7 @@ msgstr "USB zařízení"
 #. Comment
 #: usbview/kcmusb.desktop:12
 msgid "View the USB devices attached to this computer"
-msgstr "Zobrazení USB zařízení připojených k tomuto po�íta�i"
+msgstr "Zobrazení USB zařízení připojených k tomuto po�íta�i"
 
 #. Keywords
 #: usbview/kcmusb.desktop:14
@@ -2454,7 +2450,7 @@ msgstr "IEEE 1394 zařízení"
 #. Comment
 #: view1394/kcmview1394.desktop:12
 msgid "View the IEEE 1394 devices attached to this computer"
-msgstr "Zobrazení IEEE 1394 zařízení připojených k tomuto po�íta�i"
+msgstr "Zobrazení IEEE 1394 zařízení připojených k tomuto po�íta�i"
 
 #. Keywords
 #: view1394/kcmview1394.desktop:14
@@ -2474,4 +2470,4 @@ msgstr "Nastavení TDE pro více monitorů"
 #. Keywords
 #: xinerama/xinerama.desktop:14
 msgid "Xinerama;dual head;multihead;monitor;"
-msgstr ""
+msgstr "Xinerama;dvě obrazovky;více obrazovek;monitor;"
diff --git a/translations/desktop_files/kcontrol-desktops/csb.po b/translations/desktop_files/kcontrol-desktops/csb.po
index 28a98415a..46e5036ad 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: 2020-06-18 13:00+0200\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"
@@ -1979,7 +1979,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Amerikańsczi anielsczi"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/cy.po b/translations/desktop_files/kcontrol-desktops/cy.po
index f7b6eaf6d..70340ef23 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: 2020-06-18 13:00+0200\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"
@@ -1976,7 +1976,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Saesneg UD"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/da.po b/translations/desktop_files/kcontrol-desktops/da.po
index c8c51a683..1cea9ce83 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: 2020-06-18 13:00+0200\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"
@@ -1974,7 +1974,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Engelsk US"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/de.po b/translations/desktop_files/kcontrol-desktops/de.po
index 6d07742d2..938a24c10 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: 2020-06-18 13:00+0200\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"
@@ -1973,7 +1973,7 @@ msgstr "Anwendungen;Start;Programmstart;Cursor;Aktivierung;Mauszeiger;Anzeige;"
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "US-Englisch"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/el.po b/translations/desktop_files/kcontrol-desktops/el.po
index cbf616858..41773eeb9 100644
--- a/translations/desktop_files/kcontrol-desktops/el.po
+++ b/translations/desktop_files/kcontrol-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+0200\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"
@@ -1997,7 +1997,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Αγγλική ΗΠΑ"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/en_GB.po b/translations/desktop_files/kcontrol-desktops/en_GB.po
index 2a77d60ac..16e6149fa 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: 2020-06-18 13:00+0200\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"
@@ -1968,7 +1968,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/en_US.po b/translations/desktop_files/kcontrol-desktops/en_US.po
index bd36265cc..84986883d 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: 2020-06-18 13:00+0200\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"
@@ -1903,7 +1903,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/eo.po b/translations/desktop_files/kcontrol-desktops/eo.po
index 5e52dcf36..f0ab1cec0 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: 2020-06-18 13:00+0200\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"
@@ -1959,7 +1959,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Usona anglo"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/es.po b/translations/desktop_files/kcontrol-desktops/es.po
index d4a95da8f..94ac5eca8 100644
--- a/translations/desktop_files/kcontrol-desktops/es.po
+++ b/translations/desktop_files/kcontrol-desktops/es.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Victor Galvez <cassdee_058@protonmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+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: 2021-07-07 18:17+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/"
+"projects/tdebase/kcontrol-desktop-files/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.10.1\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -236,7 +237,7 @@ msgstr "Criptografía"
 msgid "Configure SSL, manage certificates, and other cryptography settings"
 msgstr ""
 "Configura SSL, administra los certificados y otras preferencias de "
-"criptografía."
+"criptografía"
 
 #. Keywords
 #: crypto/crypto.desktop:14
@@ -274,18 +275,17 @@ msgstr "Preferencias de la pantalla"
 #. Name
 #: displayconfig/displayconfig.desktop:12
 msgid "Monitor & Display"
-msgstr ""
+msgstr "Monitores y pantallas"
 
 #. Comment
 #: displayconfig/displayconfig.desktop:14
-#, fuzzy
 msgid "Configure display"
-msgstr "Configura el buscador de servicios"
+msgstr "Configurar pantalla"
 
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "monitor;resolución;pantalla;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
@@ -1989,7 +1989,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Inglés de EEUU"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/et.po b/translations/desktop_files/kcontrol-desktops/et.po
index 13c928901..58d5ab56e 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: 2020-06-18 13:00+0200\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"
@@ -1972,7 +1972,7 @@ msgstr "rakendus;käivitamine;hõivatud;kursor;tagasiside;hiir;hiirekursor;"
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Inglise (US)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/eu.po b/translations/desktop_files/kcontrol-desktops/eu.po
index d1083a3dc..d7a85a7fa 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: 2020-06-18 13:00+0200\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"
@@ -1988,7 +1988,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "EEBBetako ingelesa"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/fa.po b/translations/desktop_files/kcontrol-desktops/fa.po
index 62ac9551f..d2da80d5e 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: 2020-06-18 13:00+0200\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"
@@ -1976,7 +1976,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "انگلیسی امریکایی"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/fi.po b/translations/desktop_files/kcontrol-desktops/fi.po
index 5dc5609db..1d5adfa94 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: 2020-06-18 13:00+0200\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"
@@ -1989,7 +1989,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Yhdysvaltain englanti"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/fo.po b/translations/desktop_files/kcontrol-desktops/fo.po
index 8b6786f32..18ee3eb63 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: 2020-06-18 13:00+0200\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"
@@ -1914,7 +1914,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/fr.po b/translations/desktop_files/kcontrol-desktops/fr.po
index 247f578d2..99eac4611 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: 2020-06-18 13:00+0200\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"
@@ -2010,7 +2010,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Anglais US"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/fy.po b/translations/desktop_files/kcontrol-desktops/fy.po
index 1f23aa0fa..1c8b032e5 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: 2020-06-18 13:00+0200\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"
@@ -2010,7 +2010,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "VS Ingelsk"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ga.po b/translations/desktop_files/kcontrol-desktops/ga.po
index f3dc29c06..addd5aa9d 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: 2020-06-18 13:00+0200\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"
@@ -1965,7 +1965,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/gl.po b/translations/desktop_files/kcontrol-desktops/gl.po
index 6b9e36865..b4abd024f 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: 2020-06-18 13:00+0200\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"
@@ -1981,7 +1981,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Inglés de EEUU"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/gu.po b/translations/desktop_files/kcontrol-desktops/gu.po
index 7eb63d98d..796e088ba 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/he.po b/translations/desktop_files/kcontrol-desktops/he.po
index 9a269e5d0..0d56ca52d 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: 2020-06-18 13:00+0200\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"
@@ -2033,7 +2033,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�נגלית �רה\"ב"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/hi.po b/translations/desktop_files/kcontrol-desktops/hi.po
index dc33ebcc0..cee072b6c 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: 2020-06-18 13:00+0200\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"
@@ -1957,7 +1957,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "यू�स अंग�रेजी"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/hne.po b/translations/desktop_files/kcontrol-desktops/hne.po
index 40172c3c1..3406b6a3d 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/hr.po b/translations/desktop_files/kcontrol-desktops/hr.po
index 7d0d141d0..f2944c1d7 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: 2020-06-18 13:00+0200\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"
@@ -2026,7 +2026,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Ameri�ki engleski"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/hsb.po b/translations/desktop_files/kcontrol-desktops/hsb.po
index 3766a856d..90d3a118e 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: 2020-06-18 13:00+0200\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"
@@ -1904,7 +1904,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/hu.po b/translations/desktop_files/kcontrol-desktops/hu.po
index 1d6704277..d3ead1882 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: 2020-06-18 13:00+0200\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"
@@ -1979,7 +1979,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Amerikai angol"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ia.po b/translations/desktop_files/kcontrol-desktops/ia.po
index 7216aed32..c8ba1a3d3 100644
--- a/translations/desktop_files/kcontrol-desktops/ia.po
+++ b/translations/desktop_files/kcontrol-desktops/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+0200\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"
@@ -1903,7 +1903,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/id.po b/translations/desktop_files/kcontrol-desktops/id.po
index f0b2648dd..a93d034cd 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: 2020-06-18 13:00+0200\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"
@@ -1932,7 +1932,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/is.po b/translations/desktop_files/kcontrol-desktops/is.po
index d279328a7..1413534d6 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: 2020-06-18 13:00+0200\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"
@@ -1962,7 +1962,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Enska (BNA)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/it.po b/translations/desktop_files/kcontrol-desktops/it.po
index 3be9b8956..8c6005e3c 100644
--- a/translations/desktop_files/kcontrol-desktops/it.po
+++ b/translations/desktop_files/kcontrol-desktops/it.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Leandro Nini <drfiemost@email.it>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-01-19 02:00+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"
 "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.10.1\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -23,9 +25,8 @@ msgstr "Strumento per l'accessibilità di"
 
 #. Name
 #: access/kcmaccess.desktop:12
-#, fuzzy
 msgid "Accessibility"
-msgstr "Strumento per l'accessibilità di"
+msgstr "Accessibilità"
 
 #. Comment
 #: access/kcmaccess.desktop:14
@@ -80,8 +81,8 @@ msgid ""
 "background;desktops;colors;colours;images;wallpapers;blending;balance;cache;"
 "multiple wallpapers;pixmap;"
 msgstr ""
-"sfondo;desktop;colori;immagini;immagini di sfondo;sfumature;bilanciamento;"
-"cache;sfondi multipli;"
+"sfondo;desktop;colori;colori;immagini;immagini di "
+"sfondo;sfumature;bilanciamento;cache;sfondi multipli;pixmap;"
 
 #. Name
 #: bell/bell.desktop:13
@@ -264,9 +265,8 @@ msgstr "CSS;HTML;stile;fogli di stile;stylesheet;accessibilità;"
 
 #. Name
 #: display/display.desktop:11
-#, fuzzy
 msgid "Display"
-msgstr "Impostazioni del display"
+msgstr "Display"
 
 #. Comment
 #: display/display.desktop:13
@@ -286,7 +286,7 @@ msgstr "Configurazione del display"
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr "monitor;risoluzione;display;schermo;configurazione"
+msgstr "monitor;risoluzione;display;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
@@ -320,12 +320,12 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/kuriikwsfilter.desktop:3
 msgid "InternetKeywordsFilter"
-msgstr ""
+msgstr "InternetKeywordsFilter"
 
 #. Name
 #: ebrowsing/plugins/ikws/kurisearchfilter.desktop:3
 msgid "SearchKeywordsFilter"
-msgstr ""
+msgstr "SearchKeywordsFilter"
 
 #. Comment
 #: ebrowsing/plugins/ikws/searchprovider.desktop:4
@@ -340,19 +340,17 @@ msgstr "Database acronimi"
 #. 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 "URL Alexa"
+msgstr "Alexa"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/alexa.desktop:6
-#, fuzzy
 msgid "http://info.alexa.com/search?q=\\{@}"
-msgstr "http://www.google.it/search?q=\\{@}&ie=UTF-8&oe=UTF-8"
+msgstr "http://info.alexa.com/search?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop:3
@@ -362,7 +360,7 @@ msgstr "URL 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
@@ -374,16 +372,17 @@ msgstr "AllTheWeb veloce"
 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
@@ -393,7 +392,7 @@ msgstr "Guida 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
@@ -403,17 +402,17 @@ msgstr "Ricerca applicazioni di 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
@@ -423,7 +422,7 @@ msgstr "Ricerca 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
@@ -436,6 +435,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
@@ -445,7 +446,7 @@ msgstr "Ricerca per numero nel Database dei bug di 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
@@ -455,7 +456,7 @@ msgstr "Database dei segnali di chiamata 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
@@ -464,13 +465,13 @@ msgstr "World Fact Book della CIA"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/cia.desktop:5
-#, fuzzy, c-format
+#, c-format
 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.it/search?q=\\{@}&btnI=I%27m+Feeling"
-"+Lucky&ie=UTF-8&oe=UTF-8"
+"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
@@ -480,23 +481,24 @@ msgstr "CiteSeer: Biblioteca digitale di letteratura scientifica"
 #. 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 - Rete di archivio Perl completa"
 
 #. 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 - Rete di archivi TeX completa"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/ctan.desktop:4
@@ -504,6 +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 }"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop:3
@@ -515,6 +519,7 @@ msgstr "Catalogo 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
@@ -523,9 +528,8 @@ msgstr "Ricerca bug Debian BTS"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dbug.desktop:4
-#, fuzzy
 msgid "http://bugs.debian.org/\\{@}"
-msgstr "http://italian.imdb.com/Find?\\{@}"
+msgstr "http://bugs.debian.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:5
@@ -535,9 +539,8 @@ msgstr "Traduzioni dict.cc: dal tedesco all'inglese"
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/de2en.desktop:6
 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:6
-#, fuzzy
 msgid "http://www.dict.cc/?s=\\{@}"
-msgstr "http://italian.imdb.com/Find?\\{@}"
+msgstr "http://www.dict.cc/?s=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/de2fr.desktop:3
@@ -548,7 +551,7 @@ msgstr "LEO - Traduzioni dal tedesco al francese"
 #: 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
@@ -558,18 +561,17 @@ msgstr "Ricerca pacchetti 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 "Apri Directory"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6
-#, fuzzy
 msgid "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
-msgstr "http://it.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
+msgstr "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5
@@ -579,7 +581,7 @@ msgstr "DocBook - La guida definitiva"
 #. 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
@@ -588,9 +590,8 @@ msgstr "Identificatore oggetti digitali"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/doi.desktop:6
-#, fuzzy
 msgid "http://dx.doi.org/\\{@}"
-msgstr "http://italian.imdb.com/Find?\\{@}"
+msgstr "http://dx.doi.org/\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/en2de.desktop:5
@@ -605,7 +606,7 @@ msgstr "Traduzione WordReference.com: dall'inglese allo spagnolo"
 #. 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
@@ -615,7 +616,7 @@ msgstr "Traduzione WordReference.com: dall'inglese al francese"
 #. 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
@@ -625,7 +626,7 @@ msgstr "Traduzione WordReference.com: dall'inglese all'italiano"
 #. 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
@@ -635,28 +636,27 @@ msgstr "Traduzione WordReference.com: dallo spagnolo all'inglese"
 #. 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
-#, fuzzy
 msgid "http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr "http://www.google.it/search?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
@@ -666,7 +666,7 @@ msgstr "Dizionario libero on-line di informatica"
 #. 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
@@ -681,38 +681,37 @@ msgstr "Traduzione WordReference.com: dal francese all'inglese"
 #. 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 "FreeDB"
 
 #. 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
-#, fuzzy
 msgid "http://froogle.google.com/froogle?q=\\{@}"
-msgstr "http://news.google.it/news?q=\\{@}&ie=UTF-8&oe=UTF-8"
+msgstr "http://froogle.google.com/froogle?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/fsd.desktop:3
@@ -722,13 +721,12 @@ msgstr "Elenco software libero 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 notizie"
+msgstr "Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google.desktop:6
@@ -749,6 +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"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_groups.desktop:3
@@ -758,7 +761,7 @@ msgstr "Google gruppi"
 #. 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
@@ -767,9 +770,8 @@ msgstr "Ricerca immagini di Google"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/google_images.desktop:6
-#, fuzzy
 msgid "http://images.google.com/images?q=\\{@}"
-msgstr "http://news.google.it/news?q=\\{@}&ie=UTF-8&oe=UTF-8"
+msgstr "http://images.google.com/images?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop:3
@@ -793,9 +795,8 @@ msgstr "Google filmati"
 
 #. 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.it/search?q=\\{@}&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
@@ -810,13 +811,12 @@ msgstr "http://news.google.it/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
-#, fuzzy
 msgid "http://www.gracenote.com/music/search-adv.html?q=\\{@}"
-msgstr "http://www.google.it/search?q=\\{@}&ie=UTF-8&oe=UTF-8"
+msgstr "http://www.gracenote.com/music/search-adv.html?q=\\{@}"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/grec.desktop:5
@@ -826,28 +826,27 @@ msgstr "Grande dizionario della lingua catalana (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 "Sinonimi 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
@@ -857,7 +856,7 @@ msgstr "Sinonimi 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
@@ -877,12 +876,12 @@ msgstr "Traduzione WordReference.com: dall'italiano all'inglese"
 #. 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
@@ -890,16 +889,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
@@ -909,7 +910,7 @@ msgstr "Documentazione della API di KDE"
 #. 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
@@ -919,27 +920,27 @@ msgstr "SVN web di KDE"
 #. 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-Translate"
 
 #. 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
@@ -949,12 +950,12 @@ msgstr "Mamma - Madre di tutti i motori di ricerca"
 #. 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
@@ -963,6 +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"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/msdn.desktop:3
@@ -976,16 +980,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
@@ -1001,6 +1008,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
@@ -1010,7 +1021,7 @@ msgstr "Motore di ricerca 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
@@ -1020,7 +1031,7 @@ msgstr "Ricerca chiavi 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
@@ -1030,7 +1041,7 @@ msgstr "Ricerca 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
@@ -1044,6 +1055,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
@@ -1053,7 +1066,7 @@ msgstr "Ultima documentazione online delle 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
@@ -1063,7 +1076,7 @@ msgstr "Documentazione online delle 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
@@ -1076,6 +1089,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
@@ -1085,17 +1100,17 @@ msgstr "RFC di 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 ""
+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
@@ -1105,12 +1120,12 @@ msgstr "Archivio di applicazioni 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
@@ -1118,11 +1133,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
@@ -1130,17 +1147,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 "Tag di 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
@@ -1150,7 +1168,7 @@ msgstr "Tag di 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
@@ -1160,17 +1178,17 @@ msgstr "Dizionario dei sinonimi 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
@@ -1183,11 +1201,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
@@ -1196,11 +1216,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
@@ -1208,6 +1230,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
@@ -1217,7 +1241,7 @@ msgstr "Dizionario 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
@@ -1229,6 +1253,7 @@ msgstr "Richiesta 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
@@ -1242,13 +1267,11 @@ msgstr "http://it.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:3
-#, fuzzy
 msgid "Wiktionary - The Free Dictionary"
 msgstr "Wikipedia - L'enciclopedia libera"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop:6
-#, fuzzy
 msgid "http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
 msgstr "http://it.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
 
@@ -1260,7 +1283,7 @@ msgstr "WordReference.com dizionario inglese"
 #. 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
@@ -1280,7 +1303,7 @@ msgstr "Controllo energia"
 #. Comment
 #: energy/energy.desktop:13
 msgid "Settings for display power management"
-msgstr "Impostazioni per la gestione dell'energia dello schermo."
+msgstr "Impostazioni per la gestione dell'energia dello schermo"
 
 #. Keywords
 #: energy/energy.desktop:15
@@ -1302,9 +1325,7 @@ 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;MIME;pattern dei file;file;motivi "
-"dei file;schemi;"
+msgstr "tipi di file;associazioni file;tipi MIME;pattern dei file;file;pattern;"
 
 #. Name
 #: fonts/fonts.desktop:12 konqhtml/tdehtml_fonts.desktop:11
@@ -1330,7 +1351,7 @@ msgstr ""
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:2
 msgid "tdehwdevicetray"
-msgstr ""
+msgstr "tdehwdevicetray"
 
 #. GenericName
 #. Name
@@ -1357,7 +1378,7 @@ msgstr "Configurazione dei dispositivi hardware"
 #. Keywords
 #: hwmanager/hwmanager.desktop:15
 msgid "hardware;devices;manager;"
-msgstr "hardware;dispositivi;gestore;gestione;configurazione"
+msgstr "hardware;dispositivi;gestore;"
 
 #. Comment
 #: iccconfig/iccconfig.desktop:14
@@ -1489,7 +1510,7 @@ msgstr ""
 #. Name
 #: info/opengl.desktop:13
 msgid "OpenGL"
-msgstr ""
+msgstr "OpenGL"
 
 #. Comment
 #: info/opengl.desktop:15
@@ -1523,7 +1544,7 @@ msgstr "partizioni;disco rigido;hard disk;HD;informazioni sul sistema;"
 #. Name
 #: info/pci.desktop:12
 msgid "PCI"
-msgstr ""
+msgstr "PCI"
 
 #. Comment
 #: info/pci.desktop:14
@@ -1553,7 +1574,7 @@ msgstr "processore;CPU;FPU;MHz;informazioni sul sistema;"
 #. Name
 #: info/scsi.desktop:12
 msgid "SCSI"
-msgstr ""
+msgstr "SCSI"
 
 #. Comment
 #: info/scsi.desktop:14
@@ -1600,7 +1621,7 @@ msgstr ""
 #. Name
 #: input/mouse.desktop:13
 msgid "Mouse"
-msgstr ""
+msgstr "Mouse"
 
 #. Comment
 #: input/mouse.desktop:15
@@ -1621,7 +1642,7 @@ msgstr ""
 #. Name
 #: joystick/joystick.desktop:12
 msgid "Joystick"
-msgstr ""
+msgstr "Joystick"
 
 #. Comment
 #: joystick/joystick.desktop:14
@@ -1631,7 +1652,7 @@ msgstr "Joystick - un modulo di kcontrol per provare i Joystick"
 #. Keywords
 #: joystick/joystick.desktop:16
 msgid "joystick;gamepad;"
-msgstr ""
+msgstr "joystick;gamepad;"
 
 #. Name
 #: kcontrol/KControl.desktop:8 kcontrol/KControl_NoDisplay.desktop:8
@@ -1917,11 +1938,10 @@ msgstr "Configura il comportamento di Java e JavaScript"
 
 #. Keywords
 #: konqhtml/tdehtml_java_js.desktop:15
-#, fuzzy
 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
@@ -1941,7 +1961,7 @@ msgstr "konqueror;kfm;utente;interfaccia;linguette;navigazione;"
 #. Name
 #: konsole/kcmkonsole.desktop:10
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Comment
 #: konsole/kcmkonsole.desktop:12
@@ -2001,7 +2021,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Inglese US"
 
 #. Name
@@ -2064,9 +2084,8 @@ msgstr "prestazioni;velocità;memoria;migliora;"
 
 #. Name
 #: privacy/privacy.desktop:11
-#, fuzzy
 msgid "Privacy"
-msgstr "privacy;riservatezza;"
+msgstr "Privacy"
 
 #. Comment
 #: privacy/privacy.desktop:13
@@ -2098,7 +2117,7 @@ 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
@@ -2203,8 +2222,8 @@ msgstr ""
 msgid ""
 "style;styles;look;widget;icons;toolbars;text;highlight;apps;TDE applications;"
 msgstr ""
-"stile;stili;aspetto;widget;elemento grafico;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
@@ -2270,9 +2289,8 @@ msgstr "File dei tipi di carattere"
 
 #. Name
 #: tdefontinst/viewpart/tdefontview.desktop:2
-#, fuzzy
 msgid "TDEFontView"
-msgstr "Visualizzatore di caratteri"
+msgstr "Visualizzatore di caratteri TDEFontView"
 
 #. GenericName
 #. Name
@@ -2284,7 +2302,7 @@ msgstr "Visualizzatore di caratteri"
 #. Name
 #: tdeio/cache.desktop:12
 msgid "Cache"
-msgstr ""
+msgstr "Cache"
 
 #. Comment
 #: tdeio/cache.desktop:14
@@ -2346,7 +2364,7 @@ msgstr "Preferenze sulle connessioni"
 #. Name
 #: tdeio/proxy.desktop:12
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
 #. Comment
 #: tdeio/proxy.desktop:14
@@ -2532,4 +2550,4 @@ msgstr "Configura TDE per utilizzare più monitor"
 #. Keywords
 #: xinerama/xinerama.desktop:14
 msgid "Xinerama;dual head;multihead;monitor;"
-msgstr "Xinerama;dual head;multihead;monitor;monitor multipli;"
+msgstr "Xinerama;dual head;multihead;monitor;"
diff --git a/translations/desktop_files/kcontrol-desktops/ja.po b/translations/desktop_files/kcontrol-desktops/ja.po
index 0e59a0f6b..0ee0c507e 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: 2020-06-18 13:00+0200\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"
@@ -1996,7 +1996,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "英語 (アメリカ)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ka.po b/translations/desktop_files/kcontrol-desktops/ka.po
index d257016fc..07f231685 100644
--- a/translations/desktop_files/kcontrol-desktops/ka.po
+++ b/translations/desktop_files/kcontrol-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+0200\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"
@@ -1952,7 +1952,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "ინგლისური (�შშ)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/kcontrol-desktops.pot b/translations/desktop_files/kcontrol-desktops/kcontrol-desktops.pot
index f29b2827a..bd54efcf3 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: 2020-06-18 13:00+0200\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"
@@ -1272,15 +1272,13 @@ msgstr ""
 
 #. GenericName
 #. Name
-#: hwmanager/hwdevicetray-autostart.desktop:4
-#: hwmanager/hwdevicetray.desktop:2
+#: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2
 #: hwmanager/hwdevicetray.desktop:4
 msgid "Device Monitor"
 msgstr ""
 
 #. Comment
-#: hwmanager/hwdevicetray-autostart.desktop:6
-#: hwmanager/hwdevicetray.desktop:6
+#: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6
 msgid "Monitor hardware devices from the system tray"
 msgstr ""
 
@@ -1562,8 +1560,7 @@ msgid "joystick;gamepad;"
 msgstr ""
 
 #. Name
-#: kcontrol/KControl.desktop:8
-#: kcontrol/KControl_NoDisplay.desktop:8
+#: kcontrol/KControl.desktop:8 kcontrol/KControl_NoDisplay.desktop:8
 #: kcontrol/tde-kcontrol.desktop:8
 msgid "Trinity Control Center"
 msgstr ""
@@ -1606,17 +1603,14 @@ msgid "Layout"
 msgstr ""
 
 #. Comment
-#: kicker/kicker_config.desktop:13
-#: kicker/kicker_config_arrangement.desktop:13
+#: kicker/kicker_config.desktop:13 kicker/kicker_config_arrangement.desktop:13
 msgid "Configure the arrangement of the panel"
 msgstr ""
 
 #. Keywords
-#: kicker/kicker_config.desktop:15
-#: kicker/kicker_config_appearance.desktop:15
+#: 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/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;"
@@ -1626,8 +1620,7 @@ msgid ""
 msgstr ""
 
 #. Name
-#: kicker/kicker_config_appearance.desktop:11
-#: konq/fileappearance.desktop:11
+#: kicker/kicker_config_appearance.desktop:11 konq/fileappearance.desktop:11
 msgid "Appearance"
 msgstr ""
 
@@ -1702,8 +1695,7 @@ msgid "desktop;desktops;number;virtual desktop;"
 msgstr ""
 
 #. Name
-#: konq/desktopbehavior.desktop:12
-#: konq/filebehavior.desktop:11
+#: konq/desktopbehavior.desktop:12 konq/filebehavior.desktop:11
 msgid "Behavior"
 msgstr ""
 
@@ -1908,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
@@ -1996,20 +1988,17 @@ msgid "resize;rotate;display;color;depth;size;horizontal;vertical;"
 msgstr ""
 
 #. Name
-#: randr/tderandrtray-autostart.desktop:2
-#: randr/tderandrtray.desktop:2
+#: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2
 msgid "TDERandRTray"
 msgstr ""
 
 #. GenericName
-#: randr/tderandrtray-autostart.desktop:4
-#: randr/tderandrtray.desktop:4
+#: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4
 msgid "Screen Resize & Rotate"
 msgstr ""
 
 #. Comment
-#: randr/tderandrtray-autostart.desktop:6
-#: randr/tderandrtray.desktop:6
+#: randr/tderandrtray-autostart.desktop:6 randr/tderandrtray.desktop:6
 msgid "Resize and rotate X screens."
 msgstr ""
 
diff --git a/translations/desktop_files/kcontrol-desktops/kk.po b/translations/desktop_files/kcontrol-desktops/kk.po
index 8ef27542e..5c0261d63 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: 2020-06-18 13:00+0200\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"
@@ -1925,7 +1925,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�ғылшын (�ҚШ)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/km.po b/translations/desktop_files/kcontrol-desktops/km.po
index 9dfd69db2..ff1871003 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: 2020-06-18 13:00+0200\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"
@@ -1951,7 +1951,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "អង់គ្ល�ស អាម�រិក"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/kn.po b/translations/desktop_files/kcontrol-desktops/kn.po
index 75afd53d6..cb22f9659 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ko.po b/translations/desktop_files/kcontrol-desktops/ko.po
index 3ed1c65f3..3eaf2722d 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: 2020-06-18 13:00+0200\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"
@@ -1944,7 +1944,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "미국 �어"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ku.po b/translations/desktop_files/kcontrol-desktops/ku.po
index 9023ef516..2d6126e72 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/lo.po b/translations/desktop_files/kcontrol-desktops/lo.po
index 1ca6967ac..124b473cd 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: 2020-06-18 13:00+0200\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"
@@ -1930,7 +1930,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/lt.po b/translations/desktop_files/kcontrol-desktops/lt.po
index b46762316..f9dddf666 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: 2020-06-18 13:00+0200\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"
@@ -2009,7 +2009,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "JAV anglų"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/lv.po b/translations/desktop_files/kcontrol-desktops/lv.po
index f600df39d..59c5bff43 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: 2020-06-18 13:00+0200\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"
@@ -1983,7 +1983,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "ASV Angļu"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/mai.po b/translations/desktop_files/kcontrol-desktops/mai.po
index 5054e9191..14fb2e28a 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/mk.po b/translations/desktop_files/kcontrol-desktops/mk.po
index 17c9107ca..9f92b0eaa 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: 2020-06-18 13:00+0200\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"
@@ -237,8 +237,8 @@ msgstr "Криптографија"
 #: crypto/crypto.desktop:12
 msgid "Configure SSL, manage certificates, and other cryptography settings"
 msgstr ""
-"Конфигурација на SSL, менаџмент на �ертификати\n"
-"и други криптограф�ки по�тавувања"
+"Конфигурација на SSL, менаџмент на �ертификати и други криптограф�ки "
+"по�тавувања"
 
 #. Keywords
 #: crypto/crypto.desktop:14
@@ -259,8 +259,8 @@ msgstr "Дизајни на �траница"
 #: css/kcmcss.desktop:14
 msgid "Configure the stylesheets used to render web pages"
 msgstr ""
-"Конфигурирајте ги �траниците �о дизајн\n"
-"што �е кори�тат за прикажување веб-�траници"
+"Конфигурирајте ги �траниците �о дизајн што �е кори�тат за прикажување веб-"
+"�траници"
 
 #. Keywords
 #: css/kcmcss.desktop:16
@@ -2034,7 +2034,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�нгли�ки (С�Д)"
 
 #. Name
@@ -2081,8 +2081,8 @@ msgstr "Перформан�и"
 #: performance/kcmkonqyperformance.desktop:13
 msgid "Configure settings that can improve Konqueror performance"
 msgstr ""
-"Конфигурирајте ги по�тавувањата што може да ги\n"
-"подобрат перформан�ите на Konqueror"
+"Конфигурирајте ги по�тавувањата што може да ги подобрат перформан�ите на "
+"Konqueror"
 
 #. Keywords
 #: performance/kcmkonqyperformance.desktop:15
diff --git a/translations/desktop_files/kcontrol-desktops/ml.po b/translations/desktop_files/kcontrol-desktops/ml.po
index bc7995661..80acd38f7 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/mn.po b/translations/desktop_files/kcontrol-desktops/mn.po
index 270c439a1..79ab2a06a 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: 2020-06-18 13:00+0200\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"
@@ -1975,7 +1975,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/mr.po b/translations/desktop_files/kcontrol-desktops/mr.po
index 28cbbb335..9860e724a 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: 2020-06-18 13:00+0200\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"
@@ -1902,7 +1902,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ms.po b/translations/desktop_files/kcontrol-desktops/ms.po
index 699297fd0..c9fd55ee7 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: 2020-06-18 13:00+0200\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"
@@ -1932,7 +1932,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Bahasa Inggeris AS"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/mt.po b/translations/desktop_files/kcontrol-desktops/mt.po
index 640c759e5..f9b30433a 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: 2020-06-18 13:00+0200\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"
@@ -1977,7 +1977,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Ingliż Amerikan"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/nb.po b/translations/desktop_files/kcontrol-desktops/nb.po
index 602f9f47b..2fe134a6a 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: 2020-06-18 13:00+0200\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"
@@ -1994,7 +1994,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Engelsk (USA)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/nds.po b/translations/desktop_files/kcontrol-desktops/nds.po
index 870e2e704..0ae4ee1de 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: 2020-06-18 13:00+0200\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"
@@ -1993,7 +1993,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Engelsch (US)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ne.po b/translations/desktop_files/kcontrol-desktops/ne.po
index 19cd10bae..1803026a7 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: 2020-06-18 13:00+0200\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"
@@ -1964,7 +1964,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "US अङ�ग�रेजी"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/nl.po b/translations/desktop_files/kcontrol-desktops/nl.po
index 506de1a7f..f717bbaa2 100644
--- a/translations/desktop_files/kcontrol-desktops/nl.po
+++ b/translations/desktop_files/kcontrol-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+0200\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"
@@ -2029,7 +2029,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "VS Engels"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/nn.po b/translations/desktop_files/kcontrol-desktops/nn.po
index ba732eff8..f745c494b 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: 2020-06-18 13:00+0200\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"
@@ -1981,7 +1981,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Engelsk (USA)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/nso.po b/translations/desktop_files/kcontrol-desktops/nso.po
index 397e0ea70..e942522e3 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: 2020-06-18 13:00+0200\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"
@@ -1994,7 +1994,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/oc.po b/translations/desktop_files/kcontrol-desktops/oc.po
index e5b14b1c6..f3023927e 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: 2020-06-18 13:00+0200\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"
@@ -1923,7 +1923,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/or.po b/translations/desktop_files/kcontrol-desktops/or.po
index 2f257e987..d03150ee7 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/pa.po b/translations/desktop_files/kcontrol-desktops/pa.po
index f6da1fd26..76b4713d3 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: 2020-06-18 13:00+0200\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"
@@ -1963,7 +1963,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "ਅਮਰੀਕੀ ਅੰਗਰੇਜ਼ੀ"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/pl.po b/translations/desktop_files/kcontrol-desktops/pl.po
index fe30b6f42..f6401a148 100644
--- a/translations/desktop_files/kcontrol-desktops/pl.po
+++ b/translations/desktop_files/kcontrol-desktops/pl.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+0200\n"
-"PO-Revision-Date: 2020-07-23 00:37+0000\n"
-"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\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"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kcontrol-desktop-files/pl/>\n"
 "Language: pl\n"
@@ -16,7 +17,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.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: access/kaccess.desktop:3
@@ -182,14 +183,13 @@ msgstr "Menedżer plików"
 
 #. 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 ""
-"Tu można wybrać domyślny emulator terminala. Wszystkie programy TDE, które "
-"korzystają z terminala, powinny używać tego ustawienia."
+"Tu można wybrać domyślny menedżer plików. Wszystkie programy TDE, które "
+"korzystają z menedżera plików, powinny używać tego ustawienia."
 
 #. Name
 #: componentchooser/componentservices/kcm_kemail.desktop:1
@@ -273,9 +273,8 @@ msgstr "Monitor i wyświetlanie"
 
 #. Comment
 #: displayconfig/displayconfig.desktop:14
-#, fuzzy
 msgid "Configure display"
-msgstr "Konfiguracja wykrywania usług"
+msgstr "Konfiguracja wyświetlania"
 
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
@@ -411,13 +410,12 @@ msgstr ""
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:3
 msgid "Debian Backports Search"
-msgstr "Wyszukiwanie starszych pakietów Debiana"
+msgstr "Wyszukiwanie nowszych pakietów w Debian Backports"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/backports.desktop:4
-#, fuzzy
 msgid "http://www.backports.org/package.php?search=\\{@}"
-msgstr "http://pl.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go"
+msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/bugft.desktop:3
@@ -559,9 +557,8 @@ msgstr "Open Directory - katalog stron WWW"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/dmoz.desktop:6
-#, fuzzy
 msgid "http://search.dmoz.org/cgi-bin/search?search=\\{@}"
-msgstr "http://pl.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go"
+msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/docbook.desktop:5
@@ -696,9 +693,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:3
-#, fuzzy
 msgid "Froogle"
-msgstr "Google - wyszukiwarka stron WWW"
+msgstr "Froogle"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/froogle.desktop:6
@@ -1121,9 +1117,8 @@ msgstr ""
 
 #. Name
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:3
-#, fuzzy
 msgid "Technorati"
-msgstr "Znaczniki Technorati"
+msgstr "Technorati"
 
 #. Query
 #: ebrowsing/plugins/ikws/searchproviders/technorati.desktop:6
@@ -1319,9 +1314,8 @@ msgstr "tdehwdevicetray"
 #. Name
 #: hwmanager/hwdevicetray-autostart.desktop:4 hwmanager/hwdevicetray.desktop:2
 #: hwmanager/hwdevicetray.desktop:4
-#, fuzzy
 msgid "Device Monitor"
-msgstr "Wiele monitorów"
+msgstr "Monitor urządzeń"
 
 #. Comment
 #: hwmanager/hwdevicetray-autostart.desktop:6 hwmanager/hwdevicetray.desktop:6
@@ -1330,15 +1324,13 @@ msgstr "Monitoruj urządzenia sprzętowe z poziomu tacki systemowej"
 
 #. Name
 #: hwmanager/hwmanager.desktop:11
-#, fuzzy
 msgid "Device Manager"
-msgstr "Menedżer usług"
+msgstr "Menedżer urządzeń"
 
 #. Comment
 #: hwmanager/hwmanager.desktop:13
-#, fuzzy
 msgid "Configure hardware devices"
-msgstr "Konfiguracja zachowania przeglÄ…darki"
+msgstr "Konfiguracja urządzeń w komputerze"
 
 #. Keywords
 #: hwmanager/hwmanager.desktop:15
@@ -1906,21 +1898,18 @@ msgstr "konqueror;kfm;przeglądarka;html;sieć www;www;java;javascript;"
 
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
-#, fuzzy
 msgid "User Interface"
-msgstr "Interfejsy sieciowe"
+msgstr "Interfejs użytkownika"
 
 #. Comment
 #: konqhtml/tdehtml_userinterface.desktop:13
-#, fuzzy
 msgid "Configure user interface options"
-msgstr "Konfiguracja ustawień bufora (cache'a)"
+msgstr "Konfiguruj opcje interfejsu użytkownika"
 
 #. Keywords
 #: konqhtml/tdehtml_userinterface.desktop:15
-#, fuzzy
 msgid "konqueror;kfm;user;interface;tabbed;browsing;"
-msgstr "konqueror;ponowne użycie;wstępne wczytywanie;"
+msgstr "konqueror;kfm;interfejs;przeglÄ…danie;"
 
 #. Name
 #: konsole/kcmkonsole.desktop:10
@@ -1985,7 +1974,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Amerykański angielski"
 
 #. Name
@@ -2081,7 +2070,7 @@ msgstr ""
 #. Name
 #: randr/tderandrtray-autostart.desktop:2 randr/tderandrtray.desktop:2
 msgid "TDERandRTray"
-msgstr "TDERandRTray"
+msgstr "Aplet kontroli monitora"
 
 #. GenericName
 #: randr/tderandrtray-autostart.desktop:4 randr/tderandrtray.desktop:4
@@ -2095,9 +2084,8 @@ msgstr "Zmiana rozmiaru i orientacji ekranów."
 
 #. Name
 #: samba/smbstatus.desktop:12
-#, fuzzy
 msgid "Samba Status"
-msgstr "Monitor stanu Samby"
+msgstr "Status Samby"
 
 #. Comment
 #: samba/smbstatus.desktop:14
@@ -2253,7 +2241,6 @@ msgstr "Pliki czcionek"
 
 #. Name
 #: tdefontinst/viewpart/tdefontview.desktop:2
-#, fuzzy
 msgid "TDEFontView"
 msgstr "PrzeglÄ…darka czcionek"
 
diff --git a/translations/desktop_files/kcontrol-desktops/pt.po b/translations/desktop_files/kcontrol-desktops/pt.po
index 7988d5a78..f4235d1b3 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: 2020-06-18 13:00+0200\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"
@@ -2004,7 +2004,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Inglês dos Estados Unidos"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/pt_BR.po b/translations/desktop_files/kcontrol-desktops/pt_BR.po
index 94bdb11eb..d552224d2 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: 2020-06-18 13:00+0200\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"
@@ -1996,7 +1996,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Inglês dos EUA"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ro.po b/translations/desktop_files/kcontrol-desktops/ro.po
index 2a8b4c2ab..95e8880fd 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: 2020-06-18 13:00+0200\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"
@@ -1976,7 +1976,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Engleză US"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ru.po b/translations/desktop_files/kcontrol-desktops/ru.po
index f65975bc4..932818c17 100644
--- a/translations/desktop_files/kcontrol-desktops/ru.po
+++ b/translations/desktop_files/kcontrol-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>, 2021, 2022, 2024.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+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: 2021-07-07 18:17+0000\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/kcontrol-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
 #: access/kaccess.desktop:3
@@ -95,6 +98,8 @@ msgstr "Ð�аÑ�тройка Ñ�иÑ�темного звукового Ñ�игналÐ
 #: bell/bell.desktop:17
 msgid "Bell;Audio;Sound;Volume;Pitch;Duration;"
 msgstr ""
+"Bell;Audio;Sound;Volume;Pitch;Duration;Звонок;�удио;Звук;Громко�ть;Сигнал;Тон"
+";Длительно�ть;"
 
 #. Name
 #: clock/clock.desktop:13
@@ -109,7 +114,7 @@ msgstr "�а�тройка даты и времени"
 #. Keywords
 #: clock/clock.desktop:17
 msgid "clock;date;time;time zone;"
-msgstr ""
+msgstr "clock;date;time;time zone;ча�ы;дата;врем�;временна� зона;"
 
 #. Name
 #: colors/colors.desktop:12
@@ -125,6 +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;цвета;�хема;тема;контра�т;цвет виджетов;цветова� �хема;"
 
 #. Name
 #: componentchooser/EXAMPLE.desktop:1
@@ -225,7 +232,7 @@ msgstr ""
 #. Name
 #: crypto/crypto.desktop:10
 msgid "Crypto"
-msgstr "Криптографи�"
+msgstr "Шифрование"
 
 #. Comment
 #: crypto/crypto.desktop:12
@@ -256,6 +263,8 @@ msgstr "Ð�аÑ�тройка Ñ�тилей CSS, иÑ�пользуемых при пÐ
 #: css/kcmcss.desktop:16
 msgid "CSS;HTML;style;stylesheet;accessibility;"
 msgstr ""
+"CSS;HTML;style;stylesheet;accessibility;�тиль;таблица �тилей;о�обые "
+"возможно�ти;"
 
 #. Name
 #: display/display.desktop:11
@@ -280,7 +289,7 @@ msgstr "Конфигураци� �крана"
 #. Keywords
 #: displayconfig/displayconfig.desktop:16
 msgid "monitor;resolution;display;"
-msgstr ""
+msgstr "monitor;resolution;display;монитор;разрешение;ди�плей;"
 
 #. Name
 #: dnssd/kcm_tdednssd.desktop:18
@@ -295,7 +304,7 @@ msgstr "�а�тройка обнаружени� �ерви�ов"
 #. Name
 #: ebrowsing/ebrowsing.desktop:12
 msgid "Web Shortcuts"
-msgstr "Сокращени� Веб"
+msgstr "Веб-�окращени�"
 
 #. Comment
 #: ebrowsing/ebrowsing.desktop:14
@@ -1622,7 +1631,7 @@ msgstr "�а�тройка �и�темных �лужб"
 #. Keywords
 #: kded/kcmkded.desktop:15
 msgid "KDED;Daemon;Services;"
-msgstr "KDED;Daemon;Services;�лужбы;�лужба;"
+msgstr "KDED;Daemon;Services;�лужбы;�лужба;демон;"
 
 #. Name
 #: keys/keys.desktop:12
@@ -1728,7 +1737,7 @@ msgstr ""
 #. Name
 #: konq/desktop.desktop:11
 msgid "Multiple Desktops"
-msgstr "Виртуальные рабочие �толы"
+msgstr "Вирт. рабочие �толы"
 
 #. Comment
 #: konq/desktop.desktop:13
@@ -1805,7 +1814,7 @@ msgstr "�а�тройка режима менеджера файлов "
 #. Name
 #: konq/filepreviews.desktop:11
 msgid "Previews & Metadata"
-msgstr "Миниатюры и мета-данные"
+msgstr "Миниатюры"
 
 #. Comment
 #: konq/filepreviews.desktop:13
@@ -1874,7 +1883,7 @@ msgstr ""
 #. Name
 #: konqhtml/tdehtml_userinterface.desktop:11
 msgid "User Interface"
-msgstr "Пользователь�кий интерфей�"
+msgstr "Интерфей�"
 
 #. Comment
 #: konqhtml/tdehtml_userinterface.desktop:13
@@ -1885,7 +1894,8 @@ msgstr "Конфигураци� параметров"
 #: konqhtml/tdehtml_userinterface.desktop:15
 msgid "konqueror;kfm;user;interface;tabbed;browsing;"
 msgstr ""
-"конк�рор;кфм;пользователь;пользователь�кий интерфей�;вкладки;навигаци�;"
+"konqueror;kfm;user;interface;tabbed;browsing;конк�рор;кфм;пользователь;"
+"пользователь�кий интерфей�;вкладки;навигаци�;"
 
 #. Name
 #: konsole/kcmkonsole.desktop:10
@@ -1948,7 +1958,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�нглий�кий (СШ�)"
 
 #. Name
@@ -1992,10 +2002,10 @@ msgstr "Ð�аÑ�тройка параметров, которые влиÑ�ÑŽÑ‚ нÐ
 
 #. Keywords
 #: performance/kcmkonqyperformance.desktop:15
-#, fuzzy
 msgid "konqueror;reuse;preloading;"
 msgstr ""
-"конк�рор;кфм;пользователь;пользователь�кий интерфей�;вкладки;навигаци�;"
+"konqueror;reuse;preloading;конк�рор;повторное и�пользование;предварительна� "
+"загрузка;предзагрузка;"
 
 #. Comment
 #: performance/kcmperformance.desktop:13
@@ -2392,7 +2402,7 @@ msgstr "UADescription (Wget 1.11.4)"
 #. Name
 #: tdeio/useragent.desktop:12
 msgid "Browser Identification"
-msgstr "Идентификаци� браузера"
+msgstr "Идентификаци�"
 
 #. Comment
 #: tdeio/useragent.desktop:14
diff --git a/translations/desktop_files/kcontrol-desktops/rw.po b/translations/desktop_files/kcontrol-desktops/rw.po
index 413545cba..ddaa02fb5 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: 2020-06-18 13:00+0200\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"
@@ -1993,7 +1993,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Icyongereza US"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/se.po b/translations/desktop_files/kcontrol-desktops/se.po
index 7631e6a27..f6c0c52e2 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: 2020-06-18 13:00+0200\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"
@@ -1967,7 +1967,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "EÅ‹gelasgiella (USA)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/si.po b/translations/desktop_files/kcontrol-desktops/si.po
index f47bf0920..c707ef70c 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: 2020-06-18 13:00+0200\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"
@@ -1900,7 +1900,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/sk.po b/translations/desktop_files/kcontrol-desktops/sk.po
index 70866d7ef..73302543f 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: 2020-06-18 13:00+0200\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"
@@ -1970,7 +1970,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Anglický US"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/sl.po b/translations/desktop_files/kcontrol-desktops/sl.po
index 3900a68c4..66b39dadf 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: 2020-06-18 13:00+0200\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"
@@ -1971,7 +1971,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Angleško ZDA"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/sr.po b/translations/desktop_files/kcontrol-desktops/sr.po
index 0db2a814a..2a9857d55 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: 2020-06-18 13:00+0200\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"
@@ -2004,7 +2004,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�мерички енгле�ки"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/sr@Latn.po b/translations/desktop_files/kcontrol-desktops/sr@Latn.po
index 4f2fcae5e..685e8c4df 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: 2020-06-18 13:00+0200\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"
@@ -2000,7 +2000,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Ameri�ki engleski"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/sr@ijekavian.po b/translations/desktop_files/kcontrol-desktops/sr@ijekavian.po
index b1e4b626d..2ea860a26 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: 2020-06-18 13:00+0200\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"
@@ -1905,7 +1905,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/sr@ijekavianlatin.po b/translations/desktop_files/kcontrol-desktops/sr@ijekavianlatin.po
index d514cc96f..fd17ecf24 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: 2020-06-18 13:00+0200\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"
@@ -1905,7 +1905,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/sr@latin.po b/translations/desktop_files/kcontrol-desktops/sr@latin.po
index bc9210b1e..15291455f 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: 2020-06-18 13:00+0200\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"
@@ -1905,7 +1905,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ss.po b/translations/desktop_files/kcontrol-desktops/ss.po
index 98432d91c..05833f648 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: 2020-06-18 13:00+0200\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"
@@ -1930,7 +1930,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/sv.po b/translations/desktop_files/kcontrol-desktops/sv.po
index 200f2eec3..dded60491 100644
--- a/translations/desktop_files/kcontrol-desktops/sv.po
+++ b/translations/desktop_files/kcontrol-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+0200\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"
@@ -1970,7 +1970,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Amerikansk engelska"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ta.po b/translations/desktop_files/kcontrol-desktops/ta.po
index 3ba101a3f..fd51f0b36 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: 2020-06-18 13:00+0200\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"
@@ -1967,7 +1967,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "US ஆங�கிலம�"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/te.po b/translations/desktop_files/kcontrol-desktops/te.po
index 0f30fb581..e50c8ab28 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: 2020-06-18 13:00+0200\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"
@@ -1919,7 +1919,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "యూఎస� ఆంగ�లం"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/tg.po b/translations/desktop_files/kcontrol-desktops/tg.po
index 8a1990c01..2636ade72 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: 2020-06-18 13:00+0200\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"
@@ -1961,7 +1961,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�нгли�ии (ШМ�)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/th.po b/translations/desktop_files/kcontrol-desktops/th.po
index b23646837..86a9b798c 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: 2020-06-18 13:00+0200\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"
@@ -1958,7 +1958,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "อัง�ฤษ อเมริ�ัน"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/tr.po b/translations/desktop_files/kcontrol-desktops/tr.po
index 86875dd8a..5498bbbae 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: 2020-06-18 13:00+0200\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"
@@ -1957,7 +1957,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Amerikan Ä°ngilizcesi"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/tt.po b/translations/desktop_files/kcontrol-desktops/tt.po
index 754987a5a..c6efdc6dc 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: 2020-06-18 13:00+0200\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"
@@ -1930,7 +1930,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "AQŞ İnglizçäse"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ug.po b/translations/desktop_files/kcontrol-desktops/ug.po
index b56c14fd7..d9bdd8bd4 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: 2020-06-18 13:00+0200\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"
@@ -1903,7 +1903,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/uk.po b/translations/desktop_files/kcontrol-desktops/uk.po
index e0b27b8a8..645cf0173 100644
--- a/translations/desktop_files/kcontrol-desktops/uk.po
+++ b/translations/desktop_files/kcontrol-desktops/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-18 13:00+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
 "PO-Revision-Date: 2020-07-23 00:38+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -2010,7 +2010,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "�нглій�ька (СШ�)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/uz.po b/translations/desktop_files/kcontrol-desktops/uz.po
index ebf15ec9e..d911c82f1 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: 2020-06-18 13:00+0200\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"
@@ -1267,9 +1267,7 @@ msgstr ""
 #. Name
 #: filetypes/filetypes.desktop:12
 msgid "File Associations"
-msgstr ""
-"Fayl turi bilan\n"
-"bogʻliqlar"
+msgstr "Fayl turi bilan bogʻliqlar"
 
 #. Comment
 #: filetypes/filetypes.desktop:14
@@ -1824,9 +1822,7 @@ msgstr "Konqueror fayl boshqaruvchisi sifatida qanday koʻrinishini moslash"
 #. Name
 #: konq/filepreviews.desktop:11
 msgid "Previews & Metadata"
-msgstr ""
-"Koʻrib chiqish\n"
-"va meta-maʼlumot"
+msgstr "Koʻrib chiqish va meta-maʼlumot"
 
 #. Comment
 #: konq/filepreviews.desktop:13
@@ -1974,7 +1970,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Inglizcha AQSH"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po b/translations/desktop_files/kcontrol-desktops/uz@cyrillic.po
index 5048a76b5..b7dcf9c3d 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: 2020-06-18 13:00+0200\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"
@@ -1266,9 +1266,7 @@ msgstr ""
 #. Name
 #: filetypes/filetypes.desktop:12
 msgid "File Associations"
-msgstr ""
-"Файл тури билан\n"
-"боғлиқлар"
+msgstr "Файл тури билан боғлиқлар"
 
 #. Comment
 #: filetypes/filetypes.desktop:14
@@ -1822,9 +1820,7 @@ msgstr "Konqueror файл бошқарувчиÑ�и Ñ�ифатида қандаÐ
 #. Name
 #: konq/filepreviews.desktop:11
 msgid "Previews & Metadata"
-msgstr ""
-"Кўриб чиқиш\n"
-"ва мета-маълумот"
+msgstr "Кўриб чиқиш ва мета-маълумот"
 
 #. Comment
 #: konq/filepreviews.desktop:13
@@ -1972,7 +1968,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Инглизча AҚШ"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/ven.po b/translations/desktop_files/kcontrol-desktops/ven.po
index 190c40f1b..adcc0f9f8 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: 2020-06-18 13:00+0200\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"
@@ -1995,7 +1995,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/vi.po b/translations/desktop_files/kcontrol-desktops/vi.po
index 29a3d1389..eebd73717 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: 2020-06-18 13:00+0200\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"
@@ -1980,7 +1980,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Tiếng Anh-Mĩ"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/wa.po b/translations/desktop_files/kcontrol-desktops/wa.po
index 91c5f60a7..050766017 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: 2020-06-18 13:00+0200\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"
@@ -2012,7 +2012,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "Inglès (USA)"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/xh.po b/translations/desktop_files/kcontrol-desktops/xh.po
index 2b187bf36..031d5f458 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: 2020-06-18 13:00+0200\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"
@@ -2000,7 +2000,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/zh_CN.po b/translations/desktop_files/kcontrol-desktops/zh_CN.po
index 582117b40..e89499c07 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: 2020-06-18 13:00+0200\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"
@@ -1997,7 +1997,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "美国英语"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/zh_TW.po b/translations/desktop_files/kcontrol-desktops/zh_TW.po
index 6814fae7d..21cd7f317 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: 2020-06-18 13:00+0200\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"
@@ -2007,7 +2007,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr "英語 - US"
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-desktops/zu.po b/translations/desktop_files/kcontrol-desktops/zu.po
index 76015eb92..1ffb58bdc 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: 2020-06-18 13:00+0200\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"
@@ -2005,7 +2005,7 @@ msgstr ""
 
 #. Name
 #: locale/default/entry.desktop:2
-msgid "US English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
diff --git a/translations/desktop_files/kcontrol-eventsrc/cs.po b/translations/desktop_files/kcontrol-eventsrc/cs.po
index d64380680..c50e3298e 100644
--- a/translations/desktop_files/kcontrol-eventsrc/cs.po
+++ b/translations/desktop_files/kcontrol-eventsrc/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-12-16 11:00+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kcontrol-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.3.2\n"
 
 #. Comment
 #: access/eventsrc:3
 msgid "Accessibility Tool"
-msgstr "nástroj pro zpřístupnění"
+msgstr "Nástroj pro zpřístupnění prostředí"
 
 #. Name
 #: access/eventsrc:6
@@ -32,7 +33,7 @@ msgid ""
 "A modifier key (e.g. Shift or Ctrl) has changed its state and is now active"
 msgstr ""
 "Modifika�ní kláves (např. Shift nebo Control) změnila svůj stav a je nyní "
-"aktivní."
+"aktivní"
 
 #. Name
 #: access/eventsrc:13
@@ -45,7 +46,7 @@ msgid ""
 "A modifier key (e.g. Shift or Ctrl) has changed its state and is now inactive"
 msgstr ""
 "Modifika�ní kláves (např. Shift nebo Control) změnila svůj stav a je nyní "
-"neaktivní."
+"neaktivní"
 
 #. Name
 #: access/eventsrc:20
@@ -87,19 +88,19 @@ msgid ""
 "inactive"
 msgstr ""
 "Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní "
-"aktivní"
+"neaktivní"
 
 #. Name
 #. Comment
 #: access/eventsrc:41 access/eventsrc:42
 msgid "Sticky keys has been enabled or disabled"
-msgstr "Sticky klávesy byly povoleny nebo zakázány"
+msgstr "Klávesy jedním prstem byly povoleny nebo zakázány"
 
 #. Name
 #. Comment
 #: access/eventsrc:48 access/eventsrc:49
 msgid "Slow keys has been enabled or disabled"
-msgstr "Pomalé klávesy byly povoleny nebo zakázány"
+msgstr "Filtrování kláves bylo povoleno nebo zakázáno"
 
 #. Name
 #. Comment
diff --git a/translations/desktop_files/kdcop.desktop/cs.po b/translations/desktop_files/kdcop.desktop/cs.po
new file mode 100644
index 000000000..e055cb85a
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/cs.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
+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: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdcop-kdcopdesktop/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.2.2\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "Prohlíže� DCOP"
diff --git a/translations/desktop_files/kdcop.desktop/el.po b/translations/desktop_files/kdcop.desktop/el.po
new file mode 100644
index 000000000..b8a88d703
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/el.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# blu.256 <mavridisf@gmail.com>, 2022.
+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: 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/"
+"tdebase/kdcop-kdcopdesktop/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.10.1\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/fr.po b/translations/desktop_files/kdcop.desktop/fr.po
new file mode 100644
index 000000000..413c94722
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/fr.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# blu.256 <mavridisf@gmail.com>, 2022.
+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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr ""
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr ""
diff --git a/translations/desktop_files/kdcop.desktop/it.po b/translations/desktop_files/kdcop.desktop/it.po
new file mode 100644
index 000000000..ddc5dcfcc
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/it.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Leandro Nini <drfiemost@email.it>, 2021.
+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: 2021-11-02 08:31+0000\n"
+"Last-Translator: Leandro Nini <drfiemost@email.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdcop-kdcopdesktop/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.8.1\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "Navigatore DCOP"
diff --git a/translations/desktop_files/kdcop.desktop/pt.po b/translations/desktop_files/kdcop.desktop/pt.po
new file mode 100644
index 000000000..64e68a2be
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/pt.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021.
+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: 2021-12-02 19:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdcop-kdcopdesktop/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.9.1\n"
+
+#. Name
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "Navegador DCOP"
diff --git a/translations/desktop_files/kdcop.desktop/ru.po b/translations/desktop_files/kdcop.desktop/ru.po
new file mode 100644
index 000000000..2e0368e5b
--- /dev/null
+++ b/translations/desktop_files/kdcop.desktop/ru.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+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: 2023-06-04 15:15+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdcop-kdcopdesktop/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
+#: kdcop.desktop:11
+msgid "KDCOP"
+msgstr "KDCOP"
+
+#. GenericName
+#: kdcop.desktop:13
+msgid "DCOP browser"
+msgstr "Обозреватель DCOP"
diff --git a/translations/desktop_files/kdesktop-desktops/af.po b/translations/desktop_files/kdesktop-desktops/af.po
index 89e675fdb..f323c8795 100644
--- a/translations/desktop_files/kdesktop-desktops/af.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Gesentreer"
 msgid "Tiled"
 msgstr "Geteël"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Gesentreer"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Gesentreer"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Gesentreer"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ar.po b/translations/desktop_files/kdesktop-desktops/ar.po
index 68dd5c46c..9d339ac75 100644
--- a/translations/desktop_files/kdesktop-desktops/ar.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "مركز"
 msgid "Tiled"
 msgstr "مبلّط"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "مركز"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "مركز"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "مركز"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/az.po b/translations/desktop_files/kdesktop-desktops/az.po
index 6262ba0ef..c066f5cdd 100644
--- a/translations/desktop_files/kdesktop-desktops/az.po
+++ b/translations/desktop_files/kdesktop-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/be.po b/translations/desktop_files/kdesktop-desktops/be.po
index 48c98599c..6fd3fc657 100644
--- a/translations/desktop_files/kdesktop-desktops/be.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Па��р�дзіне"
 msgid "Tiled"
 msgstr "Ра�ц�гнутае"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Па��р�дзіне"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Па��р�дзіне"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Па��р�дзіне"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/bg.po b/translations/desktop_files/kdesktop-desktops/bg.po
index 0dc599966..6b07184a5 100644
--- a/translations/desktop_files/kdesktop-desktops/bg.po
+++ b/translations/desktop_files/kdesktop-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -37,6 +37,42 @@ msgstr "Центрирано"
 msgid "Tiled"
 msgstr "Ка�кадно"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/bn.po b/translations/desktop_files/kdesktop-desktops/bn.po
index a76547a12..23aee2621 100644
--- a/translations/desktop_files/kdesktop-desktops/bn.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "মা�ামা�ি"
 msgid "Tiled"
 msgstr "টাইল করা"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "মা�ামা�ি"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "মা�ামা�ি"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "মা�ামা�ি"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/br.po b/translations/desktop_files/kdesktop-desktops/br.po
index e9dd7eeba..cbb55f6a0 100644
--- a/translations/desktop_files/kdesktop-desktops/br.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Kreizennet"
 msgid "Tiled"
 msgstr "Teolet"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Kreizennet"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Kreizennet"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Kreizennet"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/bs.po b/translations/desktop_files/kdesktop-desktops/bs.po
index 137091328..e1d9ba35c 100644
--- a/translations/desktop_files/kdesktop-desktops/bs.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrirano"
 msgid "Tiled"
 msgstr "Poplo�ano"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ca.po b/translations/desktop_files/kdesktop-desktops/ca.po
index 5b98ee049..a4e9060f6 100644
--- a/translations/desktop_files/kdesktop-desktops/ca.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrat"
 msgid "Tiled"
 msgstr "Repetit"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/cs.po b/translations/desktop_files/kdesktop-desktops/cs.po
index a7d3e9880..96194e583 100644
--- a/translations/desktop_files/kdesktop-desktops/cs.po
+++ b/translations/desktop_files/kdesktop-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+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: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2022-07-19 22:46+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdesktop-desktop-files/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.13.1\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -36,6 +37,36 @@ msgstr "Na střed"
 msgid "Tiled"
 msgstr "Dlaždice"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "Vydlážděné centrovaně"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "Centrované s maximálním poměrem stran"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Vydlážděné s maximálním poměrem stran"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Zvětšené"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "Centrované, automatická změna velikosti"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Zvětšené a oříznuté"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
@@ -89,4 +120,4 @@ msgstr "XGlobe vytvořil Thorsten Scheuermann"
 #. Comment
 #: programs/xplanet.desktop:2
 msgid "XPlanet by Hari Nair"
-msgstr "XPlanet od Hariho Naira"
+msgstr "XPlanet vytvořil Hari Nair"
diff --git a/translations/desktop_files/kdesktop-desktops/csb.po b/translations/desktop_files/kdesktop-desktops/csb.po
index 41f67a17e..27c6ca0c7 100644
--- a/translations/desktop_files/kdesktop-desktops/csb.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Na westrzódkù"
 msgid "Tiled"
 msgstr "Kachelkòwóné"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Na westrzódkù"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Na westrzódkù"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Na westrzódkù"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/cy.po b/translations/desktop_files/kdesktop-desktops/cy.po
index ed6f7e6a5..ec30d6847 100644
--- a/translations/desktop_files/kdesktop-desktops/cy.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Canoledig"
 msgid "Tiled"
 msgstr "Teiledig"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Canoledig"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Canoledig"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Canoledig"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/da.po b/translations/desktop_files/kdesktop-desktops/da.po
index da5b5fa36..9ffdee013 100644
--- a/translations/desktop_files/kdesktop-desktops/da.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centreret"
 msgid "Tiled"
 msgstr "Fliselagt"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centreret"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centreret"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centreret"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/de.po b/translations/desktop_files/kdesktop-desktops/de.po
index 039098ec3..bd46d1420 100644
--- a/translations/desktop_files/kdesktop-desktops/de.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Zentriert"
 msgid "Tiled"
 msgstr "Gekachelt"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Zentriert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Zentriert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Zentriert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/el.po b/translations/desktop_files/kdesktop-desktops/el.po
index b7bd3ba9f..365657e0e 100644
--- a/translations/desktop_files/kdesktop-desktops/el.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Κεντ�ά�ισμα"
 msgid "Tiled"
 msgstr "Σε πα�άθεση"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Κεντ�ά�ισμα"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Κεντ�ά�ισμα"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Κεντ�ά�ισμα"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/en_GB.po b/translations/desktop_files/kdesktop-desktops/en_GB.po
index 075fc122c..30b8f346f 100644
--- a/translations/desktop_files/kdesktop-desktops/en_GB.po
+++ b/translations/desktop_files/kdesktop-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centred"
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centred"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centred"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centred"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/eo.po b/translations/desktop_files/kdesktop-desktops/eo.po
index daf4f8b3e..07a6c2546 100644
--- a/translations/desktop_files/kdesktop-desktops/eo.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Meza"
 msgid "Tiled"
 msgstr "kahela"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Meza"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Meza"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Meza"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/es.po b/translations/desktop_files/kdesktop-desktops/es.po
index e40d00ee1..e34374acf 100644
--- a/translations/desktop_files/kdesktop-desktops/es.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrado"
 msgid "Tiled"
 msgstr "Mosaico"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/et.po b/translations/desktop_files/kdesktop-desktops/et.po
index 863aa1f2c..8b787d74f 100644
--- a/translations/desktop_files/kdesktop-desktops/et.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Tsentreeritud"
 msgid "Tiled"
 msgstr "Paanidena"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Tsentreeritud"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Tsentreeritud"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Tsentreeritud"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/eu.po b/translations/desktop_files/kdesktop-desktops/eu.po
index 03a058b77..aa8c65fe2 100644
--- a/translations/desktop_files/kdesktop-desktops/eu.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Erdiratua"
 msgid "Tiled"
 msgstr "Mosaikoa"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Erdiratua"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Erdiratua"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Erdiratua"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/fa.po b/translations/desktop_files/kdesktop-desktops/fa.po
index c495a80b7..8d8b77a50 100644
--- a/translations/desktop_files/kdesktop-desktops/fa.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "مرکزی"
 msgid "Tiled"
 msgstr "کاشی‌شده"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "مرکزی"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "مرکزی"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "مرکزی"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/fi.po b/translations/desktop_files/kdesktop-desktops/fi.po
index c4d34829e..bc674459d 100644
--- a/translations/desktop_files/kdesktop-desktops/fi.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Keskitetty"
 msgid "Tiled"
 msgstr "Vierekkäin"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Keskitetty"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Keskitetty"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Keskitetty"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/fr.po b/translations/desktop_files/kdesktop-desktops/fr.po
index 504d5b0e0..1d410ee87 100644
--- a/translations/desktop_files/kdesktop-desktops/fr.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centré"
 msgid "Tiled"
 msgstr "Mosaïque"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centré"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centré"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centré"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/fy.po b/translations/desktop_files/kdesktop-desktops/fy.po
index d0f5409ae..96f8aa7b8 100644
--- a/translations/desktop_files/kdesktop-desktops/fy.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "sintraal setten"
 msgid "Tiled"
 msgstr "Tegele"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "sintraal setten"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "sintraal setten"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "sintraal setten"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ga.po b/translations/desktop_files/kdesktop-desktops/ga.po
index f0b82aef6..ecf3e8a22 100644
--- a/translations/desktop_files/kdesktop-desktops/ga.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Láraithe"
 msgid "Tiled"
 msgstr "Tilithe"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Láraithe"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Láraithe"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Láraithe"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 #, fuzzy
diff --git a/translations/desktop_files/kdesktop-desktops/gl.po b/translations/desktop_files/kdesktop-desktops/gl.po
index b3ee5fd7f..f38132fde 100644
--- a/translations/desktop_files/kdesktop-desktops/gl.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrado"
 msgid "Tiled"
 msgstr "Mosaico"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/he.po b/translations/desktop_files/kdesktop-desktops/he.po
index 5c840d729..f8531cf1f 100644
--- a/translations/desktop_files/kdesktop-desktops/he.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "ממורכז"
 msgid "Tiled"
 msgstr "פרוש"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "ממורכז"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "ממורכז"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "ממורכז"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/hi.po b/translations/desktop_files/kdesktop-desktops/hi.po
index cdb6ab06d..b7eea64e0 100644
--- a/translations/desktop_files/kdesktop-desktops/hi.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "बीचों-बीच"
 msgid "Tiled"
 msgstr "चटाई-दार"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "बीचों-बीच"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "बीचों-बीच"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "बीचों-बीच"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/hr.po b/translations/desktop_files/kdesktop-desktops/hr.po
index a91411d6d..3846d2813 100644
--- a/translations/desktop_files/kdesktop-desktops/hr.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Sredinom"
 msgid "Tiled"
 msgstr "Poplo�eno"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Sredinom"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Sredinom"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Sredinom"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/hu.po b/translations/desktop_files/kdesktop-desktops/hu.po
index 4003e604a..77551f5d2 100644
--- a/translations/desktop_files/kdesktop-desktops/hu.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Középre igazítva"
 msgid "Tiled"
 msgstr "Mozaikszerűen"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Középre igazítva"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Középre igazítva"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Középre igazítva"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/id.po b/translations/desktop_files/kdesktop-desktops/id.po
index 5817c8daf..a21b4511b 100644
--- a/translations/desktop_files/kdesktop-desktops/id.po
+++ b/translations/desktop_files/kdesktop-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/is.po b/translations/desktop_files/kdesktop-desktops/is.po
index 82d861443..a670c8c64 100644
--- a/translations/desktop_files/kdesktop-desktops/is.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Miðjað"
 msgid "Tiled"
 msgstr "Flísað"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Miðjað"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Miðjað"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Miðjað"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/it.po b/translations/desktop_files/kdesktop-desktops/it.po
index 34c0f589d..ed6231a6e 100644
--- a/translations/desktop_files/kdesktop-desktops/it.po
+++ b/translations/desktop_files/kdesktop-desktops/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+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: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2022-07-19 22:46+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-desktop-files/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.13.1\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -36,6 +37,36 @@ msgstr "Centrato"
 msgid "Tiled"
 msgstr "Ripetuto"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "Centrato e ripetuto"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "Centrato e massimizzato"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Ripetuto e massimizzato"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Scalato"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "Centrato con adattamento automatico"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Ridimensiona e ritaglia"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
@@ -64,7 +95,7 @@ msgstr "Marciapiede"
 #. Comment
 #: patterns/rattan.desktop:2
 msgid "Rattan"
-msgstr ""
+msgstr "Rattan"
 
 #. Comment
 #: patterns/stonewall2.desktop:2
diff --git a/translations/desktop_files/kdesktop-desktops/ja.po b/translations/desktop_files/kdesktop-desktops/ja.po
index e23f9d01c..66b4947cf 100644
--- a/translations/desktop_files/kdesktop-desktops/ja.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "中央"
 msgid "Tiled"
 msgstr "タイル状"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "中央"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "中央"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "中央"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ka.po b/translations/desktop_files/kdesktop-desktops/ka.po
index 3737a95d6..fac448dee 100644
--- a/translations/desktop_files/kdesktop-desktops/ka.po
+++ b/translations/desktop_files/kdesktop-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "ცენტრზე"
 msgid "Tiled"
 msgstr "მ�ზ�იკ�"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "ცენტრზე"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "ცენტრზე"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "ცენტრზე"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/kdesktop-desktops.pot b/translations/desktop_files/kdesktop-desktops/kdesktop-desktops.pot
index cb4ff5160..4c9b3d717 100644
--- a/translations/desktop_files/kdesktop-desktops/kdesktop-desktops.pot
+++ b/translations/desktop_files/kdesktop-desktops/kdesktop-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/kk.po b/translations/desktop_files/kdesktop-desktops/kk.po
index da269a7e7..78c6ae8dc 100644
--- a/translations/desktop_files/kdesktop-desktops/kk.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Ортаға"
 msgid "Tiled"
 msgstr "Қатарлап"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Ортаға"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Ортаға"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Ортаға"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 #, fuzzy
diff --git a/translations/desktop_files/kdesktop-desktops/km.po b/translations/desktop_files/kdesktop-desktops/km.po
index 9220e9036..ae10bbf6a 100644
--- a/translations/desktop_files/kdesktop-desktops/km.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "កណ្ដាល"
 msgid "Tiled"
 msgstr "ក្បឿង"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "កណ្ដាល"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "កណ្ដាល"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "កណ្ដាល"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ko.po b/translations/desktop_files/kdesktop-desktops/ko.po
index 6bfc7ecb4..d4101c063 100644
--- a/translations/desktop_files/kdesktop-desktops/ko.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 #, fuzzy
diff --git a/translations/desktop_files/kdesktop-desktops/lo.po b/translations/desktop_files/kdesktop-desktops/lo.po
index 62451dbbb..ba98d93e4 100644
--- a/translations/desktop_files/kdesktop-desktops/lo.po
+++ b/translations/desktop_files/kdesktop-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/lt.po b/translations/desktop_files/kdesktop-desktops/lt.po
index 9798693be..cd33d3f47 100644
--- a/translations/desktop_files/kdesktop-desktops/lt.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centruota"
 msgid "Tiled"
 msgstr "IÅ¡kloti"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centruota"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centruota"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centruota"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/lv.po b/translations/desktop_files/kdesktop-desktops/lv.po
index 1c69c3b24..045a6998e 100644
--- a/translations/desktop_files/kdesktop-desktops/lv.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrēts"
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrēts"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrēts"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrēts"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/mk.po b/translations/desktop_files/kdesktop-desktops/mk.po
index 793bb5e4f..daa80bbf8 100644
--- a/translations/desktop_files/kdesktop-desktops/mk.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Центриран"
 msgid "Tiled"
 msgstr "Поплочен"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Центриран"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Центриран"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Центриран"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/mn.po b/translations/desktop_files/kdesktop-desktops/mn.po
index f2483a874..45fa0fa6f 100644
--- a/translations/desktop_files/kdesktop-desktops/mn.po
+++ b/translations/desktop_files/kdesktop-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ms.po b/translations/desktop_files/kdesktop-desktops/ms.po
index 28fc5865f..d957c51ad 100644
--- a/translations/desktop_files/kdesktop-desktops/ms.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Tengah"
 msgid "Tiled"
 msgstr "Berjubin"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Tengah"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Tengah"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Tengah"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/mt.po b/translations/desktop_files/kdesktop-desktops/mt.po
index 8cd3e5cce..f9dac9417 100644
--- a/translations/desktop_files/kdesktop-desktops/mt.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "IÄ‹Ä‹entrat"
 msgid "Tiled"
 msgstr "Madum"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "IÄ‹Ä‹entrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "IÄ‹Ä‹entrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "IÄ‹Ä‹entrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nb.po b/translations/desktop_files/kdesktop-desktops/nb.po
index 2dba26920..978141614 100644
--- a/translations/desktop_files/kdesktop-desktops/nb.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Sentrert"
 msgid "Tiled"
 msgstr "Flislagt"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nds.po b/translations/desktop_files/kdesktop-desktops/nds.po
index 4e0cf3e42..467b0c9e0 100644
--- a/translations/desktop_files/kdesktop-desktops/nds.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "In de Merrn"
 msgid "Tiled"
 msgstr "Kachelt"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "In de Merrn"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "In de Merrn"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "In de Merrn"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ne.po b/translations/desktop_files/kdesktop-desktops/ne.po
index b258b3ac4..655dbced9 100644
--- a/translations/desktop_files/kdesktop-desktops/ne.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "केन�द�रित"
 msgid "Tiled"
 msgstr "टायल गरि�को"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "केन�द�रित"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "केन�द�रित"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "केन�द�रित"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nl.po b/translations/desktop_files/kdesktop-desktops/nl.po
index a09a4933b..37560a7de 100644
--- a/translations/desktop_files/kdesktop-desktops/nl.po
+++ b/translations/desktop_files/kdesktop-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Gecentreerd"
 msgid "Tiled"
 msgstr "Tegels"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Gecentreerd"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Gecentreerd"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Gecentreerd"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nn.po b/translations/desktop_files/kdesktop-desktops/nn.po
index 36cf6fe41..8c8d4bd9c 100644
--- a/translations/desktop_files/kdesktop-desktops/nn.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Sentrert"
 msgid "Tiled"
 msgstr "Jamsides"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Sentrert"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/nso.po b/translations/desktop_files/kdesktop-desktops/nso.po
index 80ef8813a..d00d58f20 100644
--- a/translations/desktop_files/kdesktop-desktops/nso.po
+++ b/translations/desktop_files/kdesktop-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/oc.po b/translations/desktop_files/kdesktop-desktops/oc.po
index 96e436a9e..91c11d08c 100644
--- a/translations/desktop_files/kdesktop-desktops/oc.po
+++ b/translations/desktop_files/kdesktop-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -37,6 +37,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/pa.po b/translations/desktop_files/kdesktop-desktops/pa.po
index 2a4a8001e..36f86738d 100644
--- a/translations/desktop_files/kdesktop-desktops/pa.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "ਕੇਂਦਰੀ"
 msgid "Tiled"
 msgstr "ਤਣਿਆ"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "ਕੇਂਦਰੀ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "ਕੇਂਦਰੀ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "ਕੇਂਦਰੀ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/pl.po b/translations/desktop_files/kdesktop-desktops/pl.po
index 51aacb7c8..0eef8d8cd 100644
--- a/translations/desktop_files/kdesktop-desktops/pl.po
+++ b/translations/desktop_files/kdesktop-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+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: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-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.13.1\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -36,6 +38,36 @@ msgstr "Wyśrodkowane"
 msgid "Tiled"
 msgstr "Kafelkowane"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "Wyśrodkowane"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "Wyśrodkowane zmaksymalizowane"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Kafelkowanie zmaksymalizowane"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Skalowanie"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "Wyśrodkowane, automatyczne dopasowanie"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Skalowanie z przycięciem"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/pt.po b/translations/desktop_files/kdesktop-desktops/pt.po
index b0e75f71d..1a0da521c 100644
--- a/translations/desktop_files/kdesktop-desktops/pt.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrado"
 msgid "Tiled"
 msgstr "Mosaico"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/pt_BR.po b/translations/desktop_files/kdesktop-desktops/pt_BR.po
index 174ed770a..53afbd72b 100644
--- a/translations/desktop_files/kdesktop-desktops/pt_BR.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centralizado"
 msgid "Tiled"
 msgstr "Ladrilhado"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centralizado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centralizado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centralizado"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ro.po b/translations/desktop_files/kdesktop-desktops/ro.po
index 8cec4fd5b..518e442b4 100644
--- a/translations/desktop_files/kdesktop-desktops/ro.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrat"
 msgid "Tiled"
 msgstr "Mozaic"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ru.po b/translations/desktop_files/kdesktop-desktops/ru.po
index ca866c47f..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: 2020-06-19 02:46+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: 2022-07-17 18:15+0000\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
@@ -36,11 +38,40 @@ msgstr "По центру"
 msgid "Tiled"
 msgstr "Черепицей"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "По центру черепицей"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "По центру пропорционально"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Черепицей пропорционально"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Ра�т�нуть"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "�втозаполнение по центру"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Ма�штабирование � кадрированием"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
-#, fuzzy
 msgid "TDE Web Desktop"
-msgstr "Рабочий �тол TDE"
+msgstr "Рабочий веб-�тол TDE"
 
 #. Comment
 #: patterns/fish.desktop:2
@@ -65,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-desktops/rw.po b/translations/desktop_files/kdesktop-desktops/rw.po
index d302d336e..545d21010 100644
--- a/translations/desktop_files/kdesktop-desktops/rw.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Biri hagati"
 msgid "Tiled"
 msgstr "Byudukaro"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Biri hagati"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Biri hagati"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Biri hagati"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/se.po b/translations/desktop_files/kdesktop-desktops/se.po
index 2795989b0..1447f6f0a 100644
--- a/translations/desktop_files/kdesktop-desktops/se.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Guovdut"
 msgid "Tiled"
 msgstr "Bálddalaga"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Guovdut"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Guovdut"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Guovdut"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sk.po b/translations/desktop_files/kdesktop-desktops/sk.po
index 2d89670ca..748614f33 100644
--- a/translations/desktop_files/kdesktop-desktops/sk.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "V strede"
 msgid "Tiled"
 msgstr "Dlaždice"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "V strede"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "V strede"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "V strede"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sl.po b/translations/desktop_files/kdesktop-desktops/sl.po
index 9909a48f6..f0972cb62 100644
--- a/translations/desktop_files/kdesktop-desktops/sl.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Usrediš�eno"
 msgid "Tiled"
 msgstr "Razdeljeno"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Usrediš�eno"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Usrediš�eno"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Usrediš�eno"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sr.po b/translations/desktop_files/kdesktop-desktops/sr.po
index e4d65bd53..78b393a40 100644
--- a/translations/desktop_files/kdesktop-desktops/sr.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Центрирано"
 msgid "Tiled"
 msgstr "Поређано"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Центрирано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sr@Latn.po b/translations/desktop_files/kdesktop-desktops/sr@Latn.po
index 5937a3aa5..6100318d9 100644
--- a/translations/desktop_files/kdesktop-desktops/sr@Latn.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrirano"
 msgid "Tiled"
 msgstr "Poređano"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrirano"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ss.po b/translations/desktop_files/kdesktop-desktops/ss.po
index 9535bce9c..01bb77f00 100644
--- a/translations/desktop_files/kdesktop-desktops/ss.po
+++ b/translations/desktop_files/kdesktop-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/sv.po b/translations/desktop_files/kdesktop-desktops/sv.po
index ca5569613..5fa43b9c1 100644
--- a/translations/desktop_files/kdesktop-desktops/sv.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Centrerad"
 msgid "Tiled"
 msgstr "Sida vid sida"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Centrerad"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Centrerad"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Centrerad"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ta.po b/translations/desktop_files/kdesktop-desktops/ta.po
index a5e34e1e8..4124f9273 100644
--- a/translations/desktop_files/kdesktop-desktops/ta.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "மைய"
 msgid "Tiled"
 msgstr "பிண�ணனி"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "மைய"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "மைய"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "மைய"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/te.po b/translations/desktop_files/kdesktop-desktops/te.po
index 42f1d00fc..0cf8796e6 100644
--- a/translations/desktop_files/kdesktop-desktops/te.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "మద�యన"
 msgid "Tiled"
 msgstr "పలకల�గా"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "మద�యన"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "మద�యన"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "మద�యన"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/tg.po b/translations/desktop_files/kdesktop-desktops/tg.po
index be0a5f249..c4033dfd7 100644
--- a/translations/desktop_files/kdesktop-desktops/tg.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Марказӣ"
 msgid "Tiled"
 msgstr "Тахта�ангӣ"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Марказӣ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Марказӣ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Марказӣ"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/th.po b/translations/desktop_files/kdesktop-desktops/th.po
index 76f3d1f34..4ad9dff41 100644
--- a/translations/desktop_files/kdesktop-desktops/th.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "จัด�ลาง"
 msgid "Tiled"
 msgstr "ปูทั้งหน้าจอ"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "จัด�ลาง"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "จัด�ลาง"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "จัด�ลาง"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/tr.po b/translations/desktop_files/kdesktop-desktops/tr.po
index 69c8fb166..5261e2a0f 100644
--- a/translations/desktop_files/kdesktop-desktops/tr.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Uzat"
 msgid "Tiled"
 msgstr "Sırala"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Uzat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Uzat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Uzat"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/tt.po b/translations/desktop_files/kdesktop-desktops/tt.po
index d7e0d319e..96738c811 100644
--- a/translations/desktop_files/kdesktop-desktops/tt.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Üzäkläşep"
 msgid "Tiled"
 msgstr "Bülengän"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Üzäkläşep"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Üzäkläşep"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Üzäkläşep"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/uk.po b/translations/desktop_files/kdesktop-desktops/uk.po
index 57f20a554..b289cf396 100644
--- a/translations/desktop_files/kdesktop-desktops/uk.po
+++ b/translations/desktop_files/kdesktop-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, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2022-10-18 19:56+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/kdesktop-desktop-files/uk/>\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.1.1\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kdesktop.desktop.cmake:10
@@ -38,6 +38,36 @@ msgstr "По центру"
 msgid "Tiled"
 msgstr "Плиткою"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "По центру Плиткою"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "По центру Maxpect"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "Плиткою Maxpect"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "Ма�штабовано"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "По центру �вто Підлашт."
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "Ма�штаб & Кадруванн�"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/uz.po b/translations/desktop_files/kdesktop-desktops/uz.po
index 2f694c68d..ac3ad01fc 100644
--- a/translations/desktop_files/kdesktop-desktops/uz.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Markazda"
 msgid "Tiled"
 msgstr "Kafel"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Markazda"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Markazda"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Markazda"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/uz@cyrillic.po b/translations/desktop_files/kdesktop-desktops/uz@cyrillic.po
index 0f77465e7..398c85050 100644
--- a/translations/desktop_files/kdesktop-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Марказда"
 msgid "Tiled"
 msgstr "Кафель"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Марказда"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Марказда"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Марказда"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/ven.po b/translations/desktop_files/kdesktop-desktops/ven.po
index 6035bff68..d52eebe8e 100644
--- a/translations/desktop_files/kdesktop-desktops/ven.po
+++ b/translations/desktop_files/kdesktop-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/vi.po b/translations/desktop_files/kdesktop-desktops/vi.po
index 51d612785..845943e9d 100644
--- a/translations/desktop_files/kdesktop-desktops/vi.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Giữa"
 msgid "Tiled"
 msgstr "Xếp ngói"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Giữa"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Giữa"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Giữa"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/wa.po b/translations/desktop_files/kdesktop-desktops/wa.po
index 9d43400cd..66c437a4d 100644
--- a/translations/desktop_files/kdesktop-desktops/wa.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "Ã… mitan"
 msgid "Tiled"
 msgstr "A schaeyes"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "Ã… mitan"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "Ã… mitan"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "Ã… mitan"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/xh.po b/translations/desktop_files/kdesktop-desktops/xh.po
index ab5e291df..1762e3284 100644
--- a/translations/desktop_files/kdesktop-desktops/xh.po
+++ b/translations/desktop_files/kdesktop-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/zh_CN.po b/translations/desktop_files/kdesktop-desktops/zh_CN.po
index fe3a7b929..09990246d 100644
--- a/translations/desktop_files/kdesktop-desktops/zh_CN.po
+++ b/translations/desktop_files/kdesktop-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
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+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: 2022-07-17 18:15+0000\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kdesktop-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
 #: kdesktop.desktop.cmake:10
@@ -36,10 +37,40 @@ msgstr "居中"
 msgid "Tiled"
 msgstr "平铺"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr "居中并平铺 (Center Tiled)"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr "居中并按比例最大化 (Centered Maxpect)"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr "平铺并按比例最大化 (Tiled Maxpect)"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr "拉伸"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr "自适应居中"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr "缩放 & �剪"
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
-msgstr "TDE Web 桌�"
+msgstr "TDE 网站桌�"
 
 #. Comment
 #: patterns/fish.desktop:2
@@ -49,17 +80,17 @@ msgstr "渔网"
 #. Comment
 #: patterns/flowers.desktop:2
 msgid "Flowers"
-msgstr "花"
+msgstr "�花"
 
 #. Comment
 #: patterns/night-rock.desktop:2
 msgid "Night Rock by Tigert"
-msgstr "Tigert 的夜色中的岩石"
+msgstr "夜色中的岩石（创作者：Tigert）"
 
 #. Comment
 #: patterns/pavement.desktop:2
 msgid "Pavement"
-msgstr "人行�"
+msgstr "è¡—ç –"
 
 #. Comment
 #: patterns/rattan.desktop:2
@@ -69,7 +100,7 @@ msgstr "藤�"
 #. Comment
 #: patterns/stonewall2.desktop:2
 msgid "Stonewall 2 by Tigert"
-msgstr "Tigert 的石墙 2"
+msgstr "石墙 2（创作者：Tigert）"
 
 #. Comment
 #: patterns/triangles.desktop:2
@@ -79,14 +110,14 @@ msgstr "三角形"
 #. Comment
 #: programs/xearth.desktop:2
 msgid "XEarth by Kirk Johnson"
-msgstr "Kirk Johnson çš„ XEarth"
+msgstr "XEarth（创作者：Kirk Johnson）"
 
 #. Comment
 #: programs/xglobe.desktop:2
 msgid "XGlobe by Thorsten Scheuermann"
-msgstr "Thorsten Scheuermann çš„ XGlobe"
+msgstr "XGlobe（创作者：Thorsten Scheuermann）"
 
 #. Comment
 #: programs/xplanet.desktop:2
 msgid "XPlanet by Hari Nair"
-msgstr "Hari Nair çš„ XPlanet"
+msgstr "XPlanet（创作者：Hari Nair）"
diff --git a/translations/desktop_files/kdesktop-desktops/zh_TW.po b/translations/desktop_files/kdesktop-desktops/zh_TW.po
index 02317fcbb..91b76cef6 100644
--- a/translations/desktop_files/kdesktop-desktops/zh_TW.po
+++ b/translations/desktop_files/kdesktop-desktops/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 02:46+0200\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"
@@ -36,6 +36,42 @@ msgstr "置中"
 msgid "Tiled"
 msgstr "拼貼"
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+#, fuzzy
+#| msgid "Centered"
+msgid "Center Tiled"
+msgstr "置中"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Maxpect"
+msgstr "置中"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+#, fuzzy
+#| msgid "Centered"
+msgid "Centered Auto Fit"
+msgstr "置中"
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-desktops/zu.po b/translations/desktop_files/kdesktop-desktops/zu.po
index d9cd65d34..dea6a315b 100644
--- a/translations/desktop_files/kdesktop-desktops/zu.po
+++ b/translations/desktop_files/kdesktop-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:46+0200\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"
@@ -36,6 +36,36 @@ msgstr ""
 msgid "Tiled"
 msgstr ""
 
+#. Name
+#: kdesktopSetAsBackground.desktop:17
+msgid "Center Tiled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:22
+msgid "Centered Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:27
+msgid "Tiled Maxpect"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:32
+msgid "Scaled"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:37
+msgid "Centered Auto Fit"
+msgstr ""
+
+#. Name
+#: kdesktopSetAsBackground.desktop:42
+msgid "Scale & Crop"
+msgstr ""
+
 #. Comment
 #: kwebdesktop/kwebdesktop.desktop:2
 msgid "TDE Web Desktop"
diff --git a/translations/desktop_files/kdesktop-icons/af.po b/translations/desktop_files/kdesktop-icons/af.po
index 869b60e69..f19424cba 100644
--- a/translations/desktop_files/kdesktop-icons/af.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ar.po b/translations/desktop_files/kdesktop-icons/ar.po
index a2d2dd3b9..3dfca190a 100644
--- a/translations/desktop_files/kdesktop-icons/ar.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/az.po b/translations/desktop_files/kdesktop-icons/az.po
index 117e42e6a..b43567290 100644
--- a/translations/desktop_files/kdesktop-icons/az.po
+++ b/translations/desktop_files/kdesktop-icons/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/be.po b/translations/desktop_files/kdesktop-icons/be.po
index 9fd27baa0..ab014b6f2 100644
--- a/translations/desktop_files/kdesktop-icons/be.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/bg.po b/translations/desktop_files/kdesktop-icons/bg.po
index e6cfbc3e2..a537856da 100644
--- a/translations/desktop_files/kdesktop-icons/bg.po
+++ b/translations/desktop_files/kdesktop-icons/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+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/"
diff --git a/translations/desktop_files/kdesktop-icons/bn.po b/translations/desktop_files/kdesktop-icons/bn.po
index f9f1de41b..90bf07440 100644
--- a/translations/desktop_files/kdesktop-icons/bn.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/br.po b/translations/desktop_files/kdesktop-icons/br.po
index be4457de6..db993918c 100644
--- a/translations/desktop_files/kdesktop-icons/br.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/bs.po b/translations/desktop_files/kdesktop-icons/bs.po
index 519a61621..3ec917a4e 100644
--- a/translations/desktop_files/kdesktop-icons/bs.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ca.po b/translations/desktop_files/kdesktop-icons/ca.po
index 6c181e270..978744e61 100644
--- a/translations/desktop_files/kdesktop-icons/ca.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/cs.po b/translations/desktop_files/kdesktop-icons/cs.po
index e60601701..33b4afdd5 100644
--- a/translations/desktop_files/kdesktop-icons/cs.po
+++ b/translations/desktop_files/kdesktop-icons/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdesktop-icons/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.2.2\n"
 
 #. Name
 #: Home.desktop:2
@@ -95,7 +96,7 @@ msgstr "Vysunout"
 #. Name
 #: Templates/Directory.desktop:2
 msgid "Folder..."
-msgstr "Složka..."
+msgstr "Složka…"
 
 #. Comment
 #: Templates/Directory.desktop:3
@@ -110,7 +111,7 @@ msgstr "Formát"
 #. Name
 #: Templates/HTMLFile.desktop:2
 msgid "HTML File..."
-msgstr "HTML soubor..."
+msgstr "HTML soubor…"
 
 #. Comment
 #: Templates/HTMLFile.desktop:3
@@ -120,7 +121,7 @@ msgstr "Zadejte název HTML souboru:"
 #. Name
 #: Templates/TextFile.desktop:2
 msgid "Text File..."
-msgstr "Textový soubor..."
+msgstr "Textový soubor…"
 
 #. Comment
 #: Templates/TextFile.desktop:3
@@ -130,7 +131,7 @@ msgstr "Zadejte název textového souboru:"
 #. Name
 #: Templates/linkCAMERA.desktop:2
 msgid "Camera Device..."
-msgstr "Kamera..."
+msgstr "Kamera…"
 
 #. Comment
 #: Templates/linkCAMERA.desktop:3
@@ -140,7 +141,7 @@ msgstr "Nová kamera"
 #. Name
 #: Templates/linkCDROM.desktop:2
 msgid "CD-ROM Device..."
-msgstr "Jednotka CD-ROM..."
+msgstr "Jednotka CD-ROM…"
 
 #. Comment
 #: Templates/linkCDROM.desktop:3
@@ -150,7 +151,7 @@ msgstr "Nová jednotka CD-ROM"
 #. Name
 #: Templates/linkCDWRITER.desktop:2
 msgid "CDWRITER Device..."
-msgstr "Vypalova�ka CD..."
+msgstr "Vypalova�ka CD…"
 
 #. Comment
 #: Templates/linkCDWRITER.desktop:3
@@ -160,7 +161,7 @@ msgstr "Nová vypalova�ka CD"
 #. Name
 #: Templates/linkDVDROM.desktop:2
 msgid "DVD-ROM Device..."
-msgstr "Jednotka DVD-ROM..."
+msgstr "Jednotka DVD-ROM…"
 
 #. Comment
 #: Templates/linkDVDROM.desktop:3
@@ -170,7 +171,7 @@ msgstr "Nová jednotka DVD-ROM"
 #. Name
 #: Templates/linkFloppy.desktop:2
 msgid "Floppy Device..."
-msgstr "Disketová jednotka..."
+msgstr "Disketová jednotka…"
 
 #. Comment
 #: Templates/linkFloppy.desktop:3
@@ -180,7 +181,7 @@ msgstr "Nová disketová jednotka"
 #. Name
 #: Templates/linkHD.desktop:2
 msgid "Hard Disc Device..."
-msgstr "Pevný disk..."
+msgstr "Pevný disk…"
 
 #. Comment
 #: Templates/linkHD.desktop:3
@@ -190,7 +191,7 @@ msgstr "Nový pevný disk"
 #. Name
 #: Templates/linkMO.desktop:2
 msgid "MO Device..."
-msgstr "MO zařízení..."
+msgstr "MO zařízení…"
 
 #. Comment
 #: Templates/linkMO.desktop:3
@@ -200,7 +201,7 @@ msgstr "Nová MO mechanika"
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "NFS…"
 
 #. Comment
 #: Templates/linkNFS.desktop:3
@@ -210,7 +211,7 @@ msgstr "Nový NFS odkaz"
 #. Name
 #: Templates/linkProgram.desktop:2
 msgid "Link to Application..."
-msgstr "Odkaz na aplikaci..."
+msgstr "Odkaz na aplikaci…"
 
 #. Comment
 #: Templates/linkProgram.desktop:3
@@ -220,7 +221,7 @@ msgstr "Nový odkaz na aplikaci"
 #. Name
 #: Templates/linkURL.desktop:2
 msgid "Link to Location (URL)..."
-msgstr "Odkaz na umístění (URL)..."
+msgstr "Odkaz na umístění (URL)…"
 
 #. Comment
 #: Templates/linkURL.desktop:3
@@ -230,7 +231,7 @@ msgstr "Zadejte odkaz na umístění (URL):"
 #. Name
 #: Templates/linkZIP.desktop:2
 msgid "ZIP Device..."
-msgstr "ZIP jednotka..."
+msgstr "ZIP jednotka…"
 
 #. Comment
 #: Templates/linkZIP.desktop:3
@@ -261,12 +262,12 @@ msgstr "Prohlížení Internetu"
 #. Name
 #: directory.autostart:3
 msgid "Autostart"
-msgstr ""
+msgstr "Po spuštění"
 
 #. Name
 #: directory.desktop:5
 msgid "Desktop"
-msgstr "Pracovní plocha"
+msgstr "Plocha"
 
 #. Name
 #: directory.templates:3
diff --git a/translations/desktop_files/kdesktop-icons/csb.po b/translations/desktop_files/kdesktop-icons/csb.po
index 10c5c0576..b00e15794 100644
--- a/translations/desktop_files/kdesktop-icons/csb.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/cy.po b/translations/desktop_files/kdesktop-icons/cy.po
index 5a6f6e33b..bbdeb9f7d 100644
--- a/translations/desktop_files/kdesktop-icons/cy.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/da.po b/translations/desktop_files/kdesktop-icons/da.po
index 83829e36b..29096cb24 100644
--- a/translations/desktop_files/kdesktop-icons/da.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/de.po b/translations/desktop_files/kdesktop-icons/de.po
index 90e049162..bf65e25d1 100644
--- a/translations/desktop_files/kdesktop-icons/de.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/el.po b/translations/desktop_files/kdesktop-icons/el.po
index 9444c2c6f..e45cfa072 100644
--- a/translations/desktop_files/kdesktop-icons/el.po
+++ b/translations/desktop_files/kdesktop-icons/el.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# blu.256 <mavridisf@gmail.com>, 2021.
+# "blu.256" <mavridisf@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2023-10-30 19:13+0000\n"
+"Last-Translator: \"blu.256\" <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kdesktop-icons/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
 #: Home.desktop:2
@@ -28,39 +30,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 +71,7 @@ msgstr "Εκτυπωτές"
 #. Comment
 #: Printers:7
 msgid "Manage print jobs"
-msgstr ""
+msgstr "Διαχεί�ηση ε�γασιών εκτ�πωσης"
 
 #. Name
 #: System.desktop:2
@@ -80,12 +81,12 @@ 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
@@ -201,7 +202,7 @@ msgstr "�έα συσκευή MO"
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "NFS..."
 
 #. Comment
 #: Templates/linkNFS.desktop:3
@@ -241,23 +242,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
diff --git a/translations/desktop_files/kdesktop-icons/en_GB.po b/translations/desktop_files/kdesktop-icons/en_GB.po
index 11c84658b..be5b2b7d2 100644
--- a/translations/desktop_files/kdesktop-icons/en_GB.po
+++ b/translations/desktop_files/kdesktop-icons/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/en_US.po b/translations/desktop_files/kdesktop-icons/en_US.po
index e28ba8240..9efd7e91a 100644
--- a/translations/desktop_files/kdesktop-icons/en_US.po
+++ b/translations/desktop_files/kdesktop-icons/en_US.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/eo.po b/translations/desktop_files/kdesktop-icons/eo.po
index 185c3ba0a..ec7f8e4f8 100644
--- a/translations/desktop_files/kdesktop-icons/eo.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/es.po b/translations/desktop_files/kdesktop-icons/es.po
index b51fd3121..8991c3321 100644
--- a/translations/desktop_files/kdesktop-icons/es.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/et.po b/translations/desktop_files/kdesktop-icons/et.po
index 0e3498d09..279250843 100644
--- a/translations/desktop_files/kdesktop-icons/et.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/eu.po b/translations/desktop_files/kdesktop-icons/eu.po
index 868c4545c..47570c434 100644
--- a/translations/desktop_files/kdesktop-icons/eu.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/fa.po b/translations/desktop_files/kdesktop-icons/fa.po
index 4e072c94f..cf20a4135 100644
--- a/translations/desktop_files/kdesktop-icons/fa.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/fi.po b/translations/desktop_files/kdesktop-icons/fi.po
index 38995c5d7..fba75b312 100644
--- a/translations/desktop_files/kdesktop-icons/fi.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/fo.po b/translations/desktop_files/kdesktop-icons/fo.po
index 5c556c0ed..7d2cf364c 100644
--- a/translations/desktop_files/kdesktop-icons/fo.po
+++ b/translations/desktop_files/kdesktop-icons/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/fr.po b/translations/desktop_files/kdesktop-icons/fr.po
index fbbbc8149..fefe11e56 100644
--- a/translations/desktop_files/kdesktop-icons/fr.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/fy.po b/translations/desktop_files/kdesktop-icons/fy.po
index 04d0345ca..d3fff7b70 100644
--- a/translations/desktop_files/kdesktop-icons/fy.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ga.po b/translations/desktop_files/kdesktop-icons/ga.po
index cc9eee5fd..f58510ec6 100644
--- a/translations/desktop_files/kdesktop-icons/ga.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/gl.po b/translations/desktop_files/kdesktop-icons/gl.po
index bd7e30379..51cad19af 100644
--- a/translations/desktop_files/kdesktop-icons/gl.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/he.po b/translations/desktop_files/kdesktop-icons/he.po
index a21a66f7c..2e549817b 100644
--- a/translations/desktop_files/kdesktop-icons/he.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/hi.po b/translations/desktop_files/kdesktop-icons/hi.po
index 91dd6a091..752745eb2 100644
--- a/translations/desktop_files/kdesktop-icons/hi.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/hr.po b/translations/desktop_files/kdesktop-icons/hr.po
index 739eaa403..26f7079dd 100644
--- a/translations/desktop_files/kdesktop-icons/hr.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/hsb.po b/translations/desktop_files/kdesktop-icons/hsb.po
index 09965a708..4f77b1349 100644
--- a/translations/desktop_files/kdesktop-icons/hsb.po
+++ b/translations/desktop_files/kdesktop-icons/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/hu.po b/translations/desktop_files/kdesktop-icons/hu.po
index 3210abf0f..de22591a8 100644
--- a/translations/desktop_files/kdesktop-icons/hu.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/id.po b/translations/desktop_files/kdesktop-icons/id.po
index ca65b5bea..7e5640110 100644
--- a/translations/desktop_files/kdesktop-icons/id.po
+++ b/translations/desktop_files/kdesktop-icons/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/is.po b/translations/desktop_files/kdesktop-icons/is.po
index 09bed720f..cfb76b126 100644
--- a/translations/desktop_files/kdesktop-icons/is.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/it.po b/translations/desktop_files/kdesktop-icons/it.po
index c1fc0f8b0..6fceadc87 100644
--- a/translations/desktop_files/kdesktop-icons/it.po
+++ b/translations/desktop_files/kdesktop-icons/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-01-09 06:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-icons/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.10.1\n"
 
 #. Name
 #: Home.desktop:2
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #. GenericName
 #: Home.desktop:4
@@ -200,7 +201,7 @@ msgstr "Nuovo dispositivo MO"
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "NFS..."
 
 #. Comment
 #: Templates/linkNFS.desktop:3
@@ -266,7 +267,7 @@ msgstr "Avvio automatico"
 #. Name
 #: directory.desktop:5
 msgid "Desktop"
-msgstr ""
+msgstr "Desktop"
 
 #. Name
 #: directory.templates:3
diff --git a/translations/desktop_files/kdesktop-icons/ja.po b/translations/desktop_files/kdesktop-icons/ja.po
index d228fbb94..b4c1d6370 100644
--- a/translations/desktop_files/kdesktop-icons/ja.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ka.po b/translations/desktop_files/kdesktop-icons/ka.po
index 9c697ccb3..c0fa20edb 100644
--- a/translations/desktop_files/kdesktop-icons/ka.po
+++ b/translations/desktop_files/kdesktop-icons/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/kdesktop-icons.pot b/translations/desktop_files/kdesktop-icons/kdesktop-icons.pot
index 732cb2304..a61c7f55d 100644
--- a/translations/desktop_files/kdesktop-icons/kdesktop-icons.pot
+++ b/translations/desktop_files/kdesktop-icons/kdesktop-icons.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
@@ -87,10 +87,8 @@ msgid "Access to system places"
 msgstr ""
 
 #. Name
-#: Templates/CDROM-Device.desktop:12
-#: Templates/CDWRITER-Device.desktop:12
-#: Templates/DVDROM-Device.desktop:12
-#: Templates/ZIP-Device.desktop:12
+#: Templates/CDROM-Device.desktop:12 Templates/CDWRITER-Device.desktop:12
+#: Templates/DVDROM-Device.desktop:12 Templates/ZIP-Device.desktop:12
 msgid "Eject"
 msgstr ""
 
diff --git a/translations/desktop_files/kdesktop-icons/kk.po b/translations/desktop_files/kdesktop-icons/kk.po
index 20ae672d0..57779ef6f 100644
--- a/translations/desktop_files/kdesktop-icons/kk.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/km.po b/translations/desktop_files/kdesktop-icons/km.po
index ee580320f..c1f7059fe 100644
--- a/translations/desktop_files/kdesktop-icons/km.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ko.po b/translations/desktop_files/kdesktop-icons/ko.po
index bd8c3467f..20e26813b 100644
--- a/translations/desktop_files/kdesktop-icons/ko.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/lo.po b/translations/desktop_files/kdesktop-icons/lo.po
index 950f9d412..fe0288b3e 100644
--- a/translations/desktop_files/kdesktop-icons/lo.po
+++ b/translations/desktop_files/kdesktop-icons/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/lt.po b/translations/desktop_files/kdesktop-icons/lt.po
index 61c24b791..8bf70df62 100644
--- a/translations/desktop_files/kdesktop-icons/lt.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/lv.po b/translations/desktop_files/kdesktop-icons/lv.po
index 69f95e6c5..e5db6e340 100644
--- a/translations/desktop_files/kdesktop-icons/lv.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/mk.po b/translations/desktop_files/kdesktop-icons/mk.po
index 92d1fac02..ca224bf2f 100644
--- a/translations/desktop_files/kdesktop-icons/mk.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/mn.po b/translations/desktop_files/kdesktop-icons/mn.po
index 1d658707f..31cec420f 100644
--- a/translations/desktop_files/kdesktop-icons/mn.po
+++ b/translations/desktop_files/kdesktop-icons/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ms.po b/translations/desktop_files/kdesktop-icons/ms.po
index 4a9a42fbf..66db29381 100644
--- a/translations/desktop_files/kdesktop-icons/ms.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/mt.po b/translations/desktop_files/kdesktop-icons/mt.po
index 3bca96b06..9b37d79c1 100644
--- a/translations/desktop_files/kdesktop-icons/mt.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/nb.po b/translations/desktop_files/kdesktop-icons/nb.po
index 5c0b69c3f..7ed187989 100644
--- a/translations/desktop_files/kdesktop-icons/nb.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/nds.po b/translations/desktop_files/kdesktop-icons/nds.po
index a3af5662e..b022e0397 100644
--- a/translations/desktop_files/kdesktop-icons/nds.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ne.po b/translations/desktop_files/kdesktop-icons/ne.po
index 2cb063dcc..69c7a0dc5 100644
--- a/translations/desktop_files/kdesktop-icons/ne.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/nl.po b/translations/desktop_files/kdesktop-icons/nl.po
index 1d22104b2..0635903ec 100644
--- a/translations/desktop_files/kdesktop-icons/nl.po
+++ b/translations/desktop_files/kdesktop-icons/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/nn.po b/translations/desktop_files/kdesktop-icons/nn.po
index 06c880357..876f5f0ed 100644
--- a/translations/desktop_files/kdesktop-icons/nn.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/nso.po b/translations/desktop_files/kdesktop-icons/nso.po
index 9c268e3f9..837a1c60a 100644
--- a/translations/desktop_files/kdesktop-icons/nso.po
+++ b/translations/desktop_files/kdesktop-icons/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/oc.po b/translations/desktop_files/kdesktop-icons/oc.po
index 779d1e005..d1dedb2be 100644
--- a/translations/desktop_files/kdesktop-icons/oc.po
+++ b/translations/desktop_files/kdesktop-icons/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/pa.po b/translations/desktop_files/kdesktop-icons/pa.po
index 28988b694..0ce04b742 100644
--- a/translations/desktop_files/kdesktop-icons/pa.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/pl.po b/translations/desktop_files/kdesktop-icons/pl.po
index 2e2432b9d..91857037d 100644
--- a/translations/desktop_files/kdesktop-icons/pl.po
+++ b/translations/desktop_files/kdesktop-icons/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2021-10-18 20:30+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kdesktop-icons/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.8.1\n"
 
 #. Name
 #: Home.desktop:2
@@ -34,7 +36,7 @@ msgstr "Zawiera pliki osobiste"
 #. Name
 #: My_Computer:5
 msgid "My Computer"
-msgstr ""
+msgstr "Mój Komputer"
 
 #. Comment
 #: My_Computer:7
@@ -74,7 +76,7 @@ msgstr "ZarzÄ…dzaj zadaniami drukowania"
 #. Name
 #: System.desktop:2
 msgid "System"
-msgstr ""
+msgstr "System"
 
 #. GenericName
 #: System.desktop:4
@@ -105,7 +107,7 @@ msgstr "Podaj nazwÄ™ katalogu:"
 #. Name
 #: Templates/Floppy.desktop:3
 msgid "Format"
-msgstr ""
+msgstr "Format"
 
 #. Name
 #: Templates/HTMLFile.desktop:2
@@ -165,7 +167,7 @@ msgstr "UrzÄ…dzenie DVD-ROM..."
 #. Comment
 #: Templates/linkDVDROM.desktop:3
 msgid "New DVD-ROM Device"
-msgstr "Nowe urzÄ…dzenie DVD-ROM..."
+msgstr "Nowe urzÄ…dzenie DVD-ROM"
 
 #. Name
 #: Templates/linkFloppy.desktop:2
@@ -200,12 +202,12 @@ msgstr "Nowy napęd magnetooptyczny"
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "NFS..."
 
 #. Comment
 #: Templates/linkNFS.desktop:3
 msgid "New NFS Link"
-msgstr "Nowy skrót do NFS..."
+msgstr "Nowy skrót do NFS"
 
 #. Name
 #: Templates/linkProgram.desktop:2
@@ -261,7 +263,7 @@ msgstr "PrzeglÄ…daj Internet"
 #. Name
 #: directory.autostart:3
 msgid "Autostart"
-msgstr ""
+msgstr "Autostart"
 
 #. Name
 #: directory.desktop:5
diff --git a/translations/desktop_files/kdesktop-icons/pt.po b/translations/desktop_files/kdesktop-icons/pt.po
index 9feaa5b33..2a333c8bc 100644
--- a/translations/desktop_files/kdesktop-icons/pt.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/pt_BR.po b/translations/desktop_files/kdesktop-icons/pt_BR.po
index 31c00a368..84fc4b820 100644
--- a/translations/desktop_files/kdesktop-icons/pt_BR.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ro.po b/translations/desktop_files/kdesktop-icons/ro.po
index 19319451c..3bc528017 100644
--- a/translations/desktop_files/kdesktop-icons/ro.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ru.po b/translations/desktop_files/kdesktop-icons/ru.po
index 3f291d2e7..7c71a4076 100644
--- a/translations/desktop_files/kdesktop-icons/ru.po
+++ b/translations/desktop_files/kdesktop-icons/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-19 02:29+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2023-06-04 15:15+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"
 "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:2
@@ -256,7 +258,7 @@ msgstr "Интернет обозреватель"
 #. Comment
 #: Web_Browser:10
 msgid "Browse the World Wide Web"
-msgstr "Обозреватель В�емирной Паутины"
+msgstr "Обозреватель В�емирной паутины"
 
 #. Name
 #: directory.autostart:3
diff --git a/translations/desktop_files/kdesktop-icons/rw.po b/translations/desktop_files/kdesktop-icons/rw.po
index a16038a80..775f1ca4e 100644
--- a/translations/desktop_files/kdesktop-icons/rw.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/se.po b/translations/desktop_files/kdesktop-icons/se.po
index cae92821b..500cb82a9 100644
--- a/translations/desktop_files/kdesktop-icons/se.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/sk.po b/translations/desktop_files/kdesktop-icons/sk.po
index e42583561..7a1733f42 100644
--- a/translations/desktop_files/kdesktop-icons/sk.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/sl.po b/translations/desktop_files/kdesktop-icons/sl.po
index 27532491a..2e930a46c 100644
--- a/translations/desktop_files/kdesktop-icons/sl.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/sr.po b/translations/desktop_files/kdesktop-icons/sr.po
index cb6289d0a..c0a7f3763 100644
--- a/translations/desktop_files/kdesktop-icons/sr.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/sr@Latn.po b/translations/desktop_files/kdesktop-icons/sr@Latn.po
index e00901045..b3324ee02 100644
--- a/translations/desktop_files/kdesktop-icons/sr@Latn.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ss.po b/translations/desktop_files/kdesktop-icons/ss.po
index 12175c8ab..23b997824 100644
--- a/translations/desktop_files/kdesktop-icons/ss.po
+++ b/translations/desktop_files/kdesktop-icons/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/sv.po b/translations/desktop_files/kdesktop-icons/sv.po
index bd35ca266..416295ac6 100644
--- a/translations/desktop_files/kdesktop-icons/sv.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ta.po b/translations/desktop_files/kdesktop-icons/ta.po
index e416e0ece..51e2f6141 100644
--- a/translations/desktop_files/kdesktop-icons/ta.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/te.po b/translations/desktop_files/kdesktop-icons/te.po
index 5df205d3c..d75b6e89c 100644
--- a/translations/desktop_files/kdesktop-icons/te.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/tg.po b/translations/desktop_files/kdesktop-icons/tg.po
index 74a08bd2d..485d6b796 100644
--- a/translations/desktop_files/kdesktop-icons/tg.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/th.po b/translations/desktop_files/kdesktop-icons/th.po
index 1155ef500..218aac56f 100644
--- a/translations/desktop_files/kdesktop-icons/th.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/tr.po b/translations/desktop_files/kdesktop-icons/tr.po
index 92ea7264e..efb5d01c2 100644
--- a/translations/desktop_files/kdesktop-icons/tr.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/tt.po b/translations/desktop_files/kdesktop-icons/tt.po
index ad933a576..9102836a9 100644
--- a/translations/desktop_files/kdesktop-icons/tt.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/uk.po b/translations/desktop_files/kdesktop-icons/uk.po
index 81ce198f1..01ba410c6 100644
--- a/translations/desktop_files/kdesktop-icons/uk.po
+++ b/translations/desktop_files/kdesktop-icons/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/kdesktop-icons/uz.po b/translations/desktop_files/kdesktop-icons/uz.po
index f4f8440b0..65565a673 100644
--- a/translations/desktop_files/kdesktop-icons/uz.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/uz@cyrillic.po b/translations/desktop_files/kdesktop-icons/uz@cyrillic.po
index 114f664f9..d9b84fbcd 100644
--- a/translations/desktop_files/kdesktop-icons/uz@cyrillic.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/ven.po b/translations/desktop_files/kdesktop-icons/ven.po
index 4495d3712..7bb33215e 100644
--- a/translations/desktop_files/kdesktop-icons/ven.po
+++ b/translations/desktop_files/kdesktop-icons/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/vi.po b/translations/desktop_files/kdesktop-icons/vi.po
index feccf368e..4fa5e947a 100644
--- a/translations/desktop_files/kdesktop-icons/vi.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/wa.po b/translations/desktop_files/kdesktop-icons/wa.po
index 74792c410..b719f6315 100644
--- a/translations/desktop_files/kdesktop-icons/wa.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/xh.po b/translations/desktop_files/kdesktop-icons/xh.po
index 6072e5209..db76c7f9d 100644
--- a/translations/desktop_files/kdesktop-icons/xh.po
+++ b/translations/desktop_files/kdesktop-icons/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/zh_CN.po b/translations/desktop_files/kdesktop-icons/zh_CN.po
index 2b61cf5d1..6db578dcf 100644
--- a/translations/desktop_files/kdesktop-icons/zh_CN.po
+++ b/translations/desktop_files/kdesktop-icons/zh_CN.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kdesktop-icons/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
 #: Home.desktop:2
@@ -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,22 +70,22 @@ msgstr "打�机"
 #. Comment
 #: Printers:7
 msgid "Manage print jobs"
-msgstr ""
+msgstr "管�打�任务"
 
 #. Name
 #: System.desktop:2
 msgid "System"
-msgstr "系统"
+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
@@ -96,7 +96,7 @@ msgstr "弹出"
 #. Name
 #: Templates/Directory.desktop:2
 msgid "Folder..."
-msgstr "文件夹..."
+msgstr "文件夹…"
 
 #. Comment
 #: Templates/Directory.desktop:3
@@ -111,7 +111,7 @@ msgstr "格�"
 #. Name
 #: Templates/HTMLFile.desktop:2
 msgid "HTML File..."
-msgstr "HTML 文件..."
+msgstr "HTML 文件…"
 
 #. Comment
 #: Templates/HTMLFile.desktop:3
@@ -121,7 +121,7 @@ msgstr "输入 HTML 文件�："
 #. Name
 #: Templates/TextFile.desktop:2
 msgid "Text File..."
-msgstr "文本文件..."
+msgstr "文本文件…"
 
 #. Comment
 #: Templates/TextFile.desktop:3
@@ -131,77 +131,77 @@ msgstr "输入文本文件�："
 #. Name
 #: Templates/linkCAMERA.desktop:2
 msgid "Camera Device..."
-msgstr "相机设备..."
+msgstr "相机设备…"
 
 #. Comment
 #: Templates/linkCAMERA.desktop:3
 msgid "New camera"
-msgstr "新建相机"
+msgstr "添加相机"
 
 #. Name
 #: Templates/linkCDROM.desktop:2
 msgid "CD-ROM Device..."
-msgstr "CD-ROM 设备..."
+msgstr "CD-ROM 光驱…"
 
 #. Comment
 #: Templates/linkCDROM.desktop:3
 msgid "New CD-ROM Device"
-msgstr "新建 CD-ROM 设备"
+msgstr "添加 CD-ROM 光驱"
 
 #. Name
 #: Templates/linkCDWRITER.desktop:2
 msgid "CDWRITER Device..."
-msgstr "刻录机设备..."
+msgstr "刻录机…"
 
 #. Comment
 #: Templates/linkCDWRITER.desktop:3
 msgid "New CDWRITER Device"
-msgstr "新建刻录机设备"
+msgstr "添加刻录机"
 
 #. Name
 #: Templates/linkDVDROM.desktop:2
 msgid "DVD-ROM Device..."
-msgstr "DVD-ROM 设备..."
+msgstr "DVD-ROM 光驱…"
 
 #. Comment
 #: Templates/linkDVDROM.desktop:3
 msgid "New DVD-ROM Device"
-msgstr "新建 DVD-ROM 设备"
+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
 msgid "New MO Device"
-msgstr "新建 MO 设备"
+msgstr "添加 MO 光驱"
 
 #. Name
 #: Templates/linkNFS.desktop:2
 msgid "NFS..."
-msgstr ""
+msgstr "NFS 远程文件夹…"
 
 #. Comment
 #: Templates/linkNFS.desktop:3
@@ -211,32 +211,32 @@ msgstr "新建 NFS 链接"
 #. Name
 #: Templates/linkProgram.desktop:2
 msgid "Link to Application..."
-msgstr "应用程�链接..."
+msgstr "快�方�…"
 
 #. Comment
 #: Templates/linkProgram.desktop:3
 msgid "New Link to Application"
-msgstr "新建应用程�链接"
+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
 msgid "ZIP Device..."
-msgstr "ZIP 设备..."
+msgstr "Zip 驱动器…"
 
 #. Comment
 #: Templates/linkZIP.desktop:3
 msgid "New ZIP Device"
-msgstr "新建 ZIP 设备"
+msgstr "添加 Zip 驱动器"
 
 #. Name
 #: Trash:8
@@ -246,18 +246,18 @@ 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
@@ -272,4 +272,4 @@ msgstr "桌�"
 #. Name
 #: directory.templates:3
 msgid "Templates"
-msgstr "模�"
+msgstr "文件模�"
diff --git a/translations/desktop_files/kdesktop-icons/zh_TW.po b/translations/desktop_files/kdesktop-icons/zh_TW.po
index 12b46822f..1aac1fc32 100644
--- a/translations/desktop_files/kdesktop-icons/zh_TW.po
+++ b/translations/desktop_files/kdesktop-icons/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 02:29+0200\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"
diff --git a/translations/desktop_files/kdesktop-icons/zu.po b/translations/desktop_files/kdesktop-icons/zu.po
index 7b97bdde6..c10aa71cc 100644
--- a/translations/desktop_files/kdesktop-icons/zu.po
+++ b/translations/desktop_files/kdesktop-icons/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 02:29+0200\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"
diff --git a/translations/desktop_files/khelpcenter-desktops/af.po b/translations/desktop_files/khelpcenter-desktops/af.po
index defb977ce..2365422db 100644
--- a/translations/desktop_files/khelpcenter-desktops/af.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Woerts-warts Gids"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ondersteun TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ar.po b/translations/desktop_files/khelpcenter-desktops/ar.po
index ea9c9d9fe..6101af4a4 100644
--- a/translations/desktop_files/khelpcenter-desktops/ar.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "دليل إرشاد البدء السريع"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "دعم TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/az.po b/translations/desktop_files/khelpcenter-desktops/az.po
index 10d991183..e6d99e0e8 100644
--- a/translations/desktop_files/khelpcenter-desktops/az.po
+++ b/translations/desktop_files/khelpcenter-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Sür'ətli Başlama Rehberi"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/be.po b/translations/desktop_files/khelpcenter-desktops/be.po
index bba7fe52c..093908d8f 100644
--- a/translations/desktop_files/khelpcenter-desktops/be.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -166,6 +166,11 @@ msgid "Quickstart Guide"
 msgstr "Падручнік дл� пачаткоўца"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Падтрымка TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/bg.po b/translations/desktop_files/khelpcenter-desktops/bg.po
index d0b8a9c1f..20f289021 100644
--- a/translations/desktop_files/khelpcenter-desktops/bg.po
+++ b/translations/desktop_files/khelpcenter-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Ръковод�тво за начинаещите"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Подпомагане на TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/bn.po b/translations/desktop_files/khelpcenter-desktops/bn.po
index a3073a087..0182e79f1 100644
--- a/translations/desktop_files/khelpcenter-desktops/bn.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "ক�ইকস�টার�ট গাইড"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "কে.ডি.ই-কে সহায়তা"
diff --git a/translations/desktop_files/khelpcenter-desktops/br.po b/translations/desktop_files/khelpcenter-desktops/br.po
index 51b15acce..de5e76987 100644
--- a/translations/desktop_files/khelpcenter-desktops/br.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Sturier Kregiñ fonnus"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Skoazellañ TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/bs.po b/translations/desktop_files/khelpcenter-desktops/bs.po
index 4fbfb6647..8552a56c6 100644
--- a/translations/desktop_files/khelpcenter-desktops/bs.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Vodi� za brzi po�etak"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podržite TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ca.po b/translations/desktop_files/khelpcenter-desktops/ca.po
index 4c1fd44bc..77c099e66 100644
--- a/translations/desktop_files/khelpcenter-desktops/ca.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guia ràpida"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Com col·laborar amb el TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/cs.po b/translations/desktop_files/khelpcenter-desktops/cs.po
index 5c228096d..860240745 100644
--- a/translations/desktop_files/khelpcenter-desktops/cs.po
+++ b/translations/desktop_files/khelpcenter-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+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: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2023-06-06 19:15+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/khelpcenter-desktop-files/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
 #: Help.desktop:10
@@ -114,9 +115,8 @@ msgstr "(n) Nové"
 
 #. Name
 #: plugins/adminguide.desktop:6
-#, fuzzy
 msgid "TDE Admininstrator Guide"
-msgstr "Příru�ka uživatele TDE"
+msgstr "Příru�ka správce TDE"
 
 #. Name
 #: plugins/applets.desktop:6
@@ -136,7 +136,7 @@ msgstr "Často kladené dotazy TDE"
 #. Name
 #: plugins/hardwaremodules.desktop:6
 msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
 
 #. Name
 #: plugins/info.desktop:7
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Úvodní seznámení"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr "Poznámky k vydání TDE"
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podpora TDE"
@@ -211,4 +216,4 @@ msgstr "Unixové manuálové stránky"
 #. Name
 #: plugins/Scrollkeeper/.directory:5
 msgid "Scrollkeeper"
-msgstr ""
+msgstr "Scrollkeeper"
diff --git a/translations/desktop_files/khelpcenter-desktops/csb.po b/translations/desktop_files/khelpcenter-desktops/csb.po
index ec08478c8..470abd383 100644
--- a/translations/desktop_files/khelpcenter-desktops/csb.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Sztartowi prowôdnik"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Wspiarcë dlô TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/cy.po b/translations/desktop_files/khelpcenter-desktops/cy.po
index 75b5020c0..e244be442 100644
--- a/translations/desktop_files/khelpcenter-desktops/cy.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Canllaw cychwyn cyflym"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Cefnogi TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/da.po b/translations/desktop_files/khelpcenter-desktops/da.po
index 72095a3e1..9e6d9e97b 100644
--- a/translations/desktop_files/khelpcenter-desktops/da.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Kvikstart-guide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Støt TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/de.po b/translations/desktop_files/khelpcenter-desktops/de.po
index e8ccf820b..8c9b6d4d6 100644
--- a/translations/desktop_files/khelpcenter-desktops/de.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Kurzeinführung"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE unterstützen"
diff --git a/translations/desktop_files/khelpcenter-desktops/el.po b/translations/desktop_files/khelpcenter-desktops/el.po
index ce37c0d3f..b004be627 100644
--- a/translations/desktop_files/khelpcenter-desktops/el.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Οδηγός γ�ήγο�ου ξεκινήματος"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Υποστή�ιξη στο TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/en_GB.po b/translations/desktop_files/khelpcenter-desktops/en_GB.po
index e6213dcc1..012c9ad84 100644
--- a/translations/desktop_files/khelpcenter-desktops/en_GB.po
+++ b/translations/desktop_files/khelpcenter-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/eo.po b/translations/desktop_files/khelpcenter-desktops/eo.po
index 94b64c4a7..ae4a0111c 100644
--- a/translations/desktop_files/khelpcenter-desktops/eo.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Konciza gvidlibro"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Subteni TDEon"
diff --git a/translations/desktop_files/khelpcenter-desktops/es.po b/translations/desktop_files/khelpcenter-desktops/es.po
index e2c8464bc..fe2bb6ebe 100644
--- a/translations/desktop_files/khelpcenter-desktops/es.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guía rápida"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Colaborando con TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/et.po b/translations/desktop_files/khelpcenter-desktops/et.po
index 5a81aa02d..eae383619 100644
--- a/translations/desktop_files/khelpcenter-desktops/et.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Kiire sissejuhatus"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE toetamine"
diff --git a/translations/desktop_files/khelpcenter-desktops/eu.po b/translations/desktop_files/khelpcenter-desktops/eu.po
index 0a80d0bea..6669c9b5f 100644
--- a/translations/desktop_files/khelpcenter-desktops/eu.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Gida bizkorra"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDEri lagunduz"
diff --git a/translations/desktop_files/khelpcenter-desktops/fa.po b/translations/desktop_files/khelpcenter-desktops/fa.po
index 45ef5a64e..361338a68 100644
--- a/translations/desktop_files/khelpcenter-desktops/fa.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "راهنمای آغاز سریع"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "پشتیبانی TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/fi.po b/translations/desktop_files/khelpcenter-desktops/fi.po
index cba99bf83..976ee311e 100644
--- a/translations/desktop_files/khelpcenter-desktops/fi.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Pikaohje"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE:n tukeminen"
diff --git a/translations/desktop_files/khelpcenter-desktops/fo.po b/translations/desktop_files/khelpcenter-desktops/fo.po
index f64e3808d..2174a6953 100644
--- a/translations/desktop_files/khelpcenter-desktops/fo.po
+++ b/translations/desktop_files/khelpcenter-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/fr.po b/translations/desktop_files/khelpcenter-desktops/fr.po
index 6a4e1724a..2f0c979a6 100644
--- a/translations/desktop_files/khelpcenter-desktops/fr.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Guide de démarrage rapide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Aider TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/fy.po b/translations/desktop_files/khelpcenter-desktops/fy.po
index cdcd5901f..dc6dfcf21 100644
--- a/translations/desktop_files/khelpcenter-desktops/fy.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Fluchstartgids"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE stypje"
diff --git a/translations/desktop_files/khelpcenter-desktops/ga.po b/translations/desktop_files/khelpcenter-desktops/ga.po
index b3399906d..f9dfd1fa8 100644
--- a/translations/desktop_files/khelpcenter-desktops/ga.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ag Tacú le TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/gl.po b/translations/desktop_files/khelpcenter-desktops/gl.po
index 62d1dcadd..445c8ceaf 100644
--- a/translations/desktop_files/khelpcenter-desktops/gl.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guia de Início Rápido"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Dar Apoio a TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/he.po b/translations/desktop_files/khelpcenter-desktops/he.po
index 11e7417b6..eb6db4358 100644
--- a/translations/desktop_files/khelpcenter-desktops/he.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "מדריך התחלה מהירה"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "תמיכה ב־TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/hi.po b/translations/desktop_files/khelpcenter-desktops/hi.po
index 132bb95b5..624d28268 100644
--- a/translations/desktop_files/khelpcenter-desktops/hi.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "शीघ�रप�रारंभ मार�गदर�शक"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "केडीई को आधार दें"
diff --git a/translations/desktop_files/khelpcenter-desktops/hr.po b/translations/desktop_files/khelpcenter-desktops/hr.po
index e0a6f4bd7..db99929cd 100644
--- a/translations/desktop_files/khelpcenter-desktops/hr.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Brzi uvod"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podrška TDE-u"
diff --git a/translations/desktop_files/khelpcenter-desktops/hsb.po b/translations/desktop_files/khelpcenter-desktops/hsb.po
index f11606380..a818f5350 100644
--- a/translations/desktop_files/khelpcenter-desktops/hsb.po
+++ b/translations/desktop_files/khelpcenter-desktops/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/hu.po b/translations/desktop_files/khelpcenter-desktops/hu.po
index af6fa9e70..f8d6c8f50 100644
--- a/translations/desktop_files/khelpcenter-desktops/hu.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Rövid bevezetés"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "A TDE támogatása"
diff --git a/translations/desktop_files/khelpcenter-desktops/id.po b/translations/desktop_files/khelpcenter-desktops/id.po
index 5c64ba02b..cff678718 100644
--- a/translations/desktop_files/khelpcenter-desktops/id.po
+++ b/translations/desktop_files/khelpcenter-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Petunjuk Memulai Secara Cepat"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/is.po b/translations/desktop_files/khelpcenter-desktops/is.po
index bd785a2ad..b5c272f4a 100644
--- a/translations/desktop_files/khelpcenter-desktops/is.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Skyndileiðbeiningar"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Styðja TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/it.po b/translations/desktop_files/khelpcenter-desktops/it.po
index 0bf636037..beef2e4fe 100644
--- a/translations/desktop_files/khelpcenter-desktops/it.po
+++ b/translations/desktop_files/khelpcenter-desktops/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+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: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khelpcenter-desktop-files/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
 #: Help.desktop:10
@@ -44,7 +45,7 @@ msgstr "Indice della guida"
 #. Comment
 #: kcmhelpcenter.desktop:15
 msgid "Help center search index configuration and generation"
-msgstr "Configurazione e generazione dell'indice di ricerca della guida."
+msgstr "Configurazione e generazione dell'indice di ricerca della guida"
 
 #. Keywords
 #: kcmhelpcenter.desktop:17
@@ -54,7 +55,7 @@ msgstr "khelpcenter;guida;indice;ricerca;"
 #. Name
 #: khelpcenter.desktop:11
 msgid "KHelpCenter"
-msgstr ""
+msgstr "KHelpCenter"
 
 #. Comment
 #: khelpcenter.desktop:13
@@ -104,7 +105,7 @@ msgstr "(8) Amministrazione di sistema"
 #. Name
 #: plugins/Manpages/man9.desktop:4
 msgid "(9) Kernel"
-msgstr ""
+msgstr "(9) Kernel"
 
 #. Name
 #: plugins/Manpages/mann.desktop:4
@@ -113,9 +114,8 @@ msgstr "(n) Nuovi"
 
 #. Name
 #: plugins/adminguide.desktop:6
-#, fuzzy
 msgid "TDE Admininstrator Guide"
-msgstr "Manuale degli utenti di TDE"
+msgstr "Guida per l'amministratore di TDE"
 
 #. Name
 #: plugins/applets.desktop:6
@@ -135,7 +135,7 @@ msgstr "Domande su TDE (FAQ)"
 #. Name
 #: plugins/hardwaremodules.desktop:6
 msgid "Hardware"
-msgstr ""
+msgstr "Hardware"
 
 #. Name
 #: plugins/info.desktop:7
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guida rapida"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr "Note sulla versione di TDE"
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Aiutare TDE"
@@ -210,4 +215,4 @@ msgstr "Pagine manuale UNIX"
 #. Name
 #: plugins/Scrollkeeper/.directory:5
 msgid "Scrollkeeper"
-msgstr ""
+msgstr "Scrollkeeper"
diff --git a/translations/desktop_files/khelpcenter-desktops/ja.po b/translations/desktop_files/khelpcenter-desktops/ja.po
index 8e3ab5962..db69d12cc 100644
--- a/translations/desktop_files/khelpcenter-desktops/ja.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "クイックスタート"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE 支�"
diff --git a/translations/desktop_files/khelpcenter-desktops/ka.po b/translations/desktop_files/khelpcenter-desktops/ka.po
index eba073c07..a49f9b9e5 100644
--- a/translations/desktop_files/khelpcenter-desktops/ka.po
+++ b/translations/desktop_files/khelpcenter-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "ს�ხელმძღვ�ნელ� დ�მწყებთ�თვის"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE-ს მხ�რდ�ჭერ�"
diff --git a/translations/desktop_files/khelpcenter-desktops/khelpcenter-desktops.pot b/translations/desktop_files/khelpcenter-desktops/khelpcenter-desktops.pot
index d90fa069c..78c72adfd 100644
--- a/translations/desktop_files/khelpcenter-desktops/khelpcenter-desktops.pot
+++ b/translations/desktop_files/khelpcenter-desktops/khelpcenter-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/kk.po b/translations/desktop_files/khelpcenter-desktops/kk.po
index 907e5b879..3d50fb504 100644
--- a/translations/desktop_files/khelpcenter-desktops/kk.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Ба�таушы бағыттама�ы"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE-ні қолдау"
diff --git a/translations/desktop_files/khelpcenter-desktops/km.po b/translations/desktop_files/khelpcenter-desktops/km.po
index 6f7e45bf1..67ead7775 100644
--- a/translations/desktop_files/khelpcenter-desktops/km.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "មគ្គុទ្ទ�សក�​ចាប់ផ្ដើម​រហ�ស"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "ការ​គាំទ្រ TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ko.po b/translations/desktop_files/khelpcenter-desktops/ko.po
index dad0f9bb3..353059ca6 100644
--- a/translations/desktop_files/khelpcenter-desktops/ko.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "빠른 시작 설명서"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE 지�"
diff --git a/translations/desktop_files/khelpcenter-desktops/lo.po b/translations/desktop_files/khelpcenter-desktops/lo.po
index 3a3088e0b..a40a7840b 100644
--- a/translations/desktop_files/khelpcenter-desktops/lo.po
+++ b/translations/desktop_files/khelpcenter-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr "ຄຳ�ນະນຳ�ບບໄວ"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "ເ�ມ�ີລາ"
diff --git a/translations/desktop_files/khelpcenter-desktops/lt.po b/translations/desktop_files/khelpcenter-desktops/lt.po
index 121b1b700..9f06ff137 100644
--- a/translations/desktop_files/khelpcenter-desktops/lt.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Greitos pradžios gidas"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE palaikymas"
diff --git a/translations/desktop_files/khelpcenter-desktops/lv.po b/translations/desktop_files/khelpcenter-desktops/lv.po
index ea00d3b3c..7f4d67b39 100644
--- a/translations/desktop_files/khelpcenter-desktops/lv.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Ātras s�kšanas ceļvedis"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE atbalstīšana"
diff --git a/translations/desktop_files/khelpcenter-desktops/mk.po b/translations/desktop_files/khelpcenter-desktops/mk.po
index d97b56aa6..cc95efda1 100644
--- a/translations/desktop_files/khelpcenter-desktops/mk.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Водич за брзо �наоѓање"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Поддршка за TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/mn.po b/translations/desktop_files/khelpcenter-desktops/mn.po
index 163c677fe..561394dec 100644
--- a/translations/desktop_files/khelpcenter-desktops/mn.po
+++ b/translations/desktop_files/khelpcenter-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr "QuickStart-Зааварчилгаа"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "КДЭ д�мжил�г"
diff --git a/translations/desktop_files/khelpcenter-desktops/ms.po b/translations/desktop_files/khelpcenter-desktops/ms.po
index 527d7f994..8450af26a 100644
--- a/translations/desktop_files/khelpcenter-desktops/ms.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Panduan Mula Pantas"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE Sokongan"
diff --git a/translations/desktop_files/khelpcenter-desktops/mt.po b/translations/desktop_files/khelpcenter-desktops/mt.po
index 0563f65f0..56d72490b 100644
--- a/translations/desktop_files/khelpcenter-desktops/mt.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -167,6 +167,11 @@ msgid "Quickstart Guide"
 msgstr "Gwida biex tibda malajr"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Appoġġja lill-TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/nb.po b/translations/desktop_files/khelpcenter-desktops/nb.po
index 304fea002..fc835228b 100644
--- a/translations/desktop_files/khelpcenter-desktops/nb.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Hurtigstart-guide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Støtt TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/nds.po b/translations/desktop_files/khelpcenter-desktops/nds.po
index 99351af68..51b55c9f5 100644
--- a/translations/desktop_files/khelpcenter-desktops/nds.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Fixstart-Föhrer"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE ünnerstütten"
diff --git a/translations/desktop_files/khelpcenter-desktops/ne.po b/translations/desktop_files/khelpcenter-desktops/ne.po
index e4c81ab01..52b41c8c7 100644
--- a/translations/desktop_files/khelpcenter-desktops/ne.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "द�र�त स�र�आत मार�गदर�शन"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "केडीई समर�थन"
diff --git a/translations/desktop_files/khelpcenter-desktops/nl.po b/translations/desktop_files/khelpcenter-desktops/nl.po
index 95a367983..a6b9d7cde 100644
--- a/translations/desktop_files/khelpcenter-desktops/nl.po
+++ b/translations/desktop_files/khelpcenter-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Snelstartgids"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE ondersteunen"
diff --git a/translations/desktop_files/khelpcenter-desktops/nn.po b/translations/desktop_files/khelpcenter-desktops/nn.po
index 58b48e7d0..bd1909395 100644
--- a/translations/desktop_files/khelpcenter-desktops/nn.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Snøggstarguide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Støtt TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/nso.po b/translations/desktop_files/khelpcenter-desktops/nso.po
index 9c39a067e..7c08ab4d7 100644
--- a/translations/desktop_files/khelpcenter-desktops/nso.po
+++ b/translations/desktop_files/khelpcenter-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Keletso ya Thomiso ya Kapejana"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Go Thekga TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/oc.po b/translations/desktop_files/khelpcenter-desktops/oc.po
index 9dcec0f50..dd31fd5c9 100644
--- a/translations/desktop_files/khelpcenter-desktops/oc.po
+++ b/translations/desktop_files/khelpcenter-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr "Guia rapida"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/pa.po b/translations/desktop_files/khelpcenter-desktops/pa.po
index 746645718..8dd0aa4f4 100644
--- a/translations/desktop_files/khelpcenter-desktops/pa.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "ਚ�ਸਤ ਸ਼�ਰੂਆਤ ਗਾਈਡ"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE ਦੀ ਸਹਾਇਤਾ"
diff --git a/translations/desktop_files/khelpcenter-desktops/pl.po b/translations/desktop_files/khelpcenter-desktops/pl.po
index 5d3742163..04bc308cd 100644
--- a/translations/desktop_files/khelpcenter-desktops/pl.po
+++ b/translations/desktop_files/khelpcenter-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+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: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khelpcenter-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.13.1\n"
 
 #. Name
 #: Help.desktop:10
@@ -113,9 +115,8 @@ msgstr "(n) nowe"
 
 #. Name
 #: plugins/adminguide.desktop:6
-#, fuzzy
 msgid "TDE Admininstrator Guide"
-msgstr "Podręcznik użytkownika TDE"
+msgstr "Podręcznik administratora TDE"
 
 #. Name
 #: plugins/applets.desktop:6
@@ -163,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Przewodnik startowy"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Wspomaganie TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/pt.po b/translations/desktop_files/khelpcenter-desktops/pt.po
index b074ac6be..adad4bffb 100644
--- a/translations/desktop_files/khelpcenter-desktops/pt.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guia de Iniciação"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Apoiar o TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/pt_BR.po b/translations/desktop_files/khelpcenter-desktops/pt_BR.po
index 059334b97..479b112e4 100644
--- a/translations/desktop_files/khelpcenter-desktops/pt_BR.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Guia Rápido"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Assistência ao TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ro.po b/translations/desktop_files/khelpcenter-desktops/ro.po
index 3ee772d97..35ddaba86 100644
--- a/translations/desktop_files/khelpcenter-desktops/ro.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Ghid rapid"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Cum să ajutați Proiectul TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/ru.po b/translations/desktop_files/khelpcenter-desktops/ru.po
index 349edf312..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: 2020-06-19 09:37+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: 2023-06-05 18:15+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/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
@@ -163,6 +166,11 @@ msgid "Quickstart Guide"
 msgstr "Руковод�тво дл� начинающих в TDE"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr "Примечани� к выпу�ку TDE"
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Поддержка TDE"
@@ -180,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
@@ -210,4 +218,4 @@ msgstr "Страницы руковод�тв UNIX"
 #. Name
 #: plugins/Scrollkeeper/.directory:5
 msgid "Scrollkeeper"
-msgstr ""
+msgstr "Scrollkeeper"
diff --git a/translations/desktop_files/khelpcenter-desktops/rw.po b/translations/desktop_files/khelpcenter-desktops/rw.po
index 55f4d2a83..99d7ac528 100644
--- a/translations/desktop_files/khelpcenter-desktops/rw.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Iyobora GutangiraVuba"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Gufasha TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/se.po b/translations/desktop_files/khelpcenter-desktops/se.po
index c5e03c49f..da37c42f1 100644
--- a/translations/desktop_files/khelpcenter-desktops/se.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Oanehis TDE-introdukšuvdna"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Doarjjo TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/sk.po b/translations/desktop_files/khelpcenter-desktops/sk.po
index da1d4cfcd..561f164b0 100644
--- a/translations/desktop_files/khelpcenter-desktops/sk.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Návod na rýchle použitie"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podpora TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/sl.po b/translations/desktop_files/khelpcenter-desktops/sl.po
index 12ec7ac54..3e69176dc 100644
--- a/translations/desktop_files/khelpcenter-desktops/sl.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Vodnik za hitri za�etek"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podpiranje TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/sr.po b/translations/desktop_files/khelpcenter-desktops/sr.po
index f23605216..5475165fa 100644
--- a/translations/desktop_files/khelpcenter-desktops/sr.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Почетни водич"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Подржавање TDE-а"
diff --git a/translations/desktop_files/khelpcenter-desktops/sr@Latn.po b/translations/desktop_files/khelpcenter-desktops/sr@Latn.po
index a044fe322..62480b66e 100644
--- a/translations/desktop_files/khelpcenter-desktops/sr@Latn.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Po�etni vodi�"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Podržavanje TDE-a"
diff --git a/translations/desktop_files/khelpcenter-desktops/ss.po b/translations/desktop_files/khelpcenter-desktops/ss.po
index d7300ebe6..73109a9b4 100644
--- a/translations/desktop_files/khelpcenter-desktops/ss.po
+++ b/translations/desktop_files/khelpcenter-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr ""
diff --git a/translations/desktop_files/khelpcenter-desktops/sv.po b/translations/desktop_files/khelpcenter-desktops/sv.po
index c1040dc2d..a6ac935b9 100644
--- a/translations/desktop_files/khelpcenter-desktops/sv.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Snabbstartsguide"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ge TDE ditt stöd"
diff --git a/translations/desktop_files/khelpcenter-desktops/ta.po b/translations/desktop_files/khelpcenter-desktops/ta.po
index 3bb71fadb..0f18133c6 100644
--- a/translations/desktop_files/khelpcenter-desktops/ta.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "விரைவ�த�வக�க வழிகாட�டி."
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE� ஆதரிக�கிறத�"
diff --git a/translations/desktop_files/khelpcenter-desktops/te.po b/translations/desktop_files/khelpcenter-desktops/te.po
index e9d5f6eb2..dd79bbe8f 100644
--- a/translations/desktop_files/khelpcenter-desktops/te.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr ""
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "కెడిఈ కి సహాయంచెయండి"
diff --git a/translations/desktop_files/khelpcenter-desktops/tg.po b/translations/desktop_files/khelpcenter-desktops/tg.po
index 8a1f9e28f..4208d695e 100644
--- a/translations/desktop_files/khelpcenter-desktops/tg.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Роҳнамоии шурӯъ кунӣ"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Пуштибони TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/th.po b/translations/desktop_files/khelpcenter-desktops/th.po
index 2761f268c..2197de851 100644
--- a/translations/desktop_files/khelpcenter-desktops/th.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "คำ�นะนำด่วน"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "�ารสนับสนุน TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/tr.po b/translations/desktop_files/khelpcenter-desktops/tr.po
index 5538a3e32..8d6219a05 100644
--- a/translations/desktop_files/khelpcenter-desktops/tr.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Hızlı Başlama Rehberi"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE'yi Destekleyin"
diff --git a/translations/desktop_files/khelpcenter-desktops/tt.po b/translations/desktop_files/khelpcenter-desktops/tt.po
index c52fc3012..a83f4bc3f 100644
--- a/translations/desktop_files/khelpcenter-desktops/tt.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "Tizcibärü Qullanması"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE Teräge"
diff --git a/translations/desktop_files/khelpcenter-desktops/uk.po b/translations/desktop_files/khelpcenter-desktops/uk.po
index 54d9ad0cf..2308037b9 100644
--- a/translations/desktop_files/khelpcenter-desktops/uk.po
+++ b/translations/desktop_files/khelpcenter-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, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2023-06-05 18:15+0000\n"
+"PO-Revision-Date: 2023-07-04 18:21+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/khelpcenter-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
 #: Help.desktop:10
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "По�ібник дл� швидкого �тарту"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr "Примітки до Випу�ку TDE"
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Підтримка TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/uz.po b/translations/desktop_files/khelpcenter-desktops/uz.po
index bf9f9fda7..b4728c179 100644
--- a/translations/desktop_files/khelpcenter-desktops/uz.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "TDE boʻyicha yoʻlkoʻrsatgich"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE'ni qoʻllab-quvvatlash"
diff --git a/translations/desktop_files/khelpcenter-desktops/uz@cyrillic.po b/translations/desktop_files/khelpcenter-desktops/uz@cyrillic.po
index ab07c231b..09c6b6de7 100644
--- a/translations/desktop_files/khelpcenter-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -163,6 +163,11 @@ msgid "Quickstart Guide"
 msgstr "TDE бўйича йўлкўр�атгич"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "TDE'ни қўллаб-қувватлаш"
diff --git a/translations/desktop_files/khelpcenter-desktops/ven.po b/translations/desktop_files/khelpcenter-desktops/ven.po
index a0d58f7f7..a17f5851c 100644
--- a/translations/desktop_files/khelpcenter-desktops/ven.po
+++ b/translations/desktop_files/khelpcenter-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Tsumbavhulwo ya mathomele au tavhanya"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "U tikedza TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/vi.po b/translations/desktop_files/khelpcenter-desktops/vi.po
index 488eaa9a6..fc8c3e628 100644
--- a/translations/desktop_files/khelpcenter-desktops/vi.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -164,6 +164,11 @@ msgid "Quickstart Guide"
 msgstr "Hướng dẫn nhanh"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Hỗ trợ TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/wa.po b/translations/desktop_files/khelpcenter-desktops/wa.po
index ab76f3341..0249f6d1a 100644
--- a/translations/desktop_files/khelpcenter-desktops/wa.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Guide d' enondaedje al vole"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Sopoirter TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/xh.po b/translations/desktop_files/khelpcenter-desktops/xh.po
index 57ae1f1e3..68e3dc66b 100644
--- a/translations/desktop_files/khelpcenter-desktops/xh.po
+++ b/translations/desktop_files/khelpcenter-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -162,6 +162,11 @@ msgid "Quickstart Guide"
 msgstr "Isikhombisi Sesiqalo esikhawulezayo"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ixhasa i TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/zh_CN.po b/translations/desktop_files/khelpcenter-desktops/zh_CN.po
index ca4149bfa..769e83041 100644
--- a/translations/desktop_files/khelpcenter-desktops/zh_CN.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "速�指�"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "支� TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/zh_TW.po b/translations/desktop_files/khelpcenter-desktops/zh_TW.po
index 2fb8a7468..bf5c5458a 100644
--- a/translations/desktop_files/khelpcenter-desktops/zh_TW.po
+++ b/translations/desktop_files/khelpcenter-desktops/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 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "快速入門指�"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "支� TDE"
diff --git a/translations/desktop_files/khelpcenter-desktops/zu.po b/translations/desktop_files/khelpcenter-desktops/zu.po
index 65d547e54..82a77b51f 100644
--- a/translations/desktop_files/khelpcenter-desktops/zu.po
+++ b/translations/desktop_files/khelpcenter-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 09:37+0200\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"
@@ -165,6 +165,11 @@ msgid "Quickstart Guide"
 msgstr "Umbonisi wokuqala ngokushesha"
 
 #. Name
+#: plugins/releasenotes.desktop:6
+msgid "TDE Release Notes"
+msgstr ""
+
+#. Name
 #: plugins/support.desktop:6
 msgid "Supporting TDE"
 msgstr "Ixhasa i-TDE"
diff --git a/translations/desktop_files/khotkeys-data/af.po b/translations/desktop_files/khotkeys-data/af.po
index a27de8be5..2cddc68cd 100644
--- a/translations/desktop_files/khotkeys-data/af.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ar.po b/translations/desktop_files/khotkeys-data/ar.po
index 0f1b9c3b8..afe4167ab 100644
--- a/translations/desktop_files/khotkeys-data/ar.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/az.po b/translations/desktop_files/khotkeys-data/az.po
index 2cc7f841a..8da8ce780 100644
--- a/translations/desktop_files/khotkeys-data/az.po
+++ b/translations/desktop_files/khotkeys-data/az.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/be.po b/translations/desktop_files/khotkeys-data/be.po
index e97929d99..9c80a76bd 100644
--- a/translations/desktop_files/khotkeys-data/be.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/bg.po b/translations/desktop_files/khotkeys-data/bg.po
index d077d4373..3452240e9 100644
--- a/translations/desktop_files/khotkeys-data/bg.po
+++ b/translations/desktop_files/khotkeys-data/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:20+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/khotkeys-data/bn.po b/translations/desktop_files/khotkeys-data/bn.po
index 28a7d53b1..48268108f 100644
--- a/translations/desktop_files/khotkeys-data/bn.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/br.po b/translations/desktop_files/khotkeys-data/br.po
index 548913530..a278456a9 100644
--- a/translations/desktop_files/khotkeys-data/br.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/bs.po b/translations/desktop_files/khotkeys-data/bs.po
index 74a57aa9a..1c690fb31 100644
--- a/translations/desktop_files/khotkeys-data/bs.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ca.po b/translations/desktop_files/khotkeys-data/ca.po
index 35e84a370..25968326f 100644
--- a/translations/desktop_files/khotkeys-data/ca.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/cs.po b/translations/desktop_files/khotkeys-data/cs.po
index e207a996a..5c9daf06c 100644
--- a/translations/desktop_files/khotkeys-data/cs.po
+++ b/translations/desktop_files/khotkeys-data/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14: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"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2021-12-19 18:06+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/khotkeys-data/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.10\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -35,14 +36,13 @@ msgstr "Okno Konqueroru"
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
-#, fuzzy
 msgid "Konqueror"
-msgstr "Okno Konqueroru"
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
 msgid "Press, move left, release."
-msgstr ""
+msgstr "Stisk, posun doleva, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:37 trinity2b1.khotkeys:242
@@ -55,6 +55,9 @@ msgid ""
 "Opera-style: Press, move up, release.\n"
 "NOTE: Conflicts with 'New Tab', and as such is disabled by default."
 msgstr ""
+"Styl Opera: Stisk, posun nahoru, uvolnění.\n"
+"Poznámka: Je v konfliktu s „Nová karta“ a jako takové je ve výchozím "
+"nastavení zakázáno."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:43
@@ -86,6 +89,8 @@ msgid ""
 "Going up in URL/directory structure.\n"
 "Mozilla-style: Press, move up, move left, move up, release."
 msgstr ""
+"Nahoru ve struktuře URL/adresářů.\n"
+"Styl Mozilla: Stisk, posun nahoru, posun doleva, posun nahoru, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:68 trinity2b1.khotkeys:306
@@ -100,46 +105,50 @@ msgid ""
 "NOTE: Conflicts with  \"Activate Previous Tab\", and as such is disabled by "
 "default."
 msgstr ""
+"Nahoru ve struktuře URL/adresářů.\n"
+"Styl Opera: Stisk, posun nahoru, posun doleva, posun nahoru, uvolnění.\n"
+"Poznámka: Je v konfliktu s „Aktivovat předchozí kartu“ a jako takové je ve "
+"výchozím nastavení zakázáno."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:93
 msgid "Up #2"
-msgstr "Nahoru #2"
+msgstr "Nahoru �.2"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:116
 msgid "Press, move up, move right, release."
-msgstr ""
+msgstr "Stisk, posun nahoru, posun doprava, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:118
 msgid "Activate Next Tab"
-msgstr "Aktivovat další záložku"
+msgstr "Aktivovat následující kartu"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:141
 msgid "Press, move up, move left, release."
-msgstr ""
+msgstr "Stisk, posun nahoru, posun doleva, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:143
 msgid "Activate Previous Tab"
-msgstr "Aktivovat předchozí záložku"
+msgstr "Aktivovat předchozí kartu"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:185
 msgid "Press, move down, move up, move down, release."
-msgstr ""
+msgstr "Stisk, posun dolů, posun nahoru, posun dolů, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:187
 msgid "Duplicate Tab"
-msgstr "Duplikovat záložku"
+msgstr "Duplikovat kartu"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:210
 msgid "Press, move down, move up, release."
-msgstr ""
+msgstr "Stisk, posun dolů, posun nahoru, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:212
@@ -149,7 +158,7 @@ msgstr "Duplikovat okno"
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:235
 msgid "Press, move right, release."
-msgstr ""
+msgstr "Stisk, posun doprava, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:237 trinity2b1.khotkeys:274
@@ -162,6 +171,9 @@ msgid ""
 "Press, move down, move half up, move right, move down, release.\n"
 "(Drawing a lowercase 'h'.)"
 msgstr ""
+"Stisk, posun dolů, posun do půli nahoru, posun doprava, posun dolů, uvolnění."
+"\n"
+"(Kreslení malého „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 ""
+"Stisk, posun doprava, posun dolů, posun doprava, uvolnění.\n"
+"Styl Mozilla: Stisk, posun dolů, posun doprava, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:291
 msgid "Close Tab"
-msgstr "Zavřít záložku"
+msgstr "Zavřít kartu"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:318
@@ -186,16 +200,19 @@ msgid ""
 "Press, move up, release.\n"
 "Conflicts with Opera-style 'Up #2', which is disabled by default."
 msgstr ""
+"Stisk, posun nahoru, uvolnění.\n"
+"Je v konfliktu se stylem Opera „Nahoru �.2“, který je ve výchozím nastavení "
+"zakázaný."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:320
 msgid "New Tab"
-msgstr "Nová záložka"
+msgstr "Nová karta"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:343
 msgid "Press, move down, release."
-msgstr ""
+msgstr "Stisk, posun dolů, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:345
@@ -205,7 +222,7 @@ msgstr "Nové okno"
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:368
 msgid "Press, move up, move down, release."
-msgstr ""
+msgstr "Stisk, posun nahoru, posun dolů, uvolnění."
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:370 trinity2b1.khotkeys:338
@@ -216,6 +233,7 @@ msgstr "Obnovit"
 #: printscreen.khotkeys:5
 msgid "This group contains actions that are set up by default."
 msgstr ""
+"Tato skupina obsahuje �innosti, které jsou sou�ástí výchozího nastavení."
 
 #. Name
 #: printscreen.khotkeys:8
@@ -225,12 +243,12 @@ msgstr "Přednastavené �innosti"
 #. Comment
 #: printscreen.khotkeys:17
 msgid "Launches KSnapShot when PrintScrn is pressed."
-msgstr ""
+msgstr "Spustit KSnapShot při stisku PrintScrn."
 
 #. Name
 #: printscreen.khotkeys:19
 msgid "PrintScreen"
-msgstr ""
+msgstr "Snímek obrazovky"
 
 #. Comment
 #: printscreen.khotkeys:33 printscreen.khotkeys:57 trinity2b1.khotkeys:46
@@ -243,12 +261,12 @@ msgstr "Jednoduchá akce"
 #: printscreen.khotkeys:41
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
-msgstr ""
+msgstr "Spustit KSnapShot v režimu snímku okna při stisku Alt+PrintScrn.\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "Snímek okna"
 
 #. Comment
 #: trinity2b1.khotkeys:5
@@ -256,6 +274,8 @@ 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 ""
+"Tato skupina obsahuje různé příklady demonstrující většinu funkcí KHotkeys. "
+"(Tato skupina a všechny její akce jsou ve výchozím nastavení zakázány.)"
 
 #. Name
 #: trinity2b1.khotkeys:8
@@ -268,6 +288,7 @@ msgid ""
 "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. "
 "Simple."
 msgstr ""
+"Po stisku Ctrl+Alt+I se aktivuje okno KSIRC, pokud existuje. Jednoduché."
 
 #. Name
 #: trinity2b1.khotkeys:18
@@ -282,7 +303,7 @@ msgstr "KSIRC okno"
 #. Comment
 #: trinity2b1.khotkeys:34
 msgid "KSIRC"
-msgstr ""
+msgstr "KSIRC"
 
 #. Comment
 #: trinity2b1.khotkeys:54
@@ -300,16 +321,28 @@ msgid ""
 ": (colon)                                  Shift+;\n"
 "' '  (space)                              Space"
 msgstr ""
+"Po stisku Alt+Ctrl+H bude simulován vstup „Hello“, jako kdybyste jej zadali. "
+"Obzvláště užite�né, pokud jste líní psát věci jako „nepodepsané“. Každý "
+"stisk klávesy na vstupu je oddělen dvojte�kou „:“. Upozorňujeme, že stisk "
+"kláves znamená skute�ně stisk kláves, takže musíte na klávesnici napsat, co "
+"byste skute�ně stiskli. V tabulce níže ukazuje levý sloupec vstup a pravý "
+"sloupec ukazuje, co se má psát.\n"
+"\n"
+"„enter“ (tj. nový řádek)        Enter nebo Return\n"
+"a (tj. malé a)                              A\n"
+"A (tj. velké a)                             Shift+A\n"
+": (dvojte�ka)                              Shift+;\n"
+"„ “ (mezera)                                Mezerník"
 
 #. Name
 #: trinity2b1.khotkeys:56
 msgid "Type 'Hello'"
-msgstr ""
+msgstr "Napsat „Hello“"
 
 #. Comment
 #: trinity2b1.khotkeys:79
 msgid "This action runs Konsole, after pressing Ctrl+Alt+T."
-msgstr ""
+msgstr "Tato akce spustí Konsoli po stisku Ctrl+Alt+T."
 
 #. Name
 #: trinity2b1.khotkeys:81
@@ -337,6 +370,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 ""
+"Nejprve si pře�těte komentář k akci „Napsat ‚Hello‘“.\n"
+"\n"
+"TQt Designer používá Ctrl+F4 k zavírání oken (možná proto, že na MS Windows "
+"se to dělá takto *pokr�it rameny*). Ale Ctrl+F4 v TDE slouží pro přepnutí na "
+"virtuální plochu 4, takže to nefunguje v TQt Designeru. Zároveň, TQt "
+"Designer nepoužívá standardní zkratku TDE Ctrl+W pro zavření okna.\n"
+"\n"
+"Problém ale lze vyřešit přemapováním Ctrl+W na Ctrl+F4, když je aktivním "
+"oknem TQt Designer. Když je TQt Designer aktivní, pokaždé, když stisknete "
+"Ctrl+W, místo toho se do TQt Designeru odešle Ctrl+F4. V jiných aplikacích "
+"bude Ctrl+W samozřejmě nadále fungovat obvyklým způsobem.\n"
+"\n"
+"Nyní musíme specifikovat tři věci: Nová klávesová zkratka pro „Ctrl+W“, nová "
+"akce vstupu klávesnice odesílající Ctrl+F4 a nová podmínka, že aktivním "
+"oknem je TQt Designer.\n"
+"Zdá se, že TQt Designer má vždy název „TQt Designer od Trolltech“, takže "
+"podmínka bude kontrolovat aktivní okno s takovým titulem."
 
 #. Name
 #: trinity2b1.khotkeys:105
@@ -346,7 +396,7 @@ msgstr "Změnit Ctrl+W na Ctrl+F4 v Qt Designeru"
 #. Comment
 #: trinity2b1.khotkeys:123
 msgid "Qt Designer"
-msgstr ""
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
@@ -355,11 +405,14 @@ msgid ""
 "minicli. You can use any kind of DCOP call, just like using the command line "
 "'dcop' tool."
 msgstr ""
+"Stisknutím Alt+Ctrl+W bude provedeno volání DCOP, které zobrazí „minicli“. "
+"Můžete použít jakýkoli druh volání DCOP, stejně jako pomocí nástroje „dcop“ "
+"v příkazovém řádku."
 
 #. Name
 #: trinity2b1.khotkeys:146
 msgid "Perform DCOP call 'kdesktop KDesktopIface popupExecuteCommand()'"
-msgstr "Provést DCOP volání 'kdesktop KDesktopIface popupExecuteCommand()'"
+msgstr "Provést DCOP volání „kdesktop KDesktopIface popupExecuteCommand()“"
 
 #. Comment
 #: trinity2b1.khotkeys:171
@@ -376,6 +429,17 @@ msgid ""
 "(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see "
 "'XMMS_Player')."
 msgstr ""
+"Nejprve si pře�těte komentář k akci „Napsat ‚Hello‘“.\n"
+"\n"
+"Stejně jako akce „Napsat ‚Hello‘“, simuluje i tato akce vstup z klávesnice. "
+"Konkrétně po stisku Ctrl+Alt+B odešle B do XMMS (B v XMMS sko�í na další "
+"skladbu). Je zaškrtnuta volba „Poslat vstup do / Specifické okno“ a je "
+"specifikováno okno s třídou obsahující „XMMS_Player“. To způsobí, že vstup "
+"bude vždy odeslán do tohoto okna. Tímto způsobem můžete ovládat XMMS, i když "
+"je to například na jiné virtuální ploše.\n"
+"\n"
+"(Spusťte „xprop“ a klikněte na okno XMMS a vyhledejte WM_CLASS, abyste "
+"viděli „XMMS_Player“)."
 
 #. Name
 #: trinity2b1.khotkeys:173
@@ -385,7 +449,7 @@ msgstr "Další v XMMS"
 #. Comment
 #: trinity2b1.khotkeys:185
 msgid "XMMS window"
-msgstr "XMMS okno"
+msgstr "Okno XMMS"
 
 #. Comment
 #: trinity2b1.khotkeys:191
@@ -427,6 +491,37 @@ msgid ""
 "are active only if the active window is Konqueror (class contains "
 "'konqueror')."
 msgstr ""
+"Dobře, Konqi v TDE má karty a nyní můžete mít také gesta. Není třeba "
+"používat jiné prohlíže�e >;).\n"
+"\n"
+"Jednoduše stiskněte prostřední tla�ítko myši a za�něte kreslit jedno z gest "
+"a po dokon�ení tla�ítko myši uvolněte. Pokud potřebujete pouze vložit výběr, "
+"to stále funguje, jednoduše prostě klikněte prostředním tla�ítkem myši. (V "
+"globálním nastavení můžete změnit, které tla�ítko chcete používat.)\n"
+"\n"
+"Právě te� jsou k dispozici tato gesta:\n"
+"posun doprava a zpět doleva – vpřed (ALt+šipka vpravo)\n"
+"posun doleva a zpět doprava – zpět (Alt+šipka vlevo)\n"
+"posun nahoru a zpět dolů – nahoru (Alt+šipka nahoru)\n"
+"kruh proti směru hodinových ru�i�ek – znovu na�íst ( F5)\n"
+"(Jakmile zjistíme, které jsou v Opera nebo Mozille, přidáme další a ujistíme "
+"se, že jsou stejné. Nebo pokud to uděláte sami, klidně nám pomozte a pošlete "
+"své khotkeysrc.)\n"
+"\n"
+"Tvary gest (některé dialogy jsou ze KGesture, díky Mike Pilone) lze "
+"jednoduše zadat jejich provedením v konfigura�ním dialogu. Můžete se také "
+"podívat na numerickou klávesnici, která vám pomůže, gesta jsou rozpoznána "
+"jako mřížka polí 3×3, o�íslovaná od 1 do 9.\n"
+"\n"
+"Všimněte si, že ke spuštění akce musíte gesto provést přesně. Z tohoto "
+"důvodu je možné zadat pro akci více gest. Měli byste se pokusit vyvarovat "
+"složitým gestům, při kterých změníte směr pohybu myši vícekrát (tj. udělejte "
+"například 45654 nebo 74123, protože se snadno provádějí, ale například "
+"1236987 může být již docela obtížné).\n"
+"\n"
+"V této skupině jsou definovány podmínky pro všechna gesta. Všechna tato "
+"gesta jsou aktivní, pouze pokud je aktivní okno Konqueror (třída obsahuje "
+"„konqueror“)."
 
 #. Name
 #: trinity2b1.khotkeys:214
@@ -440,6 +535,9 @@ msgid ""
 "http://www.trinitydesktop.org . You may run all kind of commands you can run "
 "in minicli (Alt+F2)."
 msgstr ""
+"Po stisku Win+E (Tux+E) se spustí WWW prohlíže� a otevře se http://www."
+"trinitydesktop.org. Můžete spouštět všechny druhy příkazů, které zle "
+"spouštět v „minicli“ (Alt+F2)."
 
 #. Name
 #: trinity2b1.khotkeys:371
diff --git a/translations/desktop_files/khotkeys-data/csb.po b/translations/desktop_files/khotkeys-data/csb.po
index b40acf289..9cc7cecb2 100644
--- a/translations/desktop_files/khotkeys-data/csb.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/cy.po b/translations/desktop_files/khotkeys-data/cy.po
index 62f2df286..9387f6160 100644
--- a/translations/desktop_files/khotkeys-data/cy.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/da.po b/translations/desktop_files/khotkeys-data/da.po
index 77e2ecda1..0c315d743 100644
--- a/translations/desktop_files/khotkeys-data/da.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/de.po b/translations/desktop_files/khotkeys-data/de.po
index 776e2226f..59103edaf 100644
--- a/translations/desktop_files/khotkeys-data/de.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/el.po b/translations/desktop_files/khotkeys-data/el.po
index 0ee925098..892c1f790 100644
--- a/translations/desktop_files/khotkeys-data/el.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/eo.po b/translations/desktop_files/khotkeys-data/eo.po
index e420d508f..0c6227e2e 100644
--- a/translations/desktop_files/khotkeys-data/eo.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/es.po b/translations/desktop_files/khotkeys-data/es.po
index 492812ac4..7b7b7ec3b 100644
--- a/translations/desktop_files/khotkeys-data/es.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/et.po b/translations/desktop_files/khotkeys-data/et.po
index 762107b48..2304233b4 100644
--- a/translations/desktop_files/khotkeys-data/et.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/eu.po b/translations/desktop_files/khotkeys-data/eu.po
index bf7a3c7dd..5fad8219c 100644
--- a/translations/desktop_files/khotkeys-data/eu.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/fa.po b/translations/desktop_files/khotkeys-data/fa.po
index ac20bd2c0..666d9e826 100644
--- a/translations/desktop_files/khotkeys-data/fa.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/fi.po b/translations/desktop_files/khotkeys-data/fi.po
index 834984944..83e6a9b4c 100644
--- a/translations/desktop_files/khotkeys-data/fi.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/fr.po b/translations/desktop_files/khotkeys-data/fr.po
index 0a02f7565..e05393e0a 100644
--- a/translations/desktop_files/khotkeys-data/fr.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/fy.po b/translations/desktop_files/khotkeys-data/fy.po
index 79cb54789..01c7847d3 100644
--- a/translations/desktop_files/khotkeys-data/fy.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ga.po b/translations/desktop_files/khotkeys-data/ga.po
index 01f7afca3..410e687c2 100644
--- a/translations/desktop_files/khotkeys-data/ga.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/gl.po b/translations/desktop_files/khotkeys-data/gl.po
index 7d60aac6b..264839c48 100644
--- a/translations/desktop_files/khotkeys-data/gl.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/he.po b/translations/desktop_files/khotkeys-data/he.po
index 8f501bc02..305a552f0 100644
--- a/translations/desktop_files/khotkeys-data/he.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/hi.po b/translations/desktop_files/khotkeys-data/hi.po
index f331e84e2..1491a2b08 100644
--- a/translations/desktop_files/khotkeys-data/hi.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/hr.po b/translations/desktop_files/khotkeys-data/hr.po
index 54de0b4a1..680e252a3 100644
--- a/translations/desktop_files/khotkeys-data/hr.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/hu.po b/translations/desktop_files/khotkeys-data/hu.po
index 796b77932..040d31f46 100644
--- a/translations/desktop_files/khotkeys-data/hu.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/id.po b/translations/desktop_files/khotkeys-data/id.po
index e6ad61f3f..b41c3678a 100644
--- a/translations/desktop_files/khotkeys-data/id.po
+++ b/translations/desktop_files/khotkeys-data/id.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/is.po b/translations/desktop_files/khotkeys-data/is.po
index a07a0611a..fab03fd7f 100644
--- a/translations/desktop_files/khotkeys-data/is.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/it.po b/translations/desktop_files/khotkeys-data/it.po
index 25ae0f22f..5c6aadcbe 100644
--- a/translations/desktop_files/khotkeys-data/it.po
+++ b/translations/desktop_files/khotkeys-data/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14: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"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-01-15 09:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-data/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.10.1\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -35,9 +36,8 @@ msgstr "Finestra di Konqueror"
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
-#, fuzzy
 msgid "Konqueror"
-msgstr "Finestra di Konqueror"
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
@@ -180,7 +180,7 @@ msgstr ""
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:262
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:289
@@ -260,15 +260,16 @@ msgstr "Azione_semplice"
 
 #. Comment
 #: printscreen.khotkeys:41
-#, fuzzy
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
-msgstr "Avvia KSnapShot quando viene premuto il tasto Stamp."
+msgstr ""
+"Avvia KSnapShot in modalità di acquisizione della finestra quando si preme "
+"ALT+PrintScrn.\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "Cattura Finestra"
 
 #. Comment
 #: trinity2b1.khotkeys:5
@@ -292,7 +293,7 @@ msgid ""
 "Simple."
 msgstr ""
 "Con la pressione di Ctrl+Alt+I, la finestra di KSIRC sarà attivata, se "
-"esiste. Semplice, no?"
+"esiste. Semplice."
 
 #. Name
 #: trinity2b1.khotkeys:18
@@ -307,7 +308,7 @@ msgstr "Finestra KSIRC"
 #. Comment
 #: trinity2b1.khotkeys:34
 msgid "KSIRC"
-msgstr ""
+msgstr "KSIRC"
 
 #. Comment
 #: trinity2b1.khotkeys:54
@@ -401,7 +402,7 @@ msgstr "Rimappa Ctrl+W su Ctrl+F4 in Qt Designer"
 #. Comment
 #: trinity2b1.khotkeys:123
 msgid "Qt Designer"
-msgstr ""
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
diff --git a/translations/desktop_files/khotkeys-data/ja.po b/translations/desktop_files/khotkeys-data/ja.po
index 60feb275c..9b3fa0b00 100644
--- a/translations/desktop_files/khotkeys-data/ja.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ka.po b/translations/desktop_files/khotkeys-data/ka.po
index 41ed6e233..360f3ad26 100644
--- a/translations/desktop_files/khotkeys-data/ka.po
+++ b/translations/desktop_files/khotkeys-data/ka.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/khotkeys-data.pot b/translations/desktop_files/khotkeys-data/khotkeys-data.pot
index 0839cf36f..2ebf5221e 100644
--- a/translations/desktop_files/khotkeys-data/khotkeys-data.pot
+++ b/translations/desktop_files/khotkeys-data/khotkeys-data.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:20+0200\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"
@@ -27,15 +27,14 @@ msgid "Konqueror Gestures"
 msgstr ""
 
 #. Comment
-#: konqueror_gestures_trinity21.khotkeys:13
-#: trinity2b1.khotkeys:219
+#: konqueror_gestures_trinity21.khotkeys:13 trinity2b1.khotkeys:219
 msgid "Konqueror window"
 msgstr ""
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:20
-#: konqueror_gestures_trinity21.khotkeys:26
-#: trinity2b1.khotkeys:226 trinity2b1.khotkeys:232
+#: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
+#: trinity2b1.khotkeys:232
 msgid "Konqueror"
 msgstr ""
 
@@ -45,8 +44,7 @@ msgid "Press, move left, release."
 msgstr ""
 
 #. Name
-#: konqueror_gestures_trinity21.khotkeys:37
-#: trinity2b1.khotkeys:242
+#: konqueror_gestures_trinity21.khotkeys:37 trinity2b1.khotkeys:242
 msgid "Back"
 msgstr ""
 
@@ -76,9 +74,8 @@ msgstr ""
 #: 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
+#: konqueror_gestures_trinity21.khotkeys:385 trinity2b1.khotkeys:257
+#: trinity2b1.khotkeys:289 trinity2b1.khotkeys:321 trinity2b1.khotkeys:353
 msgid "Gesture_triggers"
 msgstr ""
 
@@ -90,8 +87,7 @@ msgid ""
 msgstr ""
 
 #. Name
-#: konqueror_gestures_trinity21.khotkeys:68
-#: trinity2b1.khotkeys:306
+#: konqueror_gestures_trinity21.khotkeys:68 trinity2b1.khotkeys:306
 msgid "Up"
 msgstr ""
 
@@ -155,8 +151,7 @@ msgid "Press, move right, release."
 msgstr ""
 
 #. Name
-#: konqueror_gestures_trinity21.khotkeys:237
-#: trinity2b1.khotkeys:274
+#: konqueror_gestures_trinity21.khotkeys:237 trinity2b1.khotkeys:274
 msgid "Forward"
 msgstr ""
 
@@ -212,8 +207,7 @@ msgid "Press, move up, move down, release."
 msgstr ""
 
 #. Name
-#: konqueror_gestures_trinity21.khotkeys:370
-#: trinity2b1.khotkeys:338
+#: konqueror_gestures_trinity21.khotkeys:370 trinity2b1.khotkeys:338
 msgid "Reload"
 msgstr ""
 
@@ -238,9 +232,8 @@ msgid "PrintScreen"
 msgstr ""
 
 #. Comment
-#: printscreen.khotkeys:33 printscreen.khotkeys:57
-#: trinity2b1.khotkeys:46 trinity2b1.khotkeys:71
-#: trinity2b1.khotkeys:95 trinity2b1.khotkeys:163
+#: 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 ""
diff --git a/translations/desktop_files/khotkeys-data/kk.po b/translations/desktop_files/khotkeys-data/kk.po
index c91938a97..78dc023a8 100644
--- a/translations/desktop_files/khotkeys-data/kk.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/km.po b/translations/desktop_files/khotkeys-data/km.po
index 354a5bd43..893f644a3 100644
--- a/translations/desktop_files/khotkeys-data/km.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ko.po b/translations/desktop_files/khotkeys-data/ko.po
index 7392e6afc..ddf43a294 100644
--- a/translations/desktop_files/khotkeys-data/ko.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/lo.po b/translations/desktop_files/khotkeys-data/lo.po
index 825685335..7e2814555 100644
--- a/translations/desktop_files/khotkeys-data/lo.po
+++ b/translations/desktop_files/khotkeys-data/lo.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/lt.po b/translations/desktop_files/khotkeys-data/lt.po
index 7df8711a0..4535cb5e8 100644
--- a/translations/desktop_files/khotkeys-data/lt.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/lv.po b/translations/desktop_files/khotkeys-data/lv.po
index b6a508033..3ef3037f0 100644
--- a/translations/desktop_files/khotkeys-data/lv.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/mk.po b/translations/desktop_files/khotkeys-data/mk.po
index 0df6be18a..7fd294f0d 100644
--- a/translations/desktop_files/khotkeys-data/mk.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/mn.po b/translations/desktop_files/khotkeys-data/mn.po
index 998592e23..c28fe5532 100644
--- a/translations/desktop_files/khotkeys-data/mn.po
+++ b/translations/desktop_files/khotkeys-data/mn.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ms.po b/translations/desktop_files/khotkeys-data/ms.po
index c878229a3..abf09a3db 100644
--- a/translations/desktop_files/khotkeys-data/ms.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/mt.po b/translations/desktop_files/khotkeys-data/mt.po
index 6773928c0..bfa28c431 100644
--- a/translations/desktop_files/khotkeys-data/mt.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/nb.po b/translations/desktop_files/khotkeys-data/nb.po
index 6f8afb2f8..711cf09b8 100644
--- a/translations/desktop_files/khotkeys-data/nb.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/nds.po b/translations/desktop_files/khotkeys-data/nds.po
index ba8d5d01f..d41c2072a 100644
--- a/translations/desktop_files/khotkeys-data/nds.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ne.po b/translations/desktop_files/khotkeys-data/ne.po
index 344991f1b..2fcefc75d 100644
--- a/translations/desktop_files/khotkeys-data/ne.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/nl.po b/translations/desktop_files/khotkeys-data/nl.po
index 2620b7b16..b4dc4f0d2 100644
--- a/translations/desktop_files/khotkeys-data/nl.po
+++ b/translations/desktop_files/khotkeys-data/nl.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/nn.po b/translations/desktop_files/khotkeys-data/nn.po
index 401eb943a..02d8a203b 100644
--- a/translations/desktop_files/khotkeys-data/nn.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/nso.po b/translations/desktop_files/khotkeys-data/nso.po
index 054f2f003..c8f98b54f 100644
--- a/translations/desktop_files/khotkeys-data/nso.po
+++ b/translations/desktop_files/khotkeys-data/nso.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/oc.po b/translations/desktop_files/khotkeys-data/oc.po
index 3886d6b5c..a373f52a5 100644
--- a/translations/desktop_files/khotkeys-data/oc.po
+++ b/translations/desktop_files/khotkeys-data/oc.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/pa.po b/translations/desktop_files/khotkeys-data/pa.po
index ff1b2e6c4..2b2d27f09 100644
--- a/translations/desktop_files/khotkeys-data/pa.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/pl.po b/translations/desktop_files/khotkeys-data/pl.po
index 7400183d6..caa7a323b 100644
--- a/translations/desktop_files/khotkeys-data/pl.po
+++ b/translations/desktop_files/khotkeys-data/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14: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"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/khotkeys-data/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.13.1\n"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -35,9 +37,8 @@ msgstr "Okno Konquerora"
 #: konqueror_gestures_trinity21.khotkeys:20
 #: konqueror_gestures_trinity21.khotkeys:26 trinity2b1.khotkeys:226
 #: trinity2b1.khotkeys:232
-#, fuzzy
 msgid "Konqueror"
-msgstr "Okno Konquerora"
+msgstr "Konqueror"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:35
@@ -255,15 +256,16 @@ msgstr "Prosta akcja"
 
 #. Comment
 #: printscreen.khotkeys:41
-#, fuzzy
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
-msgstr "Uruchamia KSnapShot, kiedy naciśnięty jest klawisz PrintScrn."
+msgstr ""
+"Uruchamia KSnapShot w trybie przechwytywania okna po naciśnięciu klawisza "
+"ALT+PrintScrn.\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "Zrzut okna"
 
 #. Comment
 #: trinity2b1.khotkeys:5
@@ -302,7 +304,7 @@ msgstr "Okno KSIRC"
 #. Comment
 #: trinity2b1.khotkeys:34
 msgid "KSIRC"
-msgstr ""
+msgstr "KSIRC"
 
 #. Comment
 #: trinity2b1.khotkeys:54
@@ -398,7 +400,7 @@ msgstr "Podmiana Ctrl+W na Ctrl+F4 w Qt Designerze"
 #. Comment
 #: trinity2b1.khotkeys:123
 msgid "Qt Designer"
-msgstr ""
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
diff --git a/translations/desktop_files/khotkeys-data/pt.po b/translations/desktop_files/khotkeys-data/pt.po
index 2bdb46fca..d87ee5c7a 100644
--- a/translations/desktop_files/khotkeys-data/pt.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/pt_BR.po b/translations/desktop_files/khotkeys-data/pt_BR.po
index 5930e16a6..2dff08c0b 100644
--- a/translations/desktop_files/khotkeys-data/pt_BR.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ro.po b/translations/desktop_files/khotkeys-data/ro.po
index 4595e9acd..107d3a524 100644
--- a/translations/desktop_files/khotkeys-data/ro.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ru.po b/translations/desktop_files/khotkeys-data/ru.po
index 14f24c9ba..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: 2020-06-19 14: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"
+"POT-Creation-Date: 2021-07-07 18:17+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/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-data/rw.po b/translations/desktop_files/khotkeys-data/rw.po
index 89599b0eb..ea68d661f 100644
--- a/translations/desktop_files/khotkeys-data/rw.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/se.po b/translations/desktop_files/khotkeys-data/se.po
index f53a0550a..6fa626a1b 100644
--- a/translations/desktop_files/khotkeys-data/se.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/sk.po b/translations/desktop_files/khotkeys-data/sk.po
index 4e43dd007..cf7ccf508 100644
--- a/translations/desktop_files/khotkeys-data/sk.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/sl.po b/translations/desktop_files/khotkeys-data/sl.po
index 7fbac30d2..e858d8afc 100644
--- a/translations/desktop_files/khotkeys-data/sl.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/sr.po b/translations/desktop_files/khotkeys-data/sr.po
index e74338711..bde0097b2 100644
--- a/translations/desktop_files/khotkeys-data/sr.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/sr@Latn.po b/translations/desktop_files/khotkeys-data/sr@Latn.po
index 70af019a2..2c5d14471 100644
--- a/translations/desktop_files/khotkeys-data/sr@Latn.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ss.po b/translations/desktop_files/khotkeys-data/ss.po
index 57b6bf45c..961db13f6 100644
--- a/translations/desktop_files/khotkeys-data/ss.po
+++ b/translations/desktop_files/khotkeys-data/ss.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/sv.po b/translations/desktop_files/khotkeys-data/sv.po
index faf110242..eb65daca9 100644
--- a/translations/desktop_files/khotkeys-data/sv.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ta.po b/translations/desktop_files/khotkeys-data/ta.po
index 12016e110..87f21af5f 100644
--- a/translations/desktop_files/khotkeys-data/ta.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/te.po b/translations/desktop_files/khotkeys-data/te.po
index d4cfd67d4..119948212 100644
--- a/translations/desktop_files/khotkeys-data/te.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/tg.po b/translations/desktop_files/khotkeys-data/tg.po
index b879a17ed..16e7fb0c0 100644
--- a/translations/desktop_files/khotkeys-data/tg.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/th.po b/translations/desktop_files/khotkeys-data/th.po
index a1f860a8b..82b75242b 100644
--- a/translations/desktop_files/khotkeys-data/th.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/tr.po b/translations/desktop_files/khotkeys-data/tr.po
index b30f5c5a5..ab926a68a 100644
--- a/translations/desktop_files/khotkeys-data/tr.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/tt.po b/translations/desktop_files/khotkeys-data/tt.po
index 2a79ac85f..802272be4 100644
--- a/translations/desktop_files/khotkeys-data/tt.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/uk.po b/translations/desktop_files/khotkeys-data/uk.po
index dc49f4dde..578cee18d 100644
--- a/translations/desktop_files/khotkeys-data/uk.po
+++ b/translations/desktop_files/khotkeys-data/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14:20+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/khotkeys-data/uz.po b/translations/desktop_files/khotkeys-data/uz.po
index 5b15df28b..6467299a6 100644
--- a/translations/desktop_files/khotkeys-data/uz.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/uz@cyrillic.po b/translations/desktop_files/khotkeys-data/uz@cyrillic.po
index 2caf4b38c..5bb11ab2c 100644
--- a/translations/desktop_files/khotkeys-data/uz@cyrillic.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/ven.po b/translations/desktop_files/khotkeys-data/ven.po
index dfef4fbb0..c24c4560a 100644
--- a/translations/desktop_files/khotkeys-data/ven.po
+++ b/translations/desktop_files/khotkeys-data/ven.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/vi.po b/translations/desktop_files/khotkeys-data/vi.po
index 138752d67..947e5d8f4 100644
--- a/translations/desktop_files/khotkeys-data/vi.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/wa.po b/translations/desktop_files/khotkeys-data/wa.po
index c85d4b44a..e836b82fd 100644
--- a/translations/desktop_files/khotkeys-data/wa.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/xh.po b/translations/desktop_files/khotkeys-data/xh.po
index e0e26abde..96100a2c8 100644
--- a/translations/desktop_files/khotkeys-data/xh.po
+++ b/translations/desktop_files/khotkeys-data/xh.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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/zh_CN.po b/translations/desktop_files/khotkeys-data/zh_CN.po
index fb849f03a..31cc495ae 100644
--- a/translations/desktop_files/khotkeys-data/zh_CN.po
+++ b/translations/desktop_files/khotkeys-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
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-19 14: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"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2023-08-02 17:16+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/khotkeys-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"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:5
@@ -35,14 +36,13 @@ 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
 msgid "Press, move left, release."
-msgstr ""
+msgstr "按下，�左移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:37 trinity2b1.khotkeys:242
@@ -55,11 +55,13 @@ msgid ""
 "Opera-style: Press, move up, release.\n"
 "NOTE: Conflicts with 'New Tab', and as such is disabled by default."
 msgstr ""
+"Opera-style：按下，�上移动，释放。\n"
+"注�：与“新标签�冲�，因此被默认为�用。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:43
 msgid "Stop Loading"
-msgstr ""
+msgstr "�止加载"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:58
@@ -86,6 +88,8 @@ msgid ""
 "Going up in URL/directory structure.\n"
 "Mozilla-style: Press, move up, move left, move up, release."
 msgstr ""
+"�览 URL 或目录的上一级。\n"
+"Mozilla-style：按下，�上移动，�左移动，�上移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:68 trinity2b1.khotkeys:306
@@ -100,57 +104,59 @@ msgid ""
 "NOTE: Conflicts with  \"Activate Previous Tab\", and as such is disabled by "
 "default."
 msgstr ""
+"�览 URL 或目录的上一级。\n"
+"Opera-style：按下，�上移动，�左移动，�上移动，释放。\n"
+"注�：与“激活上一个标签页�冲�，因此被默认为�用。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:93
 msgid "Up #2"
-msgstr ""
+msgstr "Up #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
@@ -163,11 +169,13 @@ 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
 msgid "Home"
-msgstr "主文件夹"
+msgstr "首页"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:289
@@ -175,11 +183,13 @@ msgid ""
 "Press, move right, move down, move right, release.\n"
 "Mozilla-style: Press, move down, move right, release."
 msgstr ""
+"按下，��移动，�下移动，��移动，释放。\n"
+"Mozilla-style：按下，�下移动，��移动，释放。"
 
 #. Name
 #: konqueror_gestures_trinity21.khotkeys:291
 msgid "Close Tab"
-msgstr ""
+msgstr "关闭标签页"
 
 #. Comment
 #: konqueror_gestures_trinity21.khotkeys:318
@@ -187,16 +197,18 @@ msgid ""
 "Press, move up, release.\n"
 "Conflicts with Opera-style 'Up #2', which is disabled by default."
 msgstr ""
+"按下，�上移动，释放。\n"
+"与 Opera-style 的“Up #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
@@ -206,84 +218,85 @@ 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 "按下 PrintScrn 键时�动 KSnapShot。"
 
 #. Name
 #: printscreen.khotkeys:19
 msgid "PrintScreen"
-msgstr ""
+msgstr "截图行为"
 
 #. 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 "简��作"
 
 #. Comment
 #: printscreen.khotkeys:41
 msgid ""
 "Launches KSnapShot in window capture mode when ALT+PrintScrn is pressed.\n"
-msgstr ""
+msgstr "当按下 ALT+PrintScrn 组�键时，KSnapShot 将会在窗���模�下被�动。\n"
 
 #. Name
 #: printscreen.khotkeys:43
 msgid "PrintWindow"
-msgstr ""
+msgstr "窗�截图行为"
 
 #. 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 ""
+msgstr "该群组包�了丰富的针对大部分 KHotkeys "
+"特性的实例演示（请注�，该群组�其所包�的所有�作都被默认为�用）。"
 
 #. Name
 #: trinity2b1.khotkeys:8
 msgid "Examples"
-msgstr ""
+msgstr "实例"
 
 #. Comment
 #: trinity2b1.khotkeys:16
 msgid ""
 "After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. "
 "Simple."
-msgstr ""
+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
@@ -301,21 +314,32 @@ msgid ""
 ": (colon)                                  Shift+;\n"
 "' '  (space)                              Space"
 msgstr ""
+"按下 Alt+Ctrl+H 组�键时，“Hello�就会�是您亲自敲键盘一样地被模拟并输入。当您"
+"懒得亲自键入“unsigned�这样的字符串的时候，这招就特别管用。输入的�个按键 "
+"(keypresses) 都由冒�“:�隔开。请注�，按键 (keypresses) 是指在键盘上真实地敲"
+"击，所以您必须写入你在键盘上真正按下的键。在下�的表格中，左�显示了将�被模"
+"拟的输入，��则显示了对应左侧输入的所�执行的（组�）键。\n"
+"\n"
+"“回车�（�新的一行）\t\t\tEnter 或 Return\n"
+"a（�写字�a）\t\t\tA\n"
+"A（大写字�A）\t\t\tShift+A\n"
+":（英文冒�）\t\t\tShift+;\n"
+"“ �（空格）\t\t\tSpace"
 
 #. 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 组�键时，�行 Konsole。"
 
 #. Name
 #: trinity2b1.khotkeys:81
 msgid "Run Konsole"
-msgstr ""
+msgstr "�行 Konsole"
 
 #. Comment
 #: trinity2b1.khotkeys:103
@@ -338,16 +362,34 @@ 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 ""
+"首先请阅读关于“键入‘Hello’��作的注释。\n"
+"\n"
+"Qt Designer 使用 Ctrl+F4 组�键�关闭窗�（也许是因为 MS Windows 也这样�）。"
+"但是 Ctrl+F4 组�键在 TDE 中代表进入虚拟桌� 4，所以该�作（进入虚拟桌� 4）"
+"在 Qt Designer 中�起作用。而且，Qt Designer 也�使用 TDE 的标准�作（� "
+"Ctrl+W）�关闭窗�。\n"
+"\n"
+"但这个问题�以通过在活动窗�为 Qt Designer 时，将 Ctrl+W 组�键�设为 Ctrl+"
+"F4 �解决。当 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 "Qt 设计器"
+msgstr "Qt Designer"
 
 #. Comment
 #: trinity2b1.khotkeys:144
@@ -356,11 +398,13 @@ 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 ""
+msgstr "执行 DCOP 以调用“kdesktop KDesktopIface popupExecuteCommand()�"
 
 #. Comment
 #: trinity2b1.khotkeys:171
@@ -377,21 +421,30 @@ msgid ""
 "(Run 'xprop' and click on the XMMS window and search for WM_CLASS to see "
 "'XMMS_Player')."
 msgstr ""
+"首先请阅读关于“键入‘Hello’��作的注释。\n"
+"\n"
+"如�“键入‘Hello’��作一样，该�作模拟了键盘输入，具体�说，在按下 Ctrl+Alt+B "
+"组�键时，它将模拟键盘输入 B 并��到 XMMS （在 XMMS 中，B �味�跳到下一首歌"
+"曲）。选中“��到特定窗���选框，并指定一个包�“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
@@ -428,6 +481,32 @@ msgid ""
 "are active only if the active window is Konqueror (class contains "
 "'konqueror')."
 msgstr ""
+"好了，TDE 中的 Konqi 有了标签页功能，您现在也�以使用手势�作啦，"
+"�需��去使用其他�览器了� （��抹泪）。\n"
+"\n"
+"�需按下鼠标中键，然�开始绘制众多手势中的任�一�，当您完��，释放鼠标中键"
+"。如果您�想进行手势�作，�是想粘贴选区，那么请点击鼠标中键（您也�以在全局"
+"设置中改��使用的特定鼠标按钮）。\n"
+"\n"
+"目�为止，有以下手势�作�用：\n"
+"��和�左�移动 - �进 (ALt+Right)\n"
+"�左和��移动 - �退 (Alt+Left)\n"
+"�上和�下移动 - �上 (Alt+Up)\n"
+"逆时针转圈 - �新加载 (F5)。\n"
+"（一旦我�现哪些手势是 Opera 或 Mozilla 中存在而我们缺失的，我将尽快补充，并"
+"会确�它们是相�的。或者您也�以自己动手，欢迎帮助我，并将您的 khotkeysrc "
+"�给我。）\n"
+"手势形状�以简�地通过在�置对�框（有些对�框�自 KGesture，感谢 Mike "
+"Pilone）中执行它们而输入。您也�以看一眼您的数字键盘�辅助您�解，"
+"手势的识别就�一个编�为从 1 到 9 的 3x3 网格区域。\n"
+"\n"
+"请注�，您必须通过准确地执行手势�触��作。也正因为如此，�有�能为指定的�"
+"作输入更多的手势。您也应该尽�����的手势，�多次改�鼠标移动的方�（例如"
+"，� 1236987 这类手势�能已�相当困难，建议设置� 45654 或 74123 "
+"这类手势，因为它们执行起�很简�）。\n"
+"\n"
+"所有手势的（触�）�件都已�在该组中定义，�所有手势都�有在活动窗�是 "
+"Konqueror（手势类中包� “konqueror�）时�会生效。"
 
 #. Name
 #: trinity2b1.khotkeys:214
@@ -441,8 +520,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) 组�键时，将�动�览器并打开 http://"
+"www.trinitydesktop.org 网站。您�以�行所有您能够在 minicli (Alt+F2) "
+"中�行的命令。"
 
 #. Name
 #: trinity2b1.khotkeys:371
 msgid "Go to TDE Website"
-msgstr "转到 TDE 网站"
+msgstr "�览 TDE 官方网站"
diff --git a/translations/desktop_files/khotkeys-data/zh_TW.po b/translations/desktop_files/khotkeys-data/zh_TW.po
index b8acff674..ac649a101 100644
--- a/translations/desktop_files/khotkeys-data/zh_TW.po
+++ b/translations/desktop_files/khotkeys-data/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:20+0200\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"
diff --git a/translations/desktop_files/khotkeys-data/zu.po b/translations/desktop_files/khotkeys-data/zu.po
index c0f7325dd..8c5161391 100644
--- a/translations/desktop_files/khotkeys-data/zu.po
+++ b/translations/desktop_files/khotkeys-data/zu.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:20+0200\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"
diff --git a/translations/desktop_files/kicker-desktops/cs.po b/translations/desktop_files/kicker-desktops/cs.po
index bb6fd1fdf..b96c05025 100644
--- a/translations/desktop_files/kicker-desktops/cs.po
+++ b/translations/desktop_files/kicker-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kicker-desktop-files/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.2.2\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -44,7 +45,7 @@ msgstr "Tla�ítka odhlášení/uzam�ení"
 #. Comment
 #: applets/lockout/lockout.desktop:5
 msgid "Adds buttons for locking screen and session logout"
-msgstr "Přidá tla�ítka pro uzam�ení obrazovky a odhlášení z relace"
+msgstr "Přidá tla�ítka pro uzam�ení obrazovky a odhlášení ze sezení"
 
 #. Name
 #: applets/media/mediaapplet.desktop:3
@@ -154,7 +155,7 @@ msgstr "Kasbar"
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
 msgid "An alternative taskbar panel applet."
-msgstr "Applet s alternativním pruhem úloh"
+msgstr "Applet s alternativním pruhem úloh."
 
 #. Name
 #: extensions/sidebar/sidebarextension.desktop:2
@@ -164,7 +165,7 @@ msgstr "Univerzální postranní lišta"
 #. Comment
 #: extensions/sidebar/sidebarextension.desktop:4
 msgid "Wrapper around Konqueror's navigation panel"
-msgstr ""
+msgstr "Obal kolem naviga�ního panelu Konqueroru"
 
 #. Name
 #: extensions/taskbar/taskbarextension.desktop:2
@@ -204,7 +205,7 @@ msgstr "Zobrazit plochu"
 #. Comment
 #: kicker/buttons/desktop.desktop:4
 msgid "A button that gives quick access to the desktop when pressed"
-msgstr "Tla�ítko s rychlým přístupem k pracovní ploše"
+msgstr "Tla�ítko poskytující rychlý přístup k pracovní ploše"
 
 #. Name
 #: kicker/buttons/exec.desktop:2
@@ -239,7 +240,7 @@ msgstr "Nabídka se seznamem otevřených oken"
 #. Name
 #: kicker/core/childpanelextension.desktop:2
 msgid "Panel"
-msgstr ""
+msgstr "Panel"
 
 #. Comment
 #: kicker/core/childpanelextension.desktop:4
@@ -249,7 +250,7 @@ msgstr "Rozšíření závislého panelu."
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Vyhledávací modul pro Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -284,12 +285,12 @@ msgstr "Vyhledávání na webu"
 #. Name
 #: menuext/kate/katesessionmenu.desktop:2
 msgid "Kate Session Menu"
-msgstr "Nabídka relace Kate"
+msgstr "Nabídka sezení Kate"
 
 #. Comment
 #: menuext/kate/katesessionmenu.desktop:4
 msgid "Allows you to open Kate with a specified session, or create a new one"
-msgstr "Umožňuje otevřít Kate s ur�itou relací nebo si vytvořit novou"
+msgstr "Umožňuje otevřít Kate s ur�itým sezením nebo si vytvořit nové"
 
 #. Name
 #: menuext/konq-profiles/konquerormenu.desktop:2
@@ -304,12 +305,12 @@ msgstr "Přístup k profilům Konqueroru"
 #. Name
 #: menuext/konsole/konsolemenu.desktop:2
 msgid "Terminal Sessions"
-msgstr "Terminálové relace"
+msgstr "Terminálová sezení"
 
 #. Comment
 #: menuext/konsole/konsolemenu.desktop:4
 msgid "Menu for starting a terminal emulator with a session or bookmark"
-msgstr "Nabídka pro spuštění teminálu s relací nebo záložkou"
+msgstr "Nabídka pro spuštění terminálu se sezením nebo záložkou"
 
 #. Name
 #: menuext/prefmenu/prefmenu.desktop:2
@@ -319,7 +320,7 @@ msgstr "Ovládací centrum"
 #. Comment
 #: menuext/prefmenu/prefmenu.desktop:4
 msgid "Trinity Control Center modules menu"
-msgstr "Nabídka modulů Ovládacího centra"
+msgstr "Nabídka modulů Ovládacího centra Trinity"
 
 #. Name
 #: menuext/recentdocs/recentdocs.desktop:2
@@ -364,7 +365,7 @@ msgstr "Nabídka tiskového systému"
 #. 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/el.po b/translations/desktop_files/kicker-desktops/el.po
index 0e7454a98..142182300 100644
--- a/translations/desktop_files/kicker-desktops/el.po
+++ b/translations/desktop_files/kicker-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>, 2022.
 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: 2022-09-18 17:59+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kicker-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.13.1\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -155,7 +156,7 @@ msgstr "Επέκταση γÏ�αμμής Ï€Ï�οσαÏ�τημένων εφαÏ�μοÎ
 #. Name
 #: extensions/kasbar/kasbarextension.desktop:2
 msgid "KasBar"
-msgstr ""
+msgstr "KasBar"
 
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
@@ -256,7 +257,7 @@ msgstr "Επέκταση θυγατ�ικο� πίνακα."
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Ένα π�όσθετο αναζήτησης για το Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -375,7 +376,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/it.po b/translations/desktop_files/kicker-desktops/it.po
index c4650f49c..654cf46a1 100644
--- a/translations/desktop_files/kicker-desktops/it.po
+++ b/translations/desktop_files/kicker-desktops/it.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Leandro Nini <drfiemost@email.it>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-01-16 15:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kicker-desktop-files/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.10.1\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -58,9 +60,8 @@ msgstr "Accesso diretto ai dispositivi di archiviazione"
 
 #. Name
 #: applets/menu/menuapplet.desktop:4
-#, fuzzy
 msgid "Menu"
-msgstr "Menu TDE"
+msgstr "Menù"
 
 #. Comment
 #: applets/menu/menuapplet.desktop:6
@@ -155,7 +156,7 @@ msgstr "Kasbar"
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
 msgid "An alternative taskbar panel applet."
-msgstr "Applet alternativa per la barra delle applicazioni"
+msgstr "Applet alternativa per la barra delle applicazioni."
 
 #. Name
 #: extensions/sidebar/sidebarextension.desktop:2
@@ -245,12 +246,12 @@ msgstr "Pannello"
 #. Comment
 #: kicker/core/childpanelextension.desktop:4
 msgid "Child panel extension."
-msgstr "Estensione del pannello"
+msgstr "Estensione del pannello."
 
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Un plugin di ricerca per Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -367,7 +368,7 @@ msgstr "Menu del sistema di stampa"
 #. 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/pl.po b/translations/desktop_files/kicker-desktops/pl.po
index f9c4e2c41..e6b128a75 100644
--- a/translations/desktop_files/kicker-desktops/pl.po
+++ b/translations/desktop_files/kicker-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kicker-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.1.1\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -58,9 +60,8 @@ msgstr "Bezpośredni dostęp do Twoich urządzeń przechowywania danych"
 
 #. Name
 #: applets/menu/menuapplet.desktop:4
-#, fuzzy
 msgid "Menu"
-msgstr "Menu TDE"
+msgstr "Menu"
 
 #. Comment
 #: applets/menu/menuapplet.desktop:6
@@ -241,7 +242,7 @@ msgstr "Menu pokazujÄ…ce wszystkie otwarte okna"
 #. Name
 #: kicker/core/childpanelextension.desktop:2
 msgid "Panel"
-msgstr ""
+msgstr "Panel"
 
 #. Comment
 #: kicker/core/childpanelextension.desktop:4
@@ -251,7 +252,7 @@ msgstr "Rozszerzenie panelu potomnego."
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Plugin wyszukiwania dla Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -366,7 +367,7 @@ msgstr "Menu systemu drukowania"
 #. 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..654456e63 100644
--- a/translations/desktop_files/kicker-desktops/ru.po
+++ b/translations/desktop_files/kicker-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-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-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/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.17\n"
 
 #. Name
 #: applets/clock/clockapplet.desktop:4
@@ -153,7 +155,7 @@ msgstr "Ра�ширение панели дл� в�траивани� прил
 #. Name
 #: extensions/kasbar/kasbarextension.desktop:2
 msgid "KasBar"
-msgstr ""
+msgstr "KasBar"
 
 #. Comment
 #: extensions/kasbar/kasbarextension.desktop:4
@@ -253,7 +255,7 @@ msgstr "Ра�ширение дочерней панели"
 #. Comment
 #: kicker/interfaces/kickoffsearchplugin.desktop:5
 msgid "A search plugin for Kickoff"
-msgstr ""
+msgstr "Модуль пои�ка дл� Kickoff"
 
 #. Name
 #: kicker/kcmkicker.desktop:10
@@ -368,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/zh_CN.po b/translations/desktop_files/kicker-desktops/zh_CN.po
index 3ffe2bccb..14025f28a 100644
--- a/translations/desktop_files/kicker-desktops/zh_CN.po
+++ b/translations/desktop_files/kicker-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
+# Wantao Liu <vantao@aosc.io>, 2023.
 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: 2023-09-21 11:39+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/kicker-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
 #: applets/clock/clockapplet.desktop:4
@@ -24,7 +25,7 @@ msgstr "时钟"
 #. Comment
 #: applets/clock/clockapplet.desktop:6
 msgid "An analog and digital clock"
-msgstr "模拟和数字时钟���程�"
+msgstr "在主��上显示模拟或数�管等样�的自定义时钟��"
 
 #. Name
 #: applets/launcher/quicklauncher.desktop:3
@@ -34,7 +35,7 @@ msgstr "快速�动"
 #. Comment
 #: applets/launcher/quicklauncher.desktop:5
 msgid "Directly access your frequently used applications"
-msgstr "直接访问您最�常使用的应用程�"
+msgstr "轻�访问您最常用的应用程�"
 
 #. Name
 #: applets/lockout/lockout.desktop:3
@@ -54,7 +55,7 @@ msgstr "存储介质"
 #. Comment
 #: applets/media/mediaapplet.desktop:5
 msgid "Directly access your storage media"
-msgstr "直接访问您的存储介质"
+msgstr "轻�访问存储介质"
 
 #. Name
 #: applets/menu/menuapplet.desktop:4
@@ -69,22 +70,22 @@ msgstr "嵌入独立���的�程�"
 #. Name
 #: applets/minipager/minipagerapplet.desktop:4
 msgid "Desktop Preview & Pager"
-msgstr "桌�预览器和页�切�器"
+msgstr "虚拟桌�预览与切�器"
 
 #. Comment
 #: applets/minipager/minipagerapplet.desktop:6
 msgid "Preview, manage and switch to multiple virtual desktops"
-msgstr "预览�管��切�多个虚拟桌�"
+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 时间的进程"
+msgstr "监测并终止消耗过多 CPU 时间的失控进程"
 
 #. Name
 #: applets/run/runapplet.desktop:3
@@ -94,7 +95,7 @@ msgstr "�行命令"
 #. Comment
 #: applets/run/runapplet.desktop:5
 msgid "Launch single commands without a terminal window"
-msgstr "调用��命令而无须使用终端窗�"
+msgstr "无需终端窗���执行�个命令"
 
 #. Name
 #: applets/swallow/swallowapplet.desktop:3
@@ -119,12 +120,12 @@ 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
@@ -134,27 +135,27 @@ 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
 msgid "Dock Application Bar"
-msgstr "��应用程��"
+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
@@ -164,22 +165,22 @@ msgstr "通用侧边�"
 #. Comment
 #: extensions/sidebar/sidebarextension.desktop:4
 msgid "Wrapper around Konqueror's navigation panel"
-msgstr "Konqueror 导航��的转�器"
+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
 msgid "Bookmarks Menu"
-msgstr "书签��"
+msgstr "书签"
 
 #. Comment
 #: kicker/buttons/bookmarks.desktop:4
@@ -189,12 +190,12 @@ msgstr "您的 Konqueror 书签"
 #. Name
 #: kicker/buttons/browser.desktop:2
 msgid "Quick File Browser"
-msgstr "快速文件�览器"
+msgstr "快�文件�览器"
 
 #. Comment
 #: kicker/buttons/browser.desktop:4
 msgid "A menu that lists files in a given folder"
-msgstr "列出给定文件夹中文件的��"
+msgstr "列出指定文件夹中文件的��"
 
 #. Name
 #: kicker/buttons/desktop.desktop:2
@@ -204,7 +205,7 @@ msgstr "显示桌�"
 #. Comment
 #: kicker/buttons/desktop.desktop:4
 msgid "A button that gives quick access to the desktop when pressed"
-msgstr "按下�快速访问桌�的按钮"
+msgstr "添加快速访问桌�的按钮"
 
 #. Name
 #: kicker/buttons/exec.desktop:2
@@ -214,7 +215,7 @@ msgstr "� TDE 应用程��动器"
 #. Comment
 #: kicker/buttons/exec.desktop:4
 msgid "A launcher for programs not in the TDE Menu"
-msgstr "�动�在 TDE ��中的程�"
+msgstr "为� TDE 应用程�制作个性化�动按钮"
 
 #. Name
 #: kicker/buttons/kmenu.desktop:2
@@ -224,7 +225,7 @@ msgstr "TDE ��"
 #. Comment
 #: kicker/buttons/kmenu.desktop:4
 msgid "Applications and common actions"
-msgstr "应用程�和公共�作"
+msgstr "应用程�和常用�作"
 
 #. Name
 #: kicker/buttons/windowlist.desktop:2
@@ -234,7 +235,7 @@ msgstr "窗�列表��"
 #. Comment
 #: kicker/buttons/windowlist.desktop:4
 msgid "A menu that lists all open windows"
-msgstr "列出打开的全部窗�的��"
+msgstr "列出全部已打开窗�的��"
 
 #. Name
 #: kicker/core/childpanelextension.desktop:2
@@ -244,12 +245,12 @@ 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
@@ -269,7 +270,7 @@ msgstr "查找"
 #. Comment
 #: menuext/find/find.desktop:4
 msgid "Menu for starting a file or web search"
-msgstr "�动文件或 Web �索的��"
+msgstr "�动文件/Web�索的��"
 
 #. Name
 #: menuext/find/kfind.desktop:11
@@ -289,7 +290,7 @@ msgstr "Kate 会���"
 #. Comment
 #: menuext/kate/katesessionmenu.desktop:4
 msgid "Allows you to open Kate with a specified session, or create a new one"
-msgstr "�许您用指定会�打开 Kate，或创建新会�"
+msgstr "�许您用指定会�或创建新会�以打开 Kate"
 
 #. Name
 #: menuext/konq-profiles/konquerormenu.desktop:2
@@ -314,12 +315,12 @@ msgstr "以会�或书签�动终端模拟器的��"
 #. Name
 #: menuext/prefmenu/prefmenu.desktop:2
 msgid "Trinity Control Center"
-msgstr "控制中心"
+msgstr "Trinity 控制中心"
 
 #. Comment
 #: menuext/prefmenu/prefmenu.desktop:4
 msgid "Trinity Control Center modules menu"
-msgstr "控制中心模���"
+msgstr "Trinity 控制中心模���"
 
 #. Name
 #: menuext/recentdocs/recentdocs.desktop:2
@@ -329,7 +330,7 @@ msgstr "最近文档"
 #. Comment
 #: menuext/recentdocs/recentdocs.desktop:4
 msgid "Menu of documents you have used recently"
-msgstr "您最近使用过的文档的��"
+msgstr "您最近使用过的文档列表"
 
 #. Name
 #: menuext/remote/remotemenu.desktop:2
@@ -349,7 +350,7 @@ msgstr "系统��"
 #. Comment
 #: menuext/system/systemmenu.desktop:4
 msgid "Menu of important system places"
-msgstr "��系统�置的��"
+msgstr "��系统�置��"
 
 #. Name
 #: menuext/tdeprint/printmenu.desktop:2
@@ -364,9 +365,9 @@ msgstr "打�系统��"
 #. Name
 #: menuext/tom/tom.desktop:2
 msgid "TOM"
-msgstr "任务��"
+msgstr "任务导���"
 
 #. Comment
 #: menuext/tom/tom.desktop:4
 msgid "A task oriented menu system"
-msgstr "��任务的��系统"
+msgstr "任务导�的��系统"
diff --git a/translations/desktop_files/klipper-desktops/af.po b/translations/desktop_files/klipper-desktops/af.po
index d091ef924..d70e370f5 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ar.po b/translations/desktop_files/klipper-desktops/ar.po
index 0d10365dc..98faf7a63 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/az.po b/translations/desktop_files/klipper-desktops/az.po
index 63f8a3659..57bd96fed 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/be.po b/translations/desktop_files/klipper-desktops/be.po
index 18bf2c0de..acafcf5ad 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/bg.po b/translations/desktop_files/klipper-desktops/bg.po
index 9b1dc0be0..196ba654d 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/bn.po b/translations/desktop_files/klipper-desktops/bn.po
index 5179c37b9..a8f62934e 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/br.po b/translations/desktop_files/klipper-desktops/br.po
index c416a35c9..bb09950a9 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/bs.po b/translations/desktop_files/klipper-desktops/bs.po
index b4721667f..e174973c3 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ca.po b/translations/desktop_files/klipper-desktops/ca.po
index f48e6bd69..597fed9cf 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/cs.po b/translations/desktop_files/klipper-desktops/cs.po
index 6fb13d176..e581563a1 100644
--- a/translations/desktop_files/klipper-desktops/cs.po
+++ b/translations/desktop_files/klipper-desktops/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 14:45+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2020-09-24 00:40+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"
 "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.2.2\n"
 
 #. Name
 #: klipper.desktop:2
 msgid "Klipper"
-msgstr ""
+msgstr "Klipper"
 
 #. GenericName
 #: klipper.desktop:4
@@ -115,12 +116,12 @@ msgstr "Posl&at soubor"
 #. Description
 #: klipperrc.desktop:96
 msgid "Gopher URL"
-msgstr ""
+msgstr "URL pro gopher"
 
 #. Description
 #: klipperrc.desktop:111
 msgid "ftp URL"
-msgstr "FTP URL"
+msgstr "URL pro ftp"
 
 #. Description
 #: klipperrc.desktop:121
diff --git a/translations/desktop_files/klipper-desktops/csb.po b/translations/desktop_files/klipper-desktops/csb.po
index 400fbdcb7..64f6f0818 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/cy.po b/translations/desktop_files/klipper-desktops/cy.po
index 8a809b08a..89181d71c 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/da.po b/translations/desktop_files/klipper-desktops/da.po
index 4c049fffd..465e8f842 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/de.po b/translations/desktop_files/klipper-desktops/de.po
index 8282b5e33..18a9ebe74 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/el.po b/translations/desktop_files/klipper-desktops/el.po
index e968a701e..05e21550b 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/en_GB.po b/translations/desktop_files/klipper-desktops/en_GB.po
index eaacc79e8..33a67894f 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/eo.po b/translations/desktop_files/klipper-desktops/eo.po
index baf89e37b..168587fd1 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/es.po b/translations/desktop_files/klipper-desktops/es.po
index d4142028c..0fa0f4080 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/et.po b/translations/desktop_files/klipper-desktops/et.po
index 7e222e504..42f41316a 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/eu.po b/translations/desktop_files/klipper-desktops/eu.po
index e2ce9ca6d..5b5d8595b 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/fa.po b/translations/desktop_files/klipper-desktops/fa.po
index 1e88355f3..54d99d18d 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/fi.po b/translations/desktop_files/klipper-desktops/fi.po
index a0362d861..a38f9e058 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/fo.po b/translations/desktop_files/klipper-desktops/fo.po
index 4636ce5b2..24898424a 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/fr.po b/translations/desktop_files/klipper-desktops/fr.po
index 018d114a0..47bda7c0d 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/fy.po b/translations/desktop_files/klipper-desktops/fy.po
index 6a5b9e7df..41d9b98df 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ga.po b/translations/desktop_files/klipper-desktops/ga.po
index 99cafa0a4..66b7900ec 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/gl.po b/translations/desktop_files/klipper-desktops/gl.po
index 3dd482001..7a3787d61 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/he.po b/translations/desktop_files/klipper-desktops/he.po
index 4dac2353a..2722e6bda 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/hi.po b/translations/desktop_files/klipper-desktops/hi.po
index 0376ed23e..5de094a7a 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/hr.po b/translations/desktop_files/klipper-desktops/hr.po
index b3041400f..3054dff6f 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/hu.po b/translations/desktop_files/klipper-desktops/hu.po
index 9e9d06432..ac2ab2685 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/is.po b/translations/desktop_files/klipper-desktops/is.po
index 2b2fc9979..f47bc2909 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/it.po b/translations/desktop_files/klipper-desktops/it.po
index acbb35df3..260f6c027 100644
--- a/translations/desktop_files/klipper-desktops/it.po
+++ b/translations/desktop_files/klipper-desktops/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 14:45+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-01-19 02:00+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"
 "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.10.1\n"
 
 #. Name
 #: klipper.desktop:2
 msgid "Klipper"
-msgstr ""
+msgstr "Klipper"
 
 #. GenericName
 #: klipper.desktop:4
diff --git a/translations/desktop_files/klipper-desktops/ja.po b/translations/desktop_files/klipper-desktops/ja.po
index 91b1d2b26..88b98ae33 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ka.po b/translations/desktop_files/klipper-desktops/ka.po
index 8721da2a1..88107f2ff 100644
--- a/translations/desktop_files/klipper-desktops/ka.po
+++ b/translations/desktop_files/klipper-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/kk.po b/translations/desktop_files/klipper-desktops/kk.po
index 1f295069c..53507838e 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/klipper-desktops.pot b/translations/desktop_files/klipper-desktops/klipper-desktops.pot
index b0963337e..120288cc5 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: 2020-06-21 14:45+0200\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"
@@ -57,8 +57,8 @@ msgid "Open with &Mozilla"
 msgstr ""
 
 #. Description
-#: klipperrc.desktop:35 klipperrc.desktop:86
-#: klipperrc.desktop:101 klipperrc.desktop:131
+#: klipperrc.desktop:35 klipperrc.desktop:86 klipperrc.desktop:101
+#: klipperrc.desktop:131
 msgid "Send &URL"
 msgstr ""
 
@@ -108,8 +108,7 @@ msgid "Local file URL"
 msgstr ""
 
 #. Description
-#: klipperrc.desktop:91 klipperrc.desktop:106
-#: klipperrc.desktop:136
+#: klipperrc.desktop:91 klipperrc.desktop:106 klipperrc.desktop:136
 msgid "Send &File"
 msgstr ""
 
diff --git a/translations/desktop_files/klipper-desktops/km.po b/translations/desktop_files/klipper-desktops/km.po
index c6a3bf76e..d68334286 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ko.po b/translations/desktop_files/klipper-desktops/ko.po
index 7d25828ff..bdd08c4ea 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/lo.po b/translations/desktop_files/klipper-desktops/lo.po
index 4a5dc4bfd..9b33978ab 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/lt.po b/translations/desktop_files/klipper-desktops/lt.po
index 17e178cce..417fc1bce 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/lv.po b/translations/desktop_files/klipper-desktops/lv.po
index 9723bd887..4d1d710b6 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/mk.po b/translations/desktop_files/klipper-desktops/mk.po
index 1683c5c91..cb7d80eaa 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/mn.po b/translations/desktop_files/klipper-desktops/mn.po
index f6f414202..e63a21a34 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ms.po b/translations/desktop_files/klipper-desktops/ms.po
index 239272e58..d0b55c69f 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/mt.po b/translations/desktop_files/klipper-desktops/mt.po
index 4ebc617a1..1c1f4180f 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/nb.po b/translations/desktop_files/klipper-desktops/nb.po
index 72059cf24..85e172647 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/nds.po b/translations/desktop_files/klipper-desktops/nds.po
index 35a7dcf4c..d2b1b1049 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ne.po b/translations/desktop_files/klipper-desktops/ne.po
index 865069d15..92b8c3c89 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/nl.po b/translations/desktop_files/klipper-desktops/nl.po
index 5200484cb..0c32e949e 100644
--- a/translations/desktop_files/klipper-desktops/nl.po
+++ b/translations/desktop_files/klipper-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/nn.po b/translations/desktop_files/klipper-desktops/nn.po
index e9b2471dd..47d97f962 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/nso.po b/translations/desktop_files/klipper-desktops/nso.po
index 8a14a0d85..8a254fbbe 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/pa.po b/translations/desktop_files/klipper-desktops/pa.po
index 22470bf70..6117d520c 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/pl.po b/translations/desktop_files/klipper-desktops/pl.po
index 6adafe299..ea8cbc98e 100644
--- a/translations/desktop_files/klipper-desktops/pl.po
+++ b/translations/desktop_files/klipper-desktops/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/pt.po b/translations/desktop_files/klipper-desktops/pt.po
index eaaee1859..0f91e0702 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/pt_BR.po b/translations/desktop_files/klipper-desktops/pt_BR.po
index a41bef299..8301a3c1f 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ro.po b/translations/desktop_files/klipper-desktops/ro.po
index 28b144d0e..c12f9147e 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ru.po b/translations/desktop_files/klipper-desktops/ru.po
index 2a245f017..b934bb3a6 100644
--- a/translations/desktop_files/klipper-desktops/ru.po
+++ b/translations/desktop_files/klipper-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>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 14:45+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2023-12-09 05:14+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"
 "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
 #: klipper.desktop:2
@@ -75,7 +77,7 @@ msgstr "Отправить &�траницу"
 #. Description
 #: klipperrc.desktop:51
 msgid "Mail-URL"
-msgstr ""
+msgstr "�дре� почты"
 
 #. Description
 #: klipperrc.desktop:56
diff --git a/translations/desktop_files/klipper-desktops/rw.po b/translations/desktop_files/klipper-desktops/rw.po
index 3db119280..d06d9c362 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/se.po b/translations/desktop_files/klipper-desktops/se.po
index 31d7d7bb7..8b44924e7 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/sk.po b/translations/desktop_files/klipper-desktops/sk.po
index 6c19fee53..9416b1549 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/sl.po b/translations/desktop_files/klipper-desktops/sl.po
index 832c1db94..2863ea6e0 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/sr.po b/translations/desktop_files/klipper-desktops/sr.po
index 5617de932..90ecb323e 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/sr@Latn.po b/translations/desktop_files/klipper-desktops/sr@Latn.po
index e5ac884e7..7ba9e8ce6 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/sv.po b/translations/desktop_files/klipper-desktops/sv.po
index 7a5568499..f349a0fe7 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ta.po b/translations/desktop_files/klipper-desktops/ta.po
index 19f8513b6..d9509d03a 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/te.po b/translations/desktop_files/klipper-desktops/te.po
index a90b0c567..3e515d4f1 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/tg.po b/translations/desktop_files/klipper-desktops/tg.po
index 9a138c59f..88a39313c 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/th.po b/translations/desktop_files/klipper-desktops/th.po
index d8ca00ab6..57ada8416 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/tr.po b/translations/desktop_files/klipper-desktops/tr.po
index 3f4e5e4f0..5ece639ee 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/tt.po b/translations/desktop_files/klipper-desktops/tt.po
index 733c77aab..5e7849047 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/uk.po b/translations/desktop_files/klipper-desktops/uk.po
index 5f0dabe50..549053cd2 100644
--- a/translations/desktop_files/klipper-desktops/uk.po
+++ b/translations/desktop_files/klipper-desktops/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 14:45+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/klipper-desktops/uz.po b/translations/desktop_files/klipper-desktops/uz.po
index 68d72c574..13392455f 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/uz@cyrillic.po b/translations/desktop_files/klipper-desktops/uz@cyrillic.po
index 169f60e38..432c05075 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/ven.po b/translations/desktop_files/klipper-desktops/ven.po
index 75462ef60..094179c37 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/vi.po b/translations/desktop_files/klipper-desktops/vi.po
index c90e2405b..29897496f 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/wa.po b/translations/desktop_files/klipper-desktops/wa.po
index 7059c1920..c872ccfac 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/xh.po b/translations/desktop_files/klipper-desktops/xh.po
index daf9d7a67..450478ac6 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/zh_CN.po b/translations/desktop_files/klipper-desktops/zh_CN.po
index 3b14bc667..185f6b4b6 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/zh_TW.po b/translations/desktop_files/klipper-desktops/zh_TW.po
index 35c5b1a05..6fb27e346 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/klipper-desktops/zu.po b/translations/desktop_files/klipper-desktops/zu.po
index 96b4ca6f2..4c2d8d427 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: 2020-06-21 14:45+0200\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"
diff --git a/translations/desktop_files/kmenuedit.desktop/cs.po b/translations/desktop_files/kmenuedit.desktop/cs.po
index 0d2bbc3ae..e217aaadb 100644
--- a/translations/desktop_files/kmenuedit.desktop/cs.po
+++ b/translations/desktop_files/kmenuedit.desktop/cs.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kmenuedit-kmenueditdesktop/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.2.2\n"
 
 #. Name
 #: kmenuedit.desktop:2
-#, fuzzy
 msgid "KMenuEdit"
-msgstr "Editor nabídek"
+msgstr "KMenuEdit"
 
 #. GenericName
 #: kmenuedit.desktop:4
diff --git a/translations/desktop_files/kmenuedit.desktop/it.po b/translations/desktop_files/kmenuedit.desktop/it.po
index ecb931c01..7f12177c4 100644
--- a/translations/desktop_files/kmenuedit.desktop/it.po
+++ b/translations/desktop_files/kmenuedit.desktop/it.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-01-20 14:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kmenuedit-kmenueditdesktop/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.10.1\n"
 
 #. Name
 #: kmenuedit.desktop:2
-#, fuzzy
 msgid "KMenuEdit"
-msgstr "Editor dei menu"
+msgstr "KMenuEdit"
 
 #. GenericName
 #: kmenuedit.desktop:4
diff --git a/translations/desktop_files/kmenuedit.desktop/pl.po b/translations/desktop_files/kmenuedit.desktop/pl.po
index c290d73f1..d172a6d92 100644
--- a/translations/desktop_files/kmenuedit.desktop/pl.po
+++ b/translations/desktop_files/kmenuedit.desktop/pl.po
@@ -1,26 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 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: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kmenuedit-kmenueditdesktop/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.13.1\n"
 
 #. Name
 #: kmenuedit.desktop:2
-#, fuzzy
 msgid "KMenuEdit"
-msgstr "Edytor menu"
+msgstr "KMenuEdit"
 
 #. GenericName
 #: kmenuedit.desktop:4
diff --git a/translations/desktop_files/kmenuedit.desktop/ru.po b/translations/desktop_files/kmenuedit.desktop/ru.po
index 94d10dccb..916c116c2 100644
--- a/translations/desktop_files/kmenuedit.desktop/ru.po
+++ b/translations/desktop_files/kmenuedit.desktop/ru.po
@@ -1,26 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2022.
 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: 2022-02-14 23:01+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kmenuedit-kmenueditdesktop/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.10.1\n"
 
 #. Name
 #: kmenuedit.desktop:2
-#, fuzzy
 msgid "KMenuEdit"
-msgstr "Редактор меню"
+msgstr "Редактор меню TDE"
 
 #. GenericName
 #: kmenuedit.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/cs.po b/translations/desktop_files/knetattach.desktop/cs.po
index f7b5f3deb..533290390 100644
--- a/translations/desktop_files/knetattach.desktop/cs.po
+++ b/translations/desktop_files/knetattach.desktop/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/knetattach-knetattachdesktop/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.2.2\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
 
 #. GenericName
 #: knetattach.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/es.po b/translations/desktop_files/knetattach.desktop/es.po
index a8082f6db..50cf4453b 100644
--- a/translations/desktop_files/knetattach.desktop/es.po
+++ b/translations/desktop_files/knetattach.desktop/es.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 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: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/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.13.1\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
 
 #. GenericName
 #: knetattach.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/it.po b/translations/desktop_files/knetattach.desktop/it.po
index 62fe80c2e..e26540432 100644
--- a/translations/desktop_files/knetattach.desktop/it.po
+++ b/translations/desktop_files/knetattach.desktop/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-01-20 14:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/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.10.1\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
 
 #. GenericName
 #: knetattach.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/pl.po b/translations/desktop_files/knetattach.desktop/pl.po
index e7de56850..bfc57ce1a 100644
--- a/translations/desktop_files/knetattach.desktop/pl.po
+++ b/translations/desktop_files/knetattach.desktop/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 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: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/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.13.1\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "KNetAttach"
 
 #. GenericName
 #: knetattach.desktop:4
diff --git a/translations/desktop_files/knetattach.desktop/ru.po b/translations/desktop_files/knetattach.desktop/ru.po
index 3c6e3d114..3751ebe66 100644
--- a/translations/desktop_files/knetattach.desktop/ru.po
+++ b/translations/desktop_files/knetattach.desktop/ru.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2022.
 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: 2022-02-14 23:01+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/knetattach-knetattachdesktop/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.10.1\n"
 
 #. Name
 #: knetattach.desktop:2
 msgid "KNetAttach"
-msgstr ""
+msgstr "Ма�тер �ети TDE"
 
 #. GenericName
 #: knetattach.desktop:4
diff --git a/translations/desktop_files/konqueror-desktops/af.po b/translations/desktop_files/konqueror-desktops/af.po
index d529cf936..38d9b9e5b 100644
--- a/translations/desktop_files/konqueror-desktops/af.po
+++ b/translations/desktop_files/konqueror-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ar.po b/translations/desktop_files/konqueror-desktops/ar.po
index 468e8ec9c..73892a049 100644
--- a/translations/desktop_files/konqueror-desktops/ar.po
+++ b/translations/desktop_files/konqueror-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/az.po b/translations/desktop_files/konqueror-desktops/az.po
index 803bf52e4..0d5b2afd7 100644
--- a/translations/desktop_files/konqueror-desktops/az.po
+++ b/translations/desktop_files/konqueror-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/be.po b/translations/desktop_files/konqueror-desktops/be.po
index e6557d5d5..cd130ad27 100644
--- a/translations/desktop_files/konqueror-desktops/be.po
+++ b/translations/desktop_files/konqueror-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/bg.po b/translations/desktop_files/konqueror-desktops/bg.po
index 77b586696..809b099ca 100644
--- a/translations/desktop_files/konqueror-desktops/bg.po
+++ b/translations/desktop_files/konqueror-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+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/"
diff --git a/translations/desktop_files/konqueror-desktops/bn.po b/translations/desktop_files/konqueror-desktops/bn.po
index 7d904650e..f37b456cf 100644
--- a/translations/desktop_files/konqueror-desktops/bn.po
+++ b/translations/desktop_files/konqueror-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/br.po b/translations/desktop_files/konqueror-desktops/br.po
index 934ed950b..95b955a22 100644
--- a/translations/desktop_files/konqueror-desktops/br.po
+++ b/translations/desktop_files/konqueror-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/bs.po b/translations/desktop_files/konqueror-desktops/bs.po
index d40195d8f..53c6e73a6 100644
--- a/translations/desktop_files/konqueror-desktops/bs.po
+++ b/translations/desktop_files/konqueror-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ca.po b/translations/desktop_files/konqueror-desktops/ca.po
index 3767eac11..a91962c13 100644
--- a/translations/desktop_files/konqueror-desktops/ca.po
+++ b/translations/desktop_files/konqueror-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/cs.po b/translations/desktop_files/konqueror-desktops/cs.po
index 8e5c8be7c..0182f620e 100644
--- a/translations/desktop_files/konqueror-desktops/cs.po
+++ b/translations/desktop_files/konqueror-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konqueror-desktop-files/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.2.2\n"
 
 #. Name
 #: Home.desktop:7
@@ -46,12 +47,12 @@ msgstr "Vícesloupcový pohled"
 #: 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 "WWW prohlíže�"
+msgstr "Webový prohlíže�"
 
 #. Name
 #: konqfilemgr.desktop:7
@@ -66,7 +67,7 @@ msgstr "Správce souborů a prohlíže� Webu pro prostředí TDE"
 #. GenericName
 #: konquerorsu.desktop:10
 msgid "File Manager - Super User Mode"
-msgstr "Správce souborů - superuživatelský režim"
+msgstr "Správce souborů – režim správce"
 
 #. Name
 #: kttsplugin/tdehtmlkttsd.desktop:12
@@ -75,9 +76,8 @@ msgstr "Modul text-na-ře�"
 
 #. Comment
 #: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
 msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "Modul shellového příkazu pro Konqueror"
+msgstr "Modul, který umožňuje �íst texty na webu nahlas pomocí KTTS"
 
 #. Name
 #: listview/konq_detailedlistview.desktop:3
@@ -112,7 +112,7 @@ msgstr "KDED modul pro na�ítání Konqueroru"
 #. Comment
 #: preloader/konqy_preloader.desktop:6
 msgid "Reduces Konqueror startup time"
-msgstr "Redukuje �as pro spuštění Konqueroru"
+msgstr "Snižuje �as pro spuštění Konqueroru"
 
 #. Name
 #: profile_filemanagement.desktop:5
@@ -131,9 +131,8 @@ msgstr "Vývoj TDE"
 
 #. Name
 #: profile_midnightcommander.desktop:9
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Modul shellového příkazu"
+msgstr "Midnight Commander"
 
 #. Name
 #: profile_simplebrowser.desktop:2
@@ -162,27 +161,27 @@ msgstr "Prohlížení internetu"
 #: quickprint/text-tex-print.desktop:6 quickprint/text-xml-print.desktop:6
 #: quickprint/text-xslt-print.desktop:6
 msgid "Print..."
-msgstr "Tisknout..."
+msgstr "Tisknout…"
 
 #. Name
 #: remoteencodingplugin/kremoteencodingplugin.desktop:13
 msgid "Remote Encoding"
-msgstr "Modul vzdáleného kódování"
+msgstr "Vzdálené kódování"
 
 #. Comment
 #: remoteencodingplugin/kremoteencodingplugin.desktop:15
 msgid "A Plugin for setting the encoding of remote hosts (FTP, SSH, etc.)"
-msgstr "Modul vzdáleného kódování pro Konqueror"
+msgstr "Modul pro nastavení kódování vzdálený serverů (FTP, SSH, atd.)"
 
 #. Name
 #: shellcmdplugin/kshellcmdplugin.desktop:15
 msgid "Run Command"
-msgstr "Modul shellového příkazu"
+msgstr "Spustit příkaz"
 
 #. Comment
 #: shellcmdplugin/kshellcmdplugin.desktop:17
 msgid "A plugin which enables commands to be executed within folders"
-msgstr "Modul shellového příkazu pro Konqueror"
+msgstr "Modul umožňující provádění příkazů ve složkách"
 
 #. Name
 #: sidebar/konq_sidebartng.desktop:4
@@ -192,7 +191,7 @@ msgstr "Naviga�ní panel"
 #. Name
 #: sidebar/test/test.desktop:5
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #. Name
 #: sidebar/trees/history_module/kcmhistory.desktop:10
diff --git a/translations/desktop_files/konqueror-desktops/csb.po b/translations/desktop_files/konqueror-desktops/csb.po
index 7a2263437..8f10517a2 100644
--- a/translations/desktop_files/konqueror-desktops/csb.po
+++ b/translations/desktop_files/konqueror-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/cy.po b/translations/desktop_files/konqueror-desktops/cy.po
index aecdf354a..25ae92444 100644
--- a/translations/desktop_files/konqueror-desktops/cy.po
+++ b/translations/desktop_files/konqueror-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/da.po b/translations/desktop_files/konqueror-desktops/da.po
index 572646e41..af0df5dd7 100644
--- a/translations/desktop_files/konqueror-desktops/da.po
+++ b/translations/desktop_files/konqueror-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/de.po b/translations/desktop_files/konqueror-desktops/de.po
index 79ae2a97e..753ec0b6a 100644
--- a/translations/desktop_files/konqueror-desktops/de.po
+++ b/translations/desktop_files/konqueror-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/el.po b/translations/desktop_files/konqueror-desktops/el.po
index fec36ebe4..553d1f630 100644
--- a/translations/desktop_files/konqueror-desktops/el.po
+++ b/translations/desktop_files/konqueror-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/eo.po b/translations/desktop_files/konqueror-desktops/eo.po
index 54ada03e2..460de1a05 100644
--- a/translations/desktop_files/konqueror-desktops/eo.po
+++ b/translations/desktop_files/konqueror-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/es.po b/translations/desktop_files/konqueror-desktops/es.po
index 838cf6714..4a443366b 100644
--- a/translations/desktop_files/konqueror-desktops/es.po
+++ b/translations/desktop_files/konqueror-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/et.po b/translations/desktop_files/konqueror-desktops/et.po
index f70a4fe8b..26c90b3ba 100644
--- a/translations/desktop_files/konqueror-desktops/et.po
+++ b/translations/desktop_files/konqueror-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/eu.po b/translations/desktop_files/konqueror-desktops/eu.po
index 852fa0135..28b8c70a2 100644
--- a/translations/desktop_files/konqueror-desktops/eu.po
+++ b/translations/desktop_files/konqueror-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/fa.po b/translations/desktop_files/konqueror-desktops/fa.po
index 9191a61b6..28cf1d460 100644
--- a/translations/desktop_files/konqueror-desktops/fa.po
+++ b/translations/desktop_files/konqueror-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/fi.po b/translations/desktop_files/konqueror-desktops/fi.po
index d4bb9efe9..27097f6fc 100644
--- a/translations/desktop_files/konqueror-desktops/fi.po
+++ b/translations/desktop_files/konqueror-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/fo.po b/translations/desktop_files/konqueror-desktops/fo.po
index 78b12eede..f87e438da 100644
--- a/translations/desktop_files/konqueror-desktops/fo.po
+++ b/translations/desktop_files/konqueror-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/fr.po b/translations/desktop_files/konqueror-desktops/fr.po
index 03b9c41ad..df6577cad 100644
--- a/translations/desktop_files/konqueror-desktops/fr.po
+++ b/translations/desktop_files/konqueror-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/fy.po b/translations/desktop_files/konqueror-desktops/fy.po
index 4346254ec..0d1fefd8d 100644
--- a/translations/desktop_files/konqueror-desktops/fy.po
+++ b/translations/desktop_files/konqueror-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ga.po b/translations/desktop_files/konqueror-desktops/ga.po
index fca573290..812a5dcc8 100644
--- a/translations/desktop_files/konqueror-desktops/ga.po
+++ b/translations/desktop_files/konqueror-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/gl.po b/translations/desktop_files/konqueror-desktops/gl.po
index 82dd218f5..07cf70f8d 100644
--- a/translations/desktop_files/konqueror-desktops/gl.po
+++ b/translations/desktop_files/konqueror-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/he.po b/translations/desktop_files/konqueror-desktops/he.po
index 56fb901b1..dbbbdc949 100644
--- a/translations/desktop_files/konqueror-desktops/he.po
+++ b/translations/desktop_files/konqueror-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/hi.po b/translations/desktop_files/konqueror-desktops/hi.po
index 3c73e6158..c4e6a188a 100644
--- a/translations/desktop_files/konqueror-desktops/hi.po
+++ b/translations/desktop_files/konqueror-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/hr.po b/translations/desktop_files/konqueror-desktops/hr.po
index 7b9e524af..1087c3ad3 100644
--- a/translations/desktop_files/konqueror-desktops/hr.po
+++ b/translations/desktop_files/konqueror-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/hsb.po b/translations/desktop_files/konqueror-desktops/hsb.po
index fdef9f8a1..d89cadd9b 100644
--- a/translations/desktop_files/konqueror-desktops/hsb.po
+++ b/translations/desktop_files/konqueror-desktops/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/hu.po b/translations/desktop_files/konqueror-desktops/hu.po
index 294592656..4e717e59c 100644
--- a/translations/desktop_files/konqueror-desktops/hu.po
+++ b/translations/desktop_files/konqueror-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/id.po b/translations/desktop_files/konqueror-desktops/id.po
index 989c03e74..0e006b53c 100644
--- a/translations/desktop_files/konqueror-desktops/id.po
+++ b/translations/desktop_files/konqueror-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/is.po b/translations/desktop_files/konqueror-desktops/is.po
index 107861f21..2c02f627c 100644
--- a/translations/desktop_files/konqueror-desktops/is.po
+++ b/translations/desktop_files/konqueror-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/it.po b/translations/desktop_files/konqueror-desktops/it.po
index f507ccbfd..5d11912c6 100644
--- a/translations/desktop_files/konqueror-desktops/it.po
+++ b/translations/desktop_files/konqueror-desktops/it.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Leandro Nini <drfiemost@email.it>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-01-21 15:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konqueror-desktop-files/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.10.1\n"
 
 #. Name
 #: Home.desktop:7
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #. GenericName
 #: Home.desktop:9
@@ -46,7 +48,7 @@ msgstr "Vista a colonne multiple"
 #: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
 #: konquerorsu.desktop:8
 msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
 
 #. GenericName
 #: konqbrowser.desktop:9
@@ -75,9 +77,9 @@ msgstr "Plugin lettura del testo (text-to-speech)"
 
 #. Comment
 #: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
 msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "Plugin per i comandi shell di Konqueror"
+msgstr ""
+"Un plugin che abilita la lettura del testo (text-to-speech) in rete con KTTS"
 
 #. Name
 #: listview/konq_detailedlistview.desktop:3
@@ -131,9 +133,8 @@ msgstr "Sviluppo TDE"
 
 #. Name
 #: profile_midnightcommander.desktop:9
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Plugin per i comandi shell"
+msgstr "Midnight Commander"
 
 #. Name
 #: profile_simplebrowser.desktop:2
diff --git a/translations/desktop_files/konqueror-desktops/ja.po b/translations/desktop_files/konqueror-desktops/ja.po
index ec8168b8c..99fe4688c 100644
--- a/translations/desktop_files/konqueror-desktops/ja.po
+++ b/translations/desktop_files/konqueror-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ka.po b/translations/desktop_files/konqueror-desktops/ka.po
index 69a1887b7..b73600d06 100644
--- a/translations/desktop_files/konqueror-desktops/ka.po
+++ b/translations/desktop_files/konqueror-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/kk.po b/translations/desktop_files/konqueror-desktops/kk.po
index cc96138fe..7f53c4a26 100644
--- a/translations/desktop_files/konqueror-desktops/kk.po
+++ b/translations/desktop_files/konqueror-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/km.po b/translations/desktop_files/konqueror-desktops/km.po
index 6e5214df7..6d4e31284 100644
--- a/translations/desktop_files/konqueror-desktops/km.po
+++ b/translations/desktop_files/konqueror-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ko.po b/translations/desktop_files/konqueror-desktops/ko.po
index 3df5aabd6..bd8617a65 100644
--- a/translations/desktop_files/konqueror-desktops/ko.po
+++ b/translations/desktop_files/konqueror-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/konqueror-desktops.pot b/translations/desktop_files/konqueror-desktops/konqueror-desktops.pot
index 03b8baaf3..e0f2d93bc 100644
--- a/translations/desktop_files/konqueror-desktops/konqueror-desktops.pot
+++ b/translations/desktop_files/konqueror-desktops/konqueror-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
@@ -42,9 +42,8 @@ msgid "MultiColumn View"
 msgstr ""
 
 #. Name
-#: kfmclient.desktop:9 kfmclient_dir.desktop:9
-#: kfmclient_html.desktop:9 kfmclient_war.desktop:9
-#: konqbrowser.desktop:7 konqueror.desktop:6
+#: 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 ""
@@ -150,24 +149,15 @@ msgid "Web Browsing"
 msgstr ""
 
 #. 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-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
 msgid "Print..."
 msgstr ""
@@ -260,8 +250,7 @@ msgid "This folder contains your personal files"
 msgstr ""
 
 #. Name
-#: sidebar/trees/init/remote.desktop:2
-#: sidebar/trees/init/remote/.directory:2
+#: sidebar/trees/init/remote.desktop:2 sidebar/trees/init/remote/.directory:2
 msgid "Network"
 msgstr ""
 
diff --git a/translations/desktop_files/konqueror-desktops/lo.po b/translations/desktop_files/konqueror-desktops/lo.po
index 9c022ba8a..c9d10f856 100644
--- a/translations/desktop_files/konqueror-desktops/lo.po
+++ b/translations/desktop_files/konqueror-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/lt.po b/translations/desktop_files/konqueror-desktops/lt.po
index a77101670..c05799d2c 100644
--- a/translations/desktop_files/konqueror-desktops/lt.po
+++ b/translations/desktop_files/konqueror-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/lv.po b/translations/desktop_files/konqueror-desktops/lv.po
index 69341e32b..5f4ff7c50 100644
--- a/translations/desktop_files/konqueror-desktops/lv.po
+++ b/translations/desktop_files/konqueror-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/mk.po b/translations/desktop_files/konqueror-desktops/mk.po
index b1d6c7e0c..193497ede 100644
--- a/translations/desktop_files/konqueror-desktops/mk.po
+++ b/translations/desktop_files/konqueror-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/mn.po b/translations/desktop_files/konqueror-desktops/mn.po
index 793afb41d..7491e72ea 100644
--- a/translations/desktop_files/konqueror-desktops/mn.po
+++ b/translations/desktop_files/konqueror-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ms.po b/translations/desktop_files/konqueror-desktops/ms.po
index 24ae834ef..0cfc247e1 100644
--- a/translations/desktop_files/konqueror-desktops/ms.po
+++ b/translations/desktop_files/konqueror-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/mt.po b/translations/desktop_files/konqueror-desktops/mt.po
index acd8e580f..486bd7dfd 100644
--- a/translations/desktop_files/konqueror-desktops/mt.po
+++ b/translations/desktop_files/konqueror-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/nb.po b/translations/desktop_files/konqueror-desktops/nb.po
index 8a45d7fd9..b9b666f77 100644
--- a/translations/desktop_files/konqueror-desktops/nb.po
+++ b/translations/desktop_files/konqueror-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/nds.po b/translations/desktop_files/konqueror-desktops/nds.po
index 92b808d56..8896811ab 100644
--- a/translations/desktop_files/konqueror-desktops/nds.po
+++ b/translations/desktop_files/konqueror-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ne.po b/translations/desktop_files/konqueror-desktops/ne.po
index 87b7876ab..37aaaec8e 100644
--- a/translations/desktop_files/konqueror-desktops/ne.po
+++ b/translations/desktop_files/konqueror-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/nl.po b/translations/desktop_files/konqueror-desktops/nl.po
index 0ad5570c1..666a401be 100644
--- a/translations/desktop_files/konqueror-desktops/nl.po
+++ b/translations/desktop_files/konqueror-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/nn.po b/translations/desktop_files/konqueror-desktops/nn.po
index dab12354e..cf1e29c72 100644
--- a/translations/desktop_files/konqueror-desktops/nn.po
+++ b/translations/desktop_files/konqueror-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/nso.po b/translations/desktop_files/konqueror-desktops/nso.po
index e8427c096..427219147 100644
--- a/translations/desktop_files/konqueror-desktops/nso.po
+++ b/translations/desktop_files/konqueror-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/oc.po b/translations/desktop_files/konqueror-desktops/oc.po
index f08de2b65..0ad1bde04 100644
--- a/translations/desktop_files/konqueror-desktops/oc.po
+++ b/translations/desktop_files/konqueror-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/pa.po b/translations/desktop_files/konqueror-desktops/pa.po
index b86c154ec..058d046af 100644
--- a/translations/desktop_files/konqueror-desktops/pa.po
+++ b/translations/desktop_files/konqueror-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/pl.po b/translations/desktop_files/konqueror-desktops/pl.po
index 3fce29172..249ea33c2 100644
--- a/translations/desktop_files/konqueror-desktops/pl.po
+++ b/translations/desktop_files/konqueror-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konqueror-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.1.1\n"
 
 #. Name
 #: Home.desktop:7
@@ -46,7 +48,7 @@ msgstr "Widok wielokolumnowy"
 #: kfmclient_war.desktop:9 konqbrowser.desktop:7 konqueror.desktop:6
 #: konquerorsu.desktop:8
 msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
 
 #. GenericName
 #: konqbrowser.desktop:9
@@ -75,9 +77,8 @@ msgstr "Wtyczka odczytywania tekstu"
 
 #. Comment
 #: kttsplugin/tdehtmlkttsd.desktop:14
-#, fuzzy
 msgid "A plugin which enables texts to be read aloud on the web with KTTS"
-msgstr "Wtyczka polecenia powłoki dla Konquerora"
+msgstr "Plugin umożliwiający syntezę mowy przy użyciu KTTS"
 
 #. Name
 #: listview/konq_detailedlistview.desktop:3
@@ -131,9 +132,8 @@ msgstr "Rozwijanie TDE"
 
 #. Name
 #: profile_midnightcommander.desktop:9
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Wtyczka polecenia powłoki"
+msgstr "Midnight Commander"
 
 #. Name
 #: profile_simplebrowser.desktop:2
@@ -192,7 +192,7 @@ msgstr "Panel nawigacyjny"
 #. Name
 #: sidebar/test/test.desktop:5
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #. Name
 #: sidebar/trees/history_module/kcmhistory.desktop:10
@@ -251,7 +251,7 @@ msgstr "Katalog domowy"
 #. Comment
 #: sidebar/trees/init/home.desktop:8
 msgid "This folder contains your personal files"
-msgstr "Ten katalog zawiera wszystkie twoje osobiste pliki."
+msgstr "Ten katalog zawiera wszystkie twoje osobiste pliki"
 
 #. Name
 #: sidebar/trees/init/remote.desktop:2 sidebar/trees/init/remote/.directory:2
@@ -322,7 +322,7 @@ msgstr "Ustawienia"
 #. Name
 #: sidebar/trees/init/system.desktop:6
 msgid "System"
-msgstr ""
+msgstr "System"
 
 #. Comment
 #: sidebar/trees/init/system.desktop:8
@@ -333,15 +333,13 @@ msgstr ""
 
 #. Name
 #: sidebar/trees/init/trash.desktop:9
-#, fuzzy
 msgid "Trash Folder"
-msgstr "Katalog"
+msgstr "Katalog kosza"
 
 #. Comment
 #: sidebar/trees/init/trash.desktop:11
-#, fuzzy
 msgid "This folder displays the contents of your Trash Bin"
-msgstr "Ten katalog zawiera wszystkie twoje osobiste pliki."
+msgstr "Ten katalog wyświetla zawartość twojego Kosza"
 
 #. Name
 #: sidebar/web_module/webmodule_add.desktop:5
diff --git a/translations/desktop_files/konqueror-desktops/pt.po b/translations/desktop_files/konqueror-desktops/pt.po
index 5f8c6f62e..bc6e3b209 100644
--- a/translations/desktop_files/konqueror-desktops/pt.po
+++ b/translations/desktop_files/konqueror-desktops/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/pt_BR.po b/translations/desktop_files/konqueror-desktops/pt_BR.po
index 48d985169..b71b14f22 100644
--- a/translations/desktop_files/konqueror-desktops/pt_BR.po
+++ b/translations/desktop_files/konqueror-desktops/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-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ro.po b/translations/desktop_files/konqueror-desktops/ro.po
index 84c115b30..7456b7ff1 100644
--- a/translations/desktop_files/konqueror-desktops/ro.po
+++ b/translations/desktop_files/konqueror-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ru.po b/translations/desktop_files/konqueror-desktops/ru.po
index 2b9f9c03f..15652655a 100644
--- a/translations/desktop_files/konqueror-desktops/ru.po
+++ b/translations/desktop_files/konqueror-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 15:23+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: 2021-07-07 18:17+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/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 +48,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 +77,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 +134,8 @@ msgstr "Разработка в TDE"
 
 #. Name
 #: profile_midnightcommander.desktop:9
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Выполнить команду"
+msgstr "Midnight Commander"
 
 #. Name
 #: profile_simplebrowser.desktop:2
diff --git a/translations/desktop_files/konqueror-desktops/rw.po b/translations/desktop_files/konqueror-desktops/rw.po
index df04ab030..42e1a41e7 100644
--- a/translations/desktop_files/konqueror-desktops/rw.po
+++ b/translations/desktop_files/konqueror-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/se.po b/translations/desktop_files/konqueror-desktops/se.po
index 02ad7175e..cc1bbfabc 100644
--- a/translations/desktop_files/konqueror-desktops/se.po
+++ b/translations/desktop_files/konqueror-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/sk.po b/translations/desktop_files/konqueror-desktops/sk.po
index ed29b2780..3f7b391bc 100644
--- a/translations/desktop_files/konqueror-desktops/sk.po
+++ b/translations/desktop_files/konqueror-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/sl.po b/translations/desktop_files/konqueror-desktops/sl.po
index e9f3ef20b..e5b3f8ce8 100644
--- a/translations/desktop_files/konqueror-desktops/sl.po
+++ b/translations/desktop_files/konqueror-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/sr.po b/translations/desktop_files/konqueror-desktops/sr.po
index 199ab1b13..eba8dc5d9 100644
--- a/translations/desktop_files/konqueror-desktops/sr.po
+++ b/translations/desktop_files/konqueror-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/sr@Latn.po b/translations/desktop_files/konqueror-desktops/sr@Latn.po
index 305fe9b27..357238a43 100644
--- a/translations/desktop_files/konqueror-desktops/sr@Latn.po
+++ b/translations/desktop_files/konqueror-desktops/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-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ss.po b/translations/desktop_files/konqueror-desktops/ss.po
index 78251e773..6e6aa6904 100644
--- a/translations/desktop_files/konqueror-desktops/ss.po
+++ b/translations/desktop_files/konqueror-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/sv.po b/translations/desktop_files/konqueror-desktops/sv.po
index 3ae2eb91b..b4e673583 100644
--- a/translations/desktop_files/konqueror-desktops/sv.po
+++ b/translations/desktop_files/konqueror-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ta.po b/translations/desktop_files/konqueror-desktops/ta.po
index 556983d22..890fcf5a2 100644
--- a/translations/desktop_files/konqueror-desktops/ta.po
+++ b/translations/desktop_files/konqueror-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/te.po b/translations/desktop_files/konqueror-desktops/te.po
index 192fb2094..0dcc8c301 100644
--- a/translations/desktop_files/konqueror-desktops/te.po
+++ b/translations/desktop_files/konqueror-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/tg.po b/translations/desktop_files/konqueror-desktops/tg.po
index ecd1ccd56..f6f6e202d 100644
--- a/translations/desktop_files/konqueror-desktops/tg.po
+++ b/translations/desktop_files/konqueror-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/th.po b/translations/desktop_files/konqueror-desktops/th.po
index 9b87811d5..f6600b424 100644
--- a/translations/desktop_files/konqueror-desktops/th.po
+++ b/translations/desktop_files/konqueror-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/tr.po b/translations/desktop_files/konqueror-desktops/tr.po
index 8161d5713..df1122292 100644
--- a/translations/desktop_files/konqueror-desktops/tr.po
+++ b/translations/desktop_files/konqueror-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/tt.po b/translations/desktop_files/konqueror-desktops/tt.po
index c56b50513..22b4c8e8b 100644
--- a/translations/desktop_files/konqueror-desktops/tt.po
+++ b/translations/desktop_files/konqueror-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/uk.po b/translations/desktop_files/konqueror-desktops/uk.po
index 68dd98f7a..1b44f878b 100644
--- a/translations/desktop_files/konqueror-desktops/uk.po
+++ b/translations/desktop_files/konqueror-desktops/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/konqueror-desktops/uz.po b/translations/desktop_files/konqueror-desktops/uz.po
index 5df459d6e..fbdfdec88 100644
--- a/translations/desktop_files/konqueror-desktops/uz.po
+++ b/translations/desktop_files/konqueror-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/uz@cyrillic.po b/translations/desktop_files/konqueror-desktops/uz@cyrillic.po
index fba032c34..c64b7f1ef 100644
--- a/translations/desktop_files/konqueror-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/konqueror-desktops/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-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/ven.po b/translations/desktop_files/konqueror-desktops/ven.po
index 5a5e302b6..0f0f5af02 100644
--- a/translations/desktop_files/konqueror-desktops/ven.po
+++ b/translations/desktop_files/konqueror-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/vi.po b/translations/desktop_files/konqueror-desktops/vi.po
index ac7fcd077..d1b6de34c 100644
--- a/translations/desktop_files/konqueror-desktops/vi.po
+++ b/translations/desktop_files/konqueror-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/wa.po b/translations/desktop_files/konqueror-desktops/wa.po
index 926521d19..d838b1138 100644
--- a/translations/desktop_files/konqueror-desktops/wa.po
+++ b/translations/desktop_files/konqueror-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/xh.po b/translations/desktop_files/konqueror-desktops/xh.po
index 0a1574ff7..2876d9724 100644
--- a/translations/desktop_files/konqueror-desktops/xh.po
+++ b/translations/desktop_files/konqueror-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/zh_CN.po b/translations/desktop_files/konqueror-desktops/zh_CN.po
index 4484b3dbf..1e6282018 100644
--- a/translations/desktop_files/konqueror-desktops/zh_CN.po
+++ b/translations/desktop_files/konqueror-desktops/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-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/zh_TW.po b/translations/desktop_files/konqueror-desktops/zh_TW.po
index 94b23baac..cb85ea4bc 100644
--- a/translations/desktop_files/konqueror-desktops/zh_TW.po
+++ b/translations/desktop_files/konqueror-desktops/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-21 15:23+0200\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"
diff --git a/translations/desktop_files/konqueror-desktops/zu.po b/translations/desktop_files/konqueror-desktops/zu.po
index cc5490dae..2cdeff9d0 100644
--- a/translations/desktop_files/konqueror-desktops/zu.po
+++ b/translations/desktop_files/konqueror-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 15:23+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/af.po b/translations/desktop_files/konsole-desktops/af.po
index 5d08aae6e..974d07ddf 100644
--- a/translations/desktop_files/konsole-desktops/af.po
+++ b/translations/desktop_files/konsole-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ar.po b/translations/desktop_files/konsole-desktops/ar.po
index f044d28d2..5d46dd55f 100644
--- a/translations/desktop_files/konsole-desktops/ar.po
+++ b/translations/desktop_files/konsole-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/az.po b/translations/desktop_files/konsole-desktops/az.po
index 3b84983c7..b02691c5f 100644
--- a/translations/desktop_files/konsole-desktops/az.po
+++ b/translations/desktop_files/konsole-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/be.po b/translations/desktop_files/konsole-desktops/be.po
index ed3754488..6fd6677ed 100644
--- a/translations/desktop_files/konsole-desktops/be.po
+++ b/translations/desktop_files/konsole-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/bg.po b/translations/desktop_files/konsole-desktops/bg.po
index 48225c266..922686d7b 100644
--- a/translations/desktop_files/konsole-desktops/bg.po
+++ b/translations/desktop_files/konsole-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+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/"
diff --git a/translations/desktop_files/konsole-desktops/bn.po b/translations/desktop_files/konsole-desktops/bn.po
index e059b8f40..93ec0dda0 100644
--- a/translations/desktop_files/konsole-desktops/bn.po
+++ b/translations/desktop_files/konsole-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/br.po b/translations/desktop_files/konsole-desktops/br.po
index 091897a6b..4f840f1b3 100644
--- a/translations/desktop_files/konsole-desktops/br.po
+++ b/translations/desktop_files/konsole-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/bs.po b/translations/desktop_files/konsole-desktops/bs.po
index 8639adfb7..f7b2dde87 100644
--- a/translations/desktop_files/konsole-desktops/bs.po
+++ b/translations/desktop_files/konsole-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ca.po b/translations/desktop_files/konsole-desktops/ca.po
index 5a1796ee3..f2792f79a 100644
--- a/translations/desktop_files/konsole-desktops/ca.po
+++ b/translations/desktop_files/konsole-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/cs.po b/translations/desktop_files/konsole-desktops/cs.po
index 48046a739..cb5e95a86 100644
--- a/translations/desktop_files/konsole-desktops/cs.po
+++ b/translations/desktop_files/konsole-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2021-01-22 17:00+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konsole-desktop-files/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.4.2\n"
 
 #. Name
 #: kcmkonsole.desktop:9
@@ -29,11 +30,10 @@ msgstr "Všechna nastavení programu Konsole"
 #. Keywords
 #: kcmkonsole.desktop:13
 msgid "konsole;console;terminal;"
-msgstr "Konsole;Console;Terminál;"
+msgstr "Konsole;Konzole;Console;Terminál;"
 
 #. Name
 #: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
-#, fuzzy
 msgid "Konsole"
 msgstr "Konsole"
 
@@ -45,7 +45,7 @@ msgstr "Terminálový program"
 #. Comment
 #: konsole/x-konsole.desktop:7
 msgid "File to Open a Shell"
-msgstr "Soubor k otevření příkazové řádky"
+msgstr "Soubor k otevření příkazového řádku"
 
 #. Name
 #: konsolepart.desktop:14 terminalemulator.desktop:5
@@ -55,12 +55,12 @@ msgstr "Emulátor terminálu"
 #. GenericName
 #: konsolesu.desktop:12
 msgid "Terminal Program - Super User Mode"
-msgstr "Terminál - superuživatelský režim"
+msgstr "Terminál – superuživatelský režim"
 
 #. Name
 #: kwrited.desktop:2
 msgid "TDE Write Daemon"
-msgstr "Zapisovací démon TDE"
+msgstr "TDE démon pro zprávy"
 
 #. Comment
 #: kwrited.desktop:4
@@ -80,9 +80,8 @@ msgstr "Nová Linuxová konzole"
 
 #. Name
 #: other/mc.desktop:3
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Nový Midnight Commander"
+msgstr "Midnight Commander"
 
 #. Comment
 #: other/mc.desktop:4
@@ -92,20 +91,19 @@ msgstr "Nový Midnight Commander"
 #. Name
 #: other/screen.desktop:3
 msgid "Screen Session"
-msgstr "Screen relace"
+msgstr "Sezení „screen“"
 
 #. Comment
 #: other/screen.desktop:4
 msgid "New Screen Session"
-msgstr "Nová 'screen' relace"
+msgstr "Nové sezení „screen“"
 
 #. Name
 #. Title0
 #: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6
 #: other/5shells:6
-#, fuzzy
 msgid "Shell"
-msgstr "Nový shell"
+msgstr "Shell"
 
 #. Comment
 #: other/shell.desktop:4
@@ -130,13 +128,12 @@ msgstr "Midnight Commander (root)"
 #. Comment
 #: other/sumc.desktop.cmake:4
 msgid "New Root Midnight Commander"
-msgstr "Nový Midnight Commander pro superuživatele"
+msgstr "Nový Midnight Commander (root)"
 
 #. Name
 #: terminalhere.desktop:6
-#, fuzzy
 msgid "Terminal"
-msgstr "Terminálový program"
+msgstr "Terminál"
 
 #. Name
 #: terminalhere.desktop:11
@@ -145,47 +142,40 @@ msgstr "Otevřít terminál zde"
 
 #. Name
 #: other/2shells:2
-#, fuzzy
 msgid "Two consoles"
-msgstr "Konsole"
+msgstr "DvÄ› konzole"
 
 #. Title1
 #: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
-#, fuzzy
 msgid "Shell No. 2"
-msgstr "Nový shell"
+msgstr "Shell �. 2"
 
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "Tři konzole"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
-#, fuzzy
 msgid "Shell No. 3"
-msgstr "Nový shell"
+msgstr "Shell �. 3"
 
 #. Name
 #: other/4shells:2
-#, fuzzy
 msgid "Four consoles"
-msgstr "Linuxová konzole"
+msgstr "Čtyři konzole"
 
 #. Title3
 #: other/4shells:9 other/5shells:9
-#, fuzzy
 msgid "Shell No. 4"
-msgstr "Nový shell"
+msgstr "Shell �. 4"
 
 #. Name
 #: other/5shells:2
-#, fuzzy
 msgid "Five consoles"
-msgstr "Linuxová konzole"
+msgstr "Pět konzolí"
 
 #. Title4
 #: other/5shells:10
-#, fuzzy
 msgid "Shell No. 5"
-msgstr "Nový shell"
+msgstr "Shell �. 5"
diff --git a/translations/desktop_files/konsole-desktops/csb.po b/translations/desktop_files/konsole-desktops/csb.po
index ba7051d1e..cd4f18dd4 100644
--- a/translations/desktop_files/konsole-desktops/csb.po
+++ b/translations/desktop_files/konsole-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/cy.po b/translations/desktop_files/konsole-desktops/cy.po
index bdd787dcb..ac51894c5 100644
--- a/translations/desktop_files/konsole-desktops/cy.po
+++ b/translations/desktop_files/konsole-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/da.po b/translations/desktop_files/konsole-desktops/da.po
index 12e0746e4..272329b83 100644
--- a/translations/desktop_files/konsole-desktops/da.po
+++ b/translations/desktop_files/konsole-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/de.po b/translations/desktop_files/konsole-desktops/de.po
index fc11635b9..e2d42cd2c 100644
--- a/translations/desktop_files/konsole-desktops/de.po
+++ b/translations/desktop_files/konsole-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/el.po b/translations/desktop_files/konsole-desktops/el.po
index 5ab8ffb08..fc088d6a3 100644
--- a/translations/desktop_files/konsole-desktops/el.po
+++ b/translations/desktop_files/konsole-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/eo.po b/translations/desktop_files/konsole-desktops/eo.po
index 3f8a97ae8..a09f64177 100644
--- a/translations/desktop_files/konsole-desktops/eo.po
+++ b/translations/desktop_files/konsole-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/es.po b/translations/desktop_files/konsole-desktops/es.po
index c4cfdb255..adbee757a 100644
--- a/translations/desktop_files/konsole-desktops/es.po
+++ b/translations/desktop_files/konsole-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/et.po b/translations/desktop_files/konsole-desktops/et.po
index f57b93ffc..cc178aa69 100644
--- a/translations/desktop_files/konsole-desktops/et.po
+++ b/translations/desktop_files/konsole-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/eu.po b/translations/desktop_files/konsole-desktops/eu.po
index adcb73fb4..f2864d783 100644
--- a/translations/desktop_files/konsole-desktops/eu.po
+++ b/translations/desktop_files/konsole-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/fa.po b/translations/desktop_files/konsole-desktops/fa.po
index 22c783d07..5d8aae26f 100644
--- a/translations/desktop_files/konsole-desktops/fa.po
+++ b/translations/desktop_files/konsole-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/fi.po b/translations/desktop_files/konsole-desktops/fi.po
index 261e93222..42e41275b 100644
--- a/translations/desktop_files/konsole-desktops/fi.po
+++ b/translations/desktop_files/konsole-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/fo.po b/translations/desktop_files/konsole-desktops/fo.po
index 489135ae7..bc6fabf22 100644
--- a/translations/desktop_files/konsole-desktops/fo.po
+++ b/translations/desktop_files/konsole-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/fr.po b/translations/desktop_files/konsole-desktops/fr.po
index 11064d332..446f2b73f 100644
--- a/translations/desktop_files/konsole-desktops/fr.po
+++ b/translations/desktop_files/konsole-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/fy.po b/translations/desktop_files/konsole-desktops/fy.po
index e00b6642a..10afe2ff7 100644
--- a/translations/desktop_files/konsole-desktops/fy.po
+++ b/translations/desktop_files/konsole-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ga.po b/translations/desktop_files/konsole-desktops/ga.po
index cd3bbed05..8ffdaaefc 100644
--- a/translations/desktop_files/konsole-desktops/ga.po
+++ b/translations/desktop_files/konsole-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/gl.po b/translations/desktop_files/konsole-desktops/gl.po
index 4f46d711c..a30b5074f 100644
--- a/translations/desktop_files/konsole-desktops/gl.po
+++ b/translations/desktop_files/konsole-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/he.po b/translations/desktop_files/konsole-desktops/he.po
index a9681e510..efd4d9681 100644
--- a/translations/desktop_files/konsole-desktops/he.po
+++ b/translations/desktop_files/konsole-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/hi.po b/translations/desktop_files/konsole-desktops/hi.po
index 3ed951f1d..d4c8c76a6 100644
--- a/translations/desktop_files/konsole-desktops/hi.po
+++ b/translations/desktop_files/konsole-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/hr.po b/translations/desktop_files/konsole-desktops/hr.po
index 50e4dae5a..49b415b6a 100644
--- a/translations/desktop_files/konsole-desktops/hr.po
+++ b/translations/desktop_files/konsole-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/hu.po b/translations/desktop_files/konsole-desktops/hu.po
index c4b87c737..f18811538 100644
--- a/translations/desktop_files/konsole-desktops/hu.po
+++ b/translations/desktop_files/konsole-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/id.po b/translations/desktop_files/konsole-desktops/id.po
index 040110e5d..3376c2d86 100644
--- a/translations/desktop_files/konsole-desktops/id.po
+++ b/translations/desktop_files/konsole-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/is.po b/translations/desktop_files/konsole-desktops/is.po
index 22e8a7a64..3154cc068 100644
--- a/translations/desktop_files/konsole-desktops/is.po
+++ b/translations/desktop_files/konsole-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/it.po b/translations/desktop_files/konsole-desktops/it.po
index 99ec3696b..1df0bfb24 100644
--- a/translations/desktop_files/konsole-desktops/it.po
+++ b/translations/desktop_files/konsole-desktops/it.po
@@ -1,26 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Leandro Nini <drfiemost@email.it>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-01-21 15:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-desktop-files/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.10.1\n"
 
 #. Name
 #: kcmkonsole.desktop:9
-#, fuzzy
 msgid "Console"
-msgstr "Console Linux"
+msgstr "Console"
 
 #. GenericName
 #: kcmkonsole.desktop:11
@@ -34,9 +35,8 @@ msgstr "konsole;console;terminale;"
 
 #. Name
 #: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
-#, fuzzy
 msgid "Konsole"
-msgstr "Console Linux"
+msgstr "Konsole"
 
 #. GenericName
 #: konsole-script.desktop:11 konsole.desktop:11
@@ -82,9 +82,8 @@ msgstr "Nuova console Linux"
 
 #. Name
 #: other/mc.desktop:3
-#, fuzzy
 msgid "Midnight Commander"
-msgstr "Nuovo Midnight Commander"
+msgstr "Midnight Commander"
 
 #. Comment
 #: other/mc.desktop:4
@@ -105,9 +104,8 @@ msgstr "Nuova sessione di Screen"
 #. Title0
 #: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6
 #: other/5shells:6
-#, fuzzy
 msgid "Shell"
-msgstr "Nuova shell"
+msgstr "Shell"
 
 #. Comment
 #: other/shell.desktop:4
@@ -136,9 +134,8 @@ msgstr "Nuovo Midnight Commander di root"
 
 #. Name
 #: terminalhere.desktop:6
-#, fuzzy
 msgid "Terminal"
-msgstr "Programma terminale"
+msgstr "Terminale"
 
 #. Name
 #: terminalhere.desktop:11
@@ -147,47 +144,40 @@ msgstr "Apri terminale qui"
 
 #. Name
 #: other/2shells:2
-#, fuzzy
 msgid "Two consoles"
-msgstr "Console Linux"
+msgstr "Due Console"
 
 #. Title1
 #: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
-#, fuzzy
 msgid "Shell No. 2"
-msgstr "Nuova shell"
+msgstr "Shell n. 2"
 
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "Tre Console"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
-#, fuzzy
 msgid "Shell No. 3"
-msgstr "Nuova shell"
+msgstr "Shell n. 3"
 
 #. Name
 #: other/4shells:2
-#, fuzzy
 msgid "Four consoles"
-msgstr "Console Linux"
+msgstr "Quattro Console"
 
 #. Title3
 #: other/4shells:9 other/5shells:9
-#, fuzzy
 msgid "Shell No. 4"
-msgstr "Nuova shell"
+msgstr "Shell n. 4"
 
 #. Name
 #: other/5shells:2
-#, fuzzy
 msgid "Five consoles"
-msgstr "Console Linux"
+msgstr "Cinque Console"
 
 #. Title4
 #: other/5shells:10
-#, fuzzy
 msgid "Shell No. 5"
-msgstr "Nuova shell"
+msgstr "Shell n. 5"
diff --git a/translations/desktop_files/konsole-desktops/ja.po b/translations/desktop_files/konsole-desktops/ja.po
index 0806cd797..625a651d0 100644
--- a/translations/desktop_files/konsole-desktops/ja.po
+++ b/translations/desktop_files/konsole-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ka.po b/translations/desktop_files/konsole-desktops/ka.po
index 98d27b873..b53d30e7f 100644
--- a/translations/desktop_files/konsole-desktops/ka.po
+++ b/translations/desktop_files/konsole-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/kk.po b/translations/desktop_files/konsole-desktops/kk.po
index 43a124f2b..3c81e0b87 100644
--- a/translations/desktop_files/konsole-desktops/kk.po
+++ b/translations/desktop_files/konsole-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/km.po b/translations/desktop_files/konsole-desktops/km.po
index f543dd3f4..0215ba29c 100644
--- a/translations/desktop_files/konsole-desktops/km.po
+++ b/translations/desktop_files/konsole-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ko.po b/translations/desktop_files/konsole-desktops/ko.po
index 024e124af..61181b07a 100644
--- a/translations/desktop_files/konsole-desktops/ko.po
+++ b/translations/desktop_files/konsole-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/konsole-desktops.pot b/translations/desktop_files/konsole-desktops/konsole-desktops.pot
index b4c3c77e7..2d6540274 100644
--- a/translations/desktop_files/konsole-desktops/konsole-desktops.pot
+++ b/translations/desktop_files/konsole-desktops/konsole-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
@@ -32,8 +32,7 @@ msgid "konsole;console;terminal;"
 msgstr ""
 
 #. Name
-#: konsole-script.desktop:9 konsole.desktop:9
-#: konsolesu.desktop:10
+#: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
 msgid "Konsole"
 msgstr ""
 
@@ -99,8 +98,8 @@ msgstr ""
 
 #. Name
 #. Title0
-#: other/shell.desktop:3 other/2shells:6
-#: other/3shells:6 other/4shells:6 other/5shells:6
+#: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6
+#: other/5shells:6
 msgid "Shell"
 msgstr ""
 
@@ -145,8 +144,7 @@ msgid "Two consoles"
 msgstr ""
 
 #. Title1
-#: other/2shells:7 other/3shells:7 other/4shells:7
-#: other/5shells:7
+#: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
 msgid "Shell No. 2"
 msgstr ""
 
diff --git a/translations/desktop_files/konsole-desktops/lo.po b/translations/desktop_files/konsole-desktops/lo.po
index 09451f565..338aa1bb3 100644
--- a/translations/desktop_files/konsole-desktops/lo.po
+++ b/translations/desktop_files/konsole-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/lt.po b/translations/desktop_files/konsole-desktops/lt.po
index e7a441f0c..161c6d4f6 100644
--- a/translations/desktop_files/konsole-desktops/lt.po
+++ b/translations/desktop_files/konsole-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/lv.po b/translations/desktop_files/konsole-desktops/lv.po
index 60c2fa009..a02c9d0c7 100644
--- a/translations/desktop_files/konsole-desktops/lv.po
+++ b/translations/desktop_files/konsole-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/mk.po b/translations/desktop_files/konsole-desktops/mk.po
index f727cce81..88459616b 100644
--- a/translations/desktop_files/konsole-desktops/mk.po
+++ b/translations/desktop_files/konsole-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/mn.po b/translations/desktop_files/konsole-desktops/mn.po
index d6b7af091..1fd3472db 100644
--- a/translations/desktop_files/konsole-desktops/mn.po
+++ b/translations/desktop_files/konsole-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ms.po b/translations/desktop_files/konsole-desktops/ms.po
index 5061745a3..457aa6e26 100644
--- a/translations/desktop_files/konsole-desktops/ms.po
+++ b/translations/desktop_files/konsole-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/mt.po b/translations/desktop_files/konsole-desktops/mt.po
index ab18a5005..ede4d7a3f 100644
--- a/translations/desktop_files/konsole-desktops/mt.po
+++ b/translations/desktop_files/konsole-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/nb.po b/translations/desktop_files/konsole-desktops/nb.po
index 81f271111..8846b19e4 100644
--- a/translations/desktop_files/konsole-desktops/nb.po
+++ b/translations/desktop_files/konsole-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/nds.po b/translations/desktop_files/konsole-desktops/nds.po
index 95471b090..8819687a7 100644
--- a/translations/desktop_files/konsole-desktops/nds.po
+++ b/translations/desktop_files/konsole-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ne.po b/translations/desktop_files/konsole-desktops/ne.po
index 01a4b0ece..1669669e4 100644
--- a/translations/desktop_files/konsole-desktops/ne.po
+++ b/translations/desktop_files/konsole-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/nl.po b/translations/desktop_files/konsole-desktops/nl.po
index b502730b4..725cba957 100644
--- a/translations/desktop_files/konsole-desktops/nl.po
+++ b/translations/desktop_files/konsole-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/nn.po b/translations/desktop_files/konsole-desktops/nn.po
index ee1c512b9..d14c6d768 100644
--- a/translations/desktop_files/konsole-desktops/nn.po
+++ b/translations/desktop_files/konsole-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/nso.po b/translations/desktop_files/konsole-desktops/nso.po
index aaec2e818..50f552afa 100644
--- a/translations/desktop_files/konsole-desktops/nso.po
+++ b/translations/desktop_files/konsole-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/oc.po b/translations/desktop_files/konsole-desktops/oc.po
index 5714e95ba..82afc7327 100644
--- a/translations/desktop_files/konsole-desktops/oc.po
+++ b/translations/desktop_files/konsole-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/pa.po b/translations/desktop_files/konsole-desktops/pa.po
index 76735856d..5ff0f7057 100644
--- a/translations/desktop_files/konsole-desktops/pa.po
+++ b/translations/desktop_files/konsole-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/pl.po b/translations/desktop_files/konsole-desktops/pl.po
index 912a23bef..6e7ab0fe5 100644
--- a/translations/desktop_files/konsole-desktops/pl.po
+++ b/translations/desktop_files/konsole-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-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.1.1\n"
 
 #. Name
 #: kcmkonsole.desktop:9
@@ -80,7 +82,6 @@ msgstr "Konsola linuksowa (nowa)"
 
 #. Name
 #: other/mc.desktop:3
-#, fuzzy
 msgid "Midnight Commander"
 msgstr "Midnight Commander"
 
@@ -124,7 +125,7 @@ msgstr "Nowa powłoka administratora"
 #. Name
 #: other/sumc.desktop.cmake:3
 msgid "Root Midnight Commander"
-msgstr "Midnight Commander  - tryb administratora"
+msgstr "Midnight Commander - tryb administratora"
 
 #. Comment
 #: other/sumc.desktop.cmake:4
@@ -133,9 +134,8 @@ msgstr "Midnight Commander - tryb administratora"
 
 #. Name
 #: terminalhere.desktop:6
-#, fuzzy
 msgid "Terminal"
-msgstr "Program terminala"
+msgstr "Terminal"
 
 #. Name
 #: terminalhere.desktop:11
@@ -144,47 +144,40 @@ msgstr "Otwórz tutaj terminal"
 
 #. Name
 #: other/2shells:2
-#, fuzzy
 msgid "Two consoles"
-msgstr "Konsola"
+msgstr "Dwa terminale"
 
 #. Title1
 #: other/2shells:7 other/3shells:7 other/4shells:7 other/5shells:7
-#, fuzzy
 msgid "Shell No. 2"
-msgstr "Powłoka"
+msgstr "Powłoka nr 2"
 
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "Trzy terminale"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
-#, fuzzy
 msgid "Shell No. 3"
-msgstr "Powłoka"
+msgstr "Powłoka nr 3"
 
 #. Name
 #: other/4shells:2
-#, fuzzy
 msgid "Four consoles"
-msgstr "Konsola linuksowa"
+msgstr "Cztery terminale"
 
 #. Title3
 #: other/4shells:9 other/5shells:9
-#, fuzzy
 msgid "Shell No. 4"
-msgstr "Powłoka"
+msgstr "Powłoka nr 4"
 
 #. Name
 #: other/5shells:2
-#, fuzzy
 msgid "Five consoles"
-msgstr "Konsola linuksowa"
+msgstr "Pięć terminali"
 
 #. Title4
 #: other/5shells:10
-#, fuzzy
 msgid "Shell No. 5"
-msgstr "Powłoka"
+msgstr "Powłoka nr 5"
diff --git a/translations/desktop_files/konsole-desktops/pt.po b/translations/desktop_files/konsole-desktops/pt.po
index 8d5f4c4b3..bc862c2d7 100644
--- a/translations/desktop_files/konsole-desktops/pt.po
+++ b/translations/desktop_files/konsole-desktops/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/pt_BR.po b/translations/desktop_files/konsole-desktops/pt_BR.po
index 69ac0b086..5a321f5f6 100644
--- a/translations/desktop_files/konsole-desktops/pt_BR.po
+++ b/translations/desktop_files/konsole-desktops/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-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ro.po b/translations/desktop_files/konsole-desktops/ro.po
index 0da700660..ccdace4af 100644
--- a/translations/desktop_files/konsole-desktops/ro.po
+++ b/translations/desktop_files/konsole-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ru.po b/translations/desktop_files/konsole-desktops/ru.po
index 13b912af9..3fba2ec5b 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: 2020-06-26 02:40+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2024-04-12 17:44+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
@@ -158,7 +160,7 @@ msgstr "Кон�оль"
 #. Name
 #: other/3shells:2
 msgid "Three consoles"
-msgstr ""
+msgstr "Три кон�оли"
 
 #. Title2
 #: other/3shells:8 other/4shells:8 other/5shells:8
diff --git a/translations/desktop_files/konsole-desktops/rw.po b/translations/desktop_files/konsole-desktops/rw.po
index 288f6ddec..06aa35d64 100644
--- a/translations/desktop_files/konsole-desktops/rw.po
+++ b/translations/desktop_files/konsole-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/se.po b/translations/desktop_files/konsole-desktops/se.po
index 5f10c54c1..c847aaa02 100644
--- a/translations/desktop_files/konsole-desktops/se.po
+++ b/translations/desktop_files/konsole-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/sk.po b/translations/desktop_files/konsole-desktops/sk.po
index ef72b1c5b..dfcfa28f1 100644
--- a/translations/desktop_files/konsole-desktops/sk.po
+++ b/translations/desktop_files/konsole-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/sl.po b/translations/desktop_files/konsole-desktops/sl.po
index ec283d903..8c9c394cb 100644
--- a/translations/desktop_files/konsole-desktops/sl.po
+++ b/translations/desktop_files/konsole-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/sr.po b/translations/desktop_files/konsole-desktops/sr.po
index 3e5353581..b8d2504c6 100644
--- a/translations/desktop_files/konsole-desktops/sr.po
+++ b/translations/desktop_files/konsole-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/sr@Latn.po b/translations/desktop_files/konsole-desktops/sr@Latn.po
index 6e1cef777..787dcdd43 100644
--- a/translations/desktop_files/konsole-desktops/sr@Latn.po
+++ b/translations/desktop_files/konsole-desktops/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-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ss.po b/translations/desktop_files/konsole-desktops/ss.po
index 4cdc0758c..e656a09fc 100644
--- a/translations/desktop_files/konsole-desktops/ss.po
+++ b/translations/desktop_files/konsole-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/sv.po b/translations/desktop_files/konsole-desktops/sv.po
index 9e8690f23..0f05c383a 100644
--- a/translations/desktop_files/konsole-desktops/sv.po
+++ b/translations/desktop_files/konsole-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ta.po b/translations/desktop_files/konsole-desktops/ta.po
index 553d0a9d9..ad66aa0c4 100644
--- a/translations/desktop_files/konsole-desktops/ta.po
+++ b/translations/desktop_files/konsole-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/te.po b/translations/desktop_files/konsole-desktops/te.po
index 3b4e2083b..f12fe24fa 100644
--- a/translations/desktop_files/konsole-desktops/te.po
+++ b/translations/desktop_files/konsole-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/tg.po b/translations/desktop_files/konsole-desktops/tg.po
index 6726fa394..630db792c 100644
--- a/translations/desktop_files/konsole-desktops/tg.po
+++ b/translations/desktop_files/konsole-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/th.po b/translations/desktop_files/konsole-desktops/th.po
index 2d58815a8..0829510f5 100644
--- a/translations/desktop_files/konsole-desktops/th.po
+++ b/translations/desktop_files/konsole-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/tr.po b/translations/desktop_files/konsole-desktops/tr.po
index edc443163..be46f3c8a 100644
--- a/translations/desktop_files/konsole-desktops/tr.po
+++ b/translations/desktop_files/konsole-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/tt.po b/translations/desktop_files/konsole-desktops/tt.po
index 4e674b9a0..1a53f321b 100644
--- a/translations/desktop_files/konsole-desktops/tt.po
+++ b/translations/desktop_files/konsole-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/uk.po b/translations/desktop_files/konsole-desktops/uk.po
index 024e26872..1e08d7d3e 100644
--- a/translations/desktop_files/konsole-desktops/uk.po
+++ b/translations/desktop_files/konsole-desktops/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/konsole-desktops/uz.po b/translations/desktop_files/konsole-desktops/uz.po
index fd1b014dc..f9902559b 100644
--- a/translations/desktop_files/konsole-desktops/uz.po
+++ b/translations/desktop_files/konsole-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/uz@cyrillic.po b/translations/desktop_files/konsole-desktops/uz@cyrillic.po
index 29e430601..b9af86557 100644
--- a/translations/desktop_files/konsole-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/konsole-desktops/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-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/ven.po b/translations/desktop_files/konsole-desktops/ven.po
index b543964c2..638f5b701 100644
--- a/translations/desktop_files/konsole-desktops/ven.po
+++ b/translations/desktop_files/konsole-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/vi.po b/translations/desktop_files/konsole-desktops/vi.po
index 7b20c08a9..b64e03c1a 100644
--- a/translations/desktop_files/konsole-desktops/vi.po
+++ b/translations/desktop_files/konsole-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/wa.po b/translations/desktop_files/konsole-desktops/wa.po
index 8c3518ec4..87327bba7 100644
--- a/translations/desktop_files/konsole-desktops/wa.po
+++ b/translations/desktop_files/konsole-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/xh.po b/translations/desktop_files/konsole-desktops/xh.po
index 7b47c73e2..2ca58334a 100644
--- a/translations/desktop_files/konsole-desktops/xh.po
+++ b/translations/desktop_files/konsole-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/zh_CN.po b/translations/desktop_files/konsole-desktops/zh_CN.po
index cb0554104..8cd38a5a1 100644
--- a/translations/desktop_files/konsole-desktops/zh_CN.po
+++ b/translations/desktop_files/konsole-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
+# Wantao Liu <vantao@aosc.io>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konsole-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
 #: kcmkonsole.desktop:9
@@ -24,18 +25,17 @@ msgstr "控制�"
 #. GenericName
 #: kcmkonsole.desktop:11
 msgid "All Konsole Settings"
-msgstr "Konsole 的全部设置"
+msgstr "Konsole 设置"
 
 #. Keywords
 #: kcmkonsole.desktop:13
 msgid "konsole;console;terminal;"
-msgstr "konsole;console;terminal;终端;控制�;"
+msgstr "konsole，控制� (console)，终端 (terminal);"
 
 #. Name
 #: konsole-script.desktop:9 konsole.desktop:9 konsolesu.desktop:10
-#, fuzzy
 msgid "Konsole"
-msgstr "控制�"
+msgstr "Konsole"
 
 #. GenericName
 #: konsole-script.desktop:11 konsole.desktop:11
@@ -45,27 +45,27 @@ msgstr "终端程�"
 #. Comment
 #: konsole/x-konsole.desktop:7
 msgid "File to Open a Shell"
-msgstr "打开 Shell 的文件"
+msgstr "用于打开 Shell 的文件类型"
 
 #. Name
 #: konsolepart.desktop:14 terminalemulator.desktop:5
 msgid "Terminal Emulator"
-msgstr "终端仿真器"
+msgstr "终端模拟器"
 
 #. GenericName
 #: konsolesu.desktop:12
 msgid "Terminal Program - Super User Mode"
-msgstr "终端程� - 超级用户模�"
+msgstr "终端程�：超级用户模�"
 
 #. Name
 #: kwrited.desktop:2
 msgid "TDE Write Daemon"
-msgstr "TDE Write 守护程�"
+msgstr "TDE Write 守护进程"
 
 #. Comment
 #: kwrited.desktop:4
 msgid "Watch for messages from local users sent with write(1) or wall(1)"
-msgstr "监视本地用户�出的 write(1) 或 wall(1)"
+msgstr "监视本地用户�出的 write(1) 或 wall(1) 消�"
 
 #. Name
 #: other/linux.desktop:3
@@ -79,14 +79,13 @@ 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
@@ -102,7 +101,6 @@ msgstr "新建�幕会�"
 #. Title0
 #: other/shell.desktop:3 other/2shells:6 other/3shells:6 other/4shells:6
 #: other/5shells:6
-#, fuzzy
 msgid "Shell"
 msgstr "新建 Shell"
 
@@ -113,80 +111,70 @@ msgstr "新建 Shell"
 
 #. Name
 #: other/su.desktop.cmake:3
-#, fuzzy
 msgid "Root Shell"
-msgstr "新建 Root Shell"
+msgstr "以管�员身份 (root) 新建 Shell"
 
 #. Comment
 #: other/su.desktop.cmake:4
 msgid "New Root Shell"
-msgstr "新建 Root Shell"
+msgstr "以管�员身份 (root) 新建 Shell"
 
 #. Name
 #: other/sumc.desktop.cmake:3
-#, fuzzy
 msgid "Root Midnight Commander"
-msgstr "新建 Root Midnight Commander"
+msgstr "以管�员身份 (root) 打开 Midnight Commander 界�"
 
 #. Comment
 #: other/sumc.desktop.cmake:4
 msgid "New Root Midnight Commander"
-msgstr "新建 Root Midnight Commander"
+msgstr "以管�员身份 (root) 打开 Midnight Commander 界�"
 
 #. Name
 #: terminalhere.desktop:6
-#, fuzzy
 msgid "Terminal"
-msgstr "终端程�"
+msgstr "终端"
 
 #. Name
 #: terminalhere.desktop:11
 msgid "Open Terminal Here"
-msgstr "在此打开终端"
+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 � Shell"
 
 #. 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 � Shell"
 
 #. 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 � Shell"
 
 #. Name
 #: other/5shells:2
-#, fuzzy
 msgid "Five consoles"
-msgstr "Linux 控制�"
+msgstr "五个控制�"
 
 #. Title4
 #: other/5shells:10
-#, fuzzy
 msgid "Shell No. 5"
-msgstr "新建 Shell"
+msgstr "5 � Shell"
diff --git a/translations/desktop_files/konsole-desktops/zh_TW.po b/translations/desktop_files/konsole-desktops/zh_TW.po
index 25b450353..145f07325 100644
--- a/translations/desktop_files/konsole-desktops/zh_TW.po
+++ b/translations/desktop_files/konsole-desktops/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-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-desktops/zu.po b/translations/desktop_files/konsole-desktops/zu.po
index 12f646fdc..fb3583d3f 100644
--- a/translations/desktop_files/konsole-desktops/zu.po
+++ b/translations/desktop_files/konsole-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-26 02:40+0200\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"
diff --git a/translations/desktop_files/konsole-eventsrc/cs.po b/translations/desktop_files/konsole-eventsrc/cs.po
index 1a9e1eee1..13ea1e12c 100644
--- a/translations/desktop_files/konsole-eventsrc/cs.po
+++ b/translations/desktop_files/konsole-eventsrc/cs.po
@@ -1,72 +1,73 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-10-11 17:31+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/konsole-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.2.2\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Name
 #: eventsrc:6
 msgid "Bell in visible session"
-msgstr "Zvonek ve viditelné relaci"
+msgstr "Zvonek ve viditelném sezení"
 
 #. Comment
 #: eventsrc:7
 msgid "Bell emitted within a visible session"
-msgstr "Vydán zvonek ve viditelné relaci"
+msgstr "Vydán zvonek ve viditelném sezení"
 
 #. Name
 #: eventsrc:12
 msgid "Bell in non-visible session"
-msgstr "Zvonek v neviditelné relaci"
+msgstr "Zvonek v neviditelném sezení"
 
 #. Comment
 #: eventsrc:13
 msgid "Bell emitted within a non-visible session"
-msgstr "Vydán zvonek v neviditelné relaci"
+msgstr "Vydán zvonek v neviditelném sezení"
 
 #. Name
 #: eventsrc:18
 msgid "Activity in monitored session"
-msgstr "Aktivita v monitorované relaci"
+msgstr "Aktivita v monitorovaném sezení"
 
 #. Comment
 #: eventsrc:19
 msgid "Activity detected in a monitored session"
-msgstr "Detekována aktivita v monitorované relaci"
+msgstr "Detekována aktivita v monitorovaném sezení"
 
 #. Name
 #: eventsrc:23
 msgid "Silence in monitored session"
-msgstr "Ticho v monitorované relaci"
+msgstr "Ticho v monitorovaném sezení"
 
 #. Comment
 #: eventsrc:24
 msgid "Silence detected in a monitored session"
-msgstr "Detekováno ticho v monitorované relaci"
+msgstr "Detekováno ticho v monitorovaném sezení"
 
 #. Name
 #: eventsrc:28
 msgid "Session finished with non-zero status"
-msgstr "Relace ukon�ena s nenulovým stavem"
+msgstr "Sezení ukon�eno s nenulovým stavem"
 
 #. Comment
 #: eventsrc:29
 msgid "A session has exited with non-zero status"
-msgstr "Relace byla ukon�ena s nenulovým stavem"
+msgstr "Sezení bylo ukon�eno s nenulovým stavem"
diff --git a/translations/desktop_files/konsole-eventsrc/it.po b/translations/desktop_files/konsole-eventsrc/it.po
index d4ed75a10..cc983f740 100644
--- a/translations/desktop_files/konsole-eventsrc/it.po
+++ b/translations/desktop_files/konsole-eventsrc/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-01-21 15:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-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.10.1\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Name
 #: eventsrc:6
diff --git a/translations/desktop_files/konsole-eventsrc/pl.po b/translations/desktop_files/konsole-eventsrc/pl.po
index 6abcdf343..a2db92a6c 100644
--- a/translations/desktop_files/konsole-eventsrc/pl.po
+++ b/translations/desktop_files/konsole-eventsrc/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek W <coronzon88@gmail.com>, 2022.
 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: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-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.13.1\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsola"
 
 #. 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/konsole-eventsrc/ru.po b/translations/desktop_files/konsole-eventsrc/ru.po
index 790e4729c..5bf25c484 100644
--- a/translations/desktop_files/konsole-eventsrc/ru.po
+++ b/translations/desktop_files/konsole-eventsrc/ru.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2022.
 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: 2022-02-14 23:01+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/konsole-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.10.1\n"
 
 #. Comment
 #: eventsrc:3
 msgid "Konsole"
-msgstr ""
+msgstr "Konsole"
 
 #. Name
 #: eventsrc:6
diff --git a/translations/desktop_files/konsole-eventsrc/zh_CN.po b/translations/desktop_files/konsole-eventsrc/zh_CN.po
index ed9fe8fc1..b827b2400 100644
--- a/translations/desktop_files/konsole-eventsrc/zh_CN.po
+++ b/translations/desktop_files/konsole-eventsrc/zh_CN.po
@@ -1,72 +1,73 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Wantao Liu <vantao@aosc.io>, 2023.
 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: 2023-08-23 07:29+0000\n"
+"Last-Translator: Wantao Liu <vantao@aosc.io>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/tdebase/konsole-events/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"
 
 #. 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
 msgid "Silence in monitored session"
-msgstr "被监视会�中的缄默"
+msgstr "�监视会�中无活动"
 
 #. Comment
 #: eventsrc:24
 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/kpager.desktop/cs.po b/translations/desktop_files/kpager.desktop/cs.po
index 694b972fe..5e6c10cb2 100644
--- a/translations/desktop_files/kpager.desktop/cs.po
+++ b/translations/desktop_files/kpager.desktop/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kpager-kpagerdesktop/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.2.2\n"
 
 #. Name
 #: kpager.desktop:2
 msgid "KPager"
-msgstr ""
+msgstr "KPager"
 
 #. GenericName
 #: kpager.desktop:4
diff --git a/translations/desktop_files/kpager.desktop/el.po b/translations/desktop_files/kpager.desktop/el.po
index 2ecab5dbc..c45bb23f0 100644
--- a/translations/desktop_files/kpager.desktop/el.po
+++ b/translations/desktop_files/kpager.desktop/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>, 2021.
 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: 2021-06-18 12:07+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kpager-kpagerdesktop/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.6.2\n"
 
 #. Name
 #: kpager.desktop:2
 msgid "KPager"
-msgstr ""
+msgstr "KPager"
 
 #. GenericName
 #: kpager.desktop:4
diff --git a/translations/desktop_files/kpager.desktop/it.po b/translations/desktop_files/kpager.desktop/it.po
index 0b2c70b2c..4083b010c 100644
--- a/translations/desktop_files/kpager.desktop/it.po
+++ b/translations/desktop_files/kpager.desktop/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-01-25 04:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpager-kpagerdesktop/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.10.1\n"
 
 #. Name
 #: kpager.desktop:2
 msgid "KPager"
-msgstr ""
+msgstr "KPager"
 
 #. GenericName
 #: kpager.desktop:4
diff --git a/translations/desktop_files/kpager.desktop/pl.po b/translations/desktop_files/kpager.desktop/pl.po
index c42713b74..a141ac648 100644
--- a/translations/desktop_files/kpager.desktop/pl.po
+++ b/translations/desktop_files/kpager.desktop/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpager-kpagerdesktop/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.1.1\n"
 
 #. Name
 #: kpager.desktop:2
 msgid "KPager"
-msgstr ""
+msgstr "Przełącznik pulpitów"
 
 #. GenericName
 #: kpager.desktop:4
diff --git a/translations/desktop_files/kpager.desktop/ru.po b/translations/desktop_files/kpager.desktop/ru.po
index a776778b0..f824a21d0 100644
--- a/translations/desktop_files/kpager.desktop/ru.po
+++ b/translations/desktop_files/kpager.desktop/ru.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# blu.256 <mavridisf@gmail.com>, 2021.
 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: 2021-06-18 12:07+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpager-kpagerdesktop/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.6.2\n"
 
 #. Name
 #: kpager.desktop:2
 msgid "KPager"
-msgstr ""
+msgstr "Пейджер"
 
 #. GenericName
 #: kpager.desktop:4
diff --git a/translations/desktop_files/kpersonalizer.desktop/cs.po b/translations/desktop_files/kpersonalizer.desktop/cs.po
index de28432e1..94a3d41c0 100644
--- a/translations/desktop_files/kpersonalizer.desktop/cs.po
+++ b/translations/desktop_files/kpersonalizer.desktop/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kpersonalizer-kpersonalizerdesktop/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.2.2\n"
 
 #. Name
 #: kpersonalizer.desktop:7
 msgid "KPersonalizer"
-msgstr ""
+msgstr "KPersonalizer"
 
 #. GenericName
 #: kpersonalizer.desktop:9
diff --git a/translations/desktop_files/kpersonalizer.desktop/el.po b/translations/desktop_files/kpersonalizer.desktop/el.po
index 6dab1adfe..8084cdb81 100644
--- a/translations/desktop_files/kpersonalizer.desktop/el.po
+++ b/translations/desktop_files/kpersonalizer.desktop/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>, 2021.
 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: 2021-06-18 12:07+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/kpersonalizer-kpersonalizerdesktop/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.6.2\n"
 
 #. Name
 #: kpersonalizer.desktop:7
 msgid "KPersonalizer"
-msgstr ""
+msgstr "KPersonalizer"
 
 #. GenericName
 #: kpersonalizer.desktop:9
diff --git a/translations/desktop_files/kpersonalizer.desktop/it.po b/translations/desktop_files/kpersonalizer.desktop/it.po
index 03a032544..b13bd3eee 100644
--- a/translations/desktop_files/kpersonalizer.desktop/it.po
+++ b/translations/desktop_files/kpersonalizer.desktop/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-01-21 15:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpersonalizer-kpersonalizerdesktop/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.10.1\n"
 
 #. Name
 #: kpersonalizer.desktop:7
 msgid "KPersonalizer"
-msgstr ""
+msgstr "KPersonalizer"
 
 #. GenericName
 #: kpersonalizer.desktop:9
diff --git a/translations/desktop_files/kpersonalizer.desktop/pl.po b/translations/desktop_files/kpersonalizer.desktop/pl.po
index 10fe565b7..bb8abeea0 100644
--- a/translations/desktop_files/kpersonalizer.desktop/pl.po
+++ b/translations/desktop_files/kpersonalizer.desktop/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpersonalizer-kpersonalizerdesktop/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.1.1\n"
 
 #. Name
 #: kpersonalizer.desktop:7
 msgid "KPersonalizer"
-msgstr ""
+msgstr "Personalizacja TDE"
 
 #. GenericName
 #: kpersonalizer.desktop:9
diff --git a/translations/desktop_files/kpersonalizer.desktop/ru.po b/translations/desktop_files/kpersonalizer.desktop/ru.po
index ae7793078..0d440178c 100644
--- a/translations/desktop_files/kpersonalizer.desktop/ru.po
+++ b/translations/desktop_files/kpersonalizer.desktop/ru.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# blu.256 <mavridisf@gmail.com>, 2021.
 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: 2021-06-18 12:07+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/kpersonalizer-kpersonalizerdesktop/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.6.2\n"
 
 #. Name
 #: kpersonalizer.desktop:7
 msgid "KPersonalizer"
-msgstr ""
+msgstr "KPersonalizer"
 
 #. GenericName
 #: kpersonalizer.desktop:9
diff --git a/translations/desktop_files/ksplash-desktops/cs.po b/translations/desktop_files/ksplash-desktops/cs.po
index 7dea9d922..11d04e18f 100644
--- a/translations/desktop_files/ksplash-desktops/cs.po
+++ b/translations/desktop_files/ksplash-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksplash-desktop-files/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.2.2\n"
 
 #. Name
 #: kcmksplash/ksplashthememgr.desktop:12
@@ -29,18 +30,17 @@ msgstr "Správce motivů úvodních obrazovek"
 #. Keywords
 #: kcmksplash/ksplashthememgr.desktop:16
 msgid "splash screen;splash theme;startup;"
-msgstr "úvodní obrazovka;splash;"
+msgstr "úvodní obrazovka;splash;spuštění;"
 
 #. Name
 #: ksplash.desktop:2
-#, fuzzy
 msgid "KSplash"
-msgstr "Staré"
+msgstr "KSplash"
 
 #. Name
 #: themeengine/default/ksplashdefault.desktop:3
 msgid "KSplashLegacy"
-msgstr "Staré"
+msgstr "Klasický"
 
 #. Comment
 #: themeengine/default/ksplashdefault.desktop:4
@@ -48,7 +48,7 @@ msgstr "Staré"
 #: themeengine/standard/ksplashstandard.desktop:4
 #: themeengine/unified/ksplashunified.desktop:4
 msgid "KSplash Plugin"
-msgstr "Modul aplikaci KSplash"
+msgstr "Modul aplikace KSplash"
 
 #. Name
 #: themeengine/redmond/ksplashredmond.desktop:3
@@ -62,6 +62,5 @@ msgstr "Standardní"
 
 #. Name
 #: themeengine/unified/ksplashunified.desktop:3
-#, fuzzy
 msgid "KSplashUnified"
-msgstr "Redmond"
+msgstr "Jednotný"
diff --git a/translations/desktop_files/ksplash-desktops/it.po b/translations/desktop_files/ksplash-desktops/it.po
index 738af2942..58805eaa4 100644
--- a/translations/desktop_files/ksplash-desktops/it.po
+++ b/translations/desktop_files/ksplash-desktops/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-01-29 11:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-desktop-files/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.10.1\n"
 
 #. Name
 #: kcmksplash/ksplashthememgr.desktop:12
@@ -33,9 +34,8 @@ msgstr "schermata di avvio;splash screen;tema schermata di avvio;avvio;"
 
 #. Name
 #: ksplash.desktop:2
-#, fuzzy
 msgid "KSplash"
-msgstr "KSplashVecchio"
+msgstr "KSplash"
 
 #. Name
 #: themeengine/default/ksplashdefault.desktop:3
@@ -53,14 +53,14 @@ msgstr "Plugin 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/pl.po b/translations/desktop_files/ksplash-desktops/pl.po
index 9421c5986..3cf341933 100644
--- a/translations/desktop_files/ksplash-desktops/pl.po
+++ b/translations/desktop_files/ksplash-desktops/pl.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2021.
 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: 2021-10-18 20:31+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-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.8.1\n"
 
 #. Name
 #: kcmksplash/ksplashthememgr.desktop:12
@@ -33,14 +36,13 @@ msgstr "ekran powitalny;motyw ekranu powitalnego;rozpoczęcie;start;"
 
 #. Name
 #: ksplash.desktop:2
-#, fuzzy
 msgid "KSplash"
-msgstr "Wtyczka KSplash"
+msgstr "KSplash"
 
 #. Name
 #: themeengine/default/ksplashdefault.desktop:3
 msgid "KSplashLegacy"
-msgstr ""
+msgstr "Klasyczny KSplash"
 
 #. Comment
 #: themeengine/default/ksplashdefault.desktop:4
@@ -53,14 +55,14 @@ msgstr "Wtyczka KSplash"
 #. Name
 #: themeengine/redmond/ksplashredmond.desktop:3
 msgid "KSplashRedmond"
-msgstr ""
+msgstr "KSplash Redmond"
 
 #. Name
 #: themeengine/standard/ksplashstandard.desktop:3
 msgid "KSplashStandard"
-msgstr ""
+msgstr "Standardowy KSplash"
 
 #. Name
 #: themeengine/unified/ksplashunified.desktop:3
 msgid "KSplashUnified"
-msgstr ""
+msgstr "Ujednolicony KSplash"
diff --git a/translations/desktop_files/ksplash-desktops/ru.po b/translations/desktop_files/ksplash-desktops/ru.po
index 710b0aad7..c78a51038 100644
--- a/translations/desktop_files/ksplash-desktops/ru.po
+++ b/translations/desktop_files/ksplash-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>, 2023.
 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: 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/ksplash-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
 #: kcmksplash/ksplashthememgr.desktop:12
@@ -29,18 +31,17 @@ 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
@@ -53,14 +54,14 @@ 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-themes/cs.po b/translations/desktop_files/ksplash-themes/cs.po
new file mode 100644
index 000000000..a4d044b4b
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/cs.po
@@ -0,0 +1,100 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
+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-01-31 02:00+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksplash-themes/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.4.2\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "Úvodní obrazovka TDE 3.5"
+
+#. Description
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr "Vlny změn"
+
+#. Name
+#: pics/themes/blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr "Úvodní obrazovka modrá směs KDE"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "Na�íst KSplash motiv modrá směs KDE."
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+msgid "Refresh TDE Splash Theme"
+msgstr "Úvodní obrazovka osvěžené TDE"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "Na�íst KSplash motiv osvěžené TDE."
+
+#. Name
+#: pics/themes/none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr "Bez úvodní obrazovky"
+
+#. Description
+#: pics/themes/none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr "Úvodní obrazovka bude vypnuta"
+
+#. Name
+#: pics/themes/simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr "Jednoduchá úvodní obrazovka"
+
+#. Description
+#: pics/themes/simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr "Jednoduchá optimalizovaná úvodní obrazovka"
+
+#. Name
+#: pics/themes/unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr "Jednotná úvodní obrazovka Trinity"
+
+#. Description
+#: pics/themes/unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr "Jednotná systémová úvodní obrazovka"
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr "Úvodní obrazovka Redmond"
+
+#. Description
+#: themeengine/redmond/Theme.rc:3
+msgid "KSplash theme inspired by the Microsoft Windows startup screen."
+msgstr "KSplash motiv inspirovaný úvodní obrazovkou Microsoft Windows."
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr "Standardní úvodní obrazovka"
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr "Standardní KSplash motiv TDE."
diff --git a/translations/desktop_files/ksplash-themes/el.po b/translations/desktop_files/ksplash-themes/el.po
new file mode 100644
index 000000000..b986ce7d3
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/el.po
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# blu.256 <mavridisf@gmail.com>, 2022.
+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: 2022-09-18 17:59+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksplash-themes/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.13.1\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "Θέμα KSplash TDE"
+
+#. 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."
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+#, fuzzy
+msgid "Refresh TDE Splash Theme"
+msgstr "KSplash Ανανέωαη"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "Χ�ήση θέματος"
+
+#. 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 ""
+
+#. 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 ""
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr ""
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr ""
diff --git a/translations/desktop_files/ksplash-themes/es.po b/translations/desktop_files/ksplash-themes/es.po
index 79a9fdf3e..d1713d986 100644
--- a/translations/desktop_files/ksplash-themes/es.po
+++ b/translations/desktop_files/ksplash-themes/es.po
@@ -1,77 +1,100 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 19:33+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: 2021-01-24 18:26+0100\n"
+"PO-Revision-Date: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-themes/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.13.1\n"
 
 #. Name
-#: TDE-Classic/Theme.rc:4 TDE-Classic/locolor/Theme.rc:4
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
 msgid "TDE 3.5 Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora de TDE 3.5"
 
 #. Description
-#: TDE-Classic/Theme.rc:5 TDE-Classic/locolor/Theme.rc:5
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
 msgid "Waves of change"
-msgstr ""
+msgstr "Olas del cambio"
 
 #. Name
-#: blue-bend/Theme.rc:6
+#: pics/themes/blue-bend/Theme.rc:6
 msgid "Blue-Bend KDE Splash Theme"
-msgstr ""
+msgstr "Tema de Anunciador KDE Azul-curvado"
 
 #. Description
-#: blue-bend/Theme.rc:7
+#: pics/themes/blue-bend/Theme.rc:7
 msgid "Load Blue-Bend KDE KSplash theme."
-msgstr ""
+msgstr "Carga el Tema KDE Azul-curvado."
 
 #. Name
-#: default/Theme.rc:6
+#: pics/themes/default/Theme.rc:6
 msgid "Refresh TDE Splash Theme"
-msgstr ""
+msgstr "Tema de Anunciador TDE Refrescado"
 
 #. Description
-#: default/Theme.rc:7
+#: pics/themes/default/Theme.rc:7
 msgid "Load Refresh TDE KSplash theme."
-msgstr ""
+msgstr "Carga el tema KSplash TDE Refrescado."
 
 #. Name
-#: none/Theme.rc:4
+#: pics/themes/none/Theme.rc:4
 msgid "No Splash Screen"
-msgstr ""
+msgstr "Sin Pantalla Anunciadora"
 
 #. Description
-#: none/Theme.rc:5
+#: pics/themes/none/Theme.rc:5
 msgid "Splash Screen Turned Off"
-msgstr ""
+msgstr "Pantalla Anunciadora Apagada"
 
 #. Name
-#: simple/Theme.rc:4
+#: pics/themes/simple/Theme.rc:4
 msgid "Simple Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Simple"
 
 #. Description
-#: simple/Theme.rc:5
+#: pics/themes/simple/Theme.rc:5
 msgid "Very Simple Optimized Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Optimizada y Simple"
 
 #. Name
-#: unified/Theme.rc:4
+#: pics/themes/unified/Theme.rc:4
 msgid "Trinity Unified Splash Screen"
-msgstr ""
+msgstr "Pantalla Anunciadora Unificada de Trinity"
 
 #. Description
-#: unified/Theme.rc:5
+#: pics/themes/unified/Theme.rc:5
 msgid "Unified system startup screen"
-msgstr ""
+msgstr "Pantalla unificada de inicio del sistema"
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr "Pantalla 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 pantalla de inicio de Microsoft Windows."
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr "Pantalla 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/it.po b/translations/desktop_files/ksplash-themes/it.po
new file mode 100644
index 000000000..864a49a5b
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/it.po
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Leandro Nini <drfiemost@email.it>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
+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: 2022-01-29 11:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksplash-themes/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.10.1\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr "Splash Screen TDE 3.5"
+
+#. Description
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
+msgid "Waves of change"
+msgstr "Onde del cambiamento"
+
+#. Name
+#: pics/themes/blue-bend/Theme.rc:6
+msgid "Blue-Bend KDE Splash Theme"
+msgstr "Tema splash KDE Curva-Blu"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "Carica il tema KDE KSplash Curva-Blu."
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+msgid "Refresh TDE Splash Theme"
+msgstr "Ricarica il tema Splash TDE"
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr "Carica il tema Aggiorna TDE KSplash."
+
+#. Name
+#: pics/themes/none/Theme.rc:4
+msgid "No Splash Screen"
+msgstr "Nessuna Schermata Splash"
+
+#. Description
+#: pics/themes/none/Theme.rc:5
+msgid "Splash Screen Turned Off"
+msgstr "Schermata Splash Disattivata"
+
+#. Name
+#: pics/themes/simple/Theme.rc:4
+msgid "Simple Splash Screen"
+msgstr "Schermata Splash Semplice"
+
+#. Description
+#: pics/themes/simple/Theme.rc:5
+msgid "Very Simple Optimized Splash Screen"
+msgstr "Schermata Splash Molto Semplice e Ottimizzata"
+
+#. Name
+#: pics/themes/unified/Theme.rc:4
+msgid "Trinity Unified Splash Screen"
+msgstr "Schermata Splash Trinity Unificata"
+
+#. Description
+#: pics/themes/unified/Theme.rc:5
+msgid "Unified system startup screen"
+msgstr "Schermata di avvio sistema unificata"
+
+#. Name
+#: themeengine/redmond/Theme.rc:2
+msgid "Redmond Splash Screen"
+msgstr "Schermata Splash Redmond"
+
+#. Description
+#: themeengine/redmond/Theme.rc:3
+msgid "KSplash theme inspired by the Microsoft Windows startup screen."
+msgstr "Tema KSplash ispirato alla schermata di avvio di Microsoft Windows."
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr "Schermata Splash Standard"
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr "Tema KSplash TDE standard."
diff --git a/translations/desktop_files/ksplash-themes/ksplash-themes.pot b/translations/desktop_files/ksplash-themes/ksplash-themes.pot
index 1539d32ef..8289323cb 100644
--- a/translations/desktop_files/ksplash-themes/ksplash-themes.pot
+++ b/translations/desktop_files/ksplash-themes/ksplash-themes.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 19:33+0200\n"
+"POT-Creation-Date: 2021-01-24 18:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,61 +17,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: TDE-Classic/Theme.rc:4 TDE-Classic/locolor/Theme.rc:4
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
 msgid "TDE 3.5 Splash Screen"
 msgstr ""
 
 #. Description
-#: TDE-Classic/Theme.rc:5 TDE-Classic/locolor/Theme.rc:5
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
 msgid "Waves of change"
 msgstr ""
 
 #. Name
-#: blue-bend/Theme.rc:6
+#: pics/themes/blue-bend/Theme.rc:6
 msgid "Blue-Bend KDE Splash Theme"
 msgstr ""
 
 #. Description
-#: blue-bend/Theme.rc:7
+#: pics/themes/blue-bend/Theme.rc:7
 msgid "Load Blue-Bend KDE KSplash theme."
 msgstr ""
 
 #. Name
-#: default/Theme.rc:6
+#: pics/themes/default/Theme.rc:6
 msgid "Refresh TDE Splash Theme"
 msgstr ""
 
 #. Description
-#: default/Theme.rc:7
+#: pics/themes/default/Theme.rc:7
 msgid "Load Refresh TDE KSplash theme."
 msgstr ""
 
 #. Name
-#: none/Theme.rc:4
+#: pics/themes/none/Theme.rc:4
 msgid "No Splash Screen"
 msgstr ""
 
 #. Description
-#: none/Theme.rc:5
+#: pics/themes/none/Theme.rc:5
 msgid "Splash Screen Turned Off"
 msgstr ""
 
 #. Name
-#: simple/Theme.rc:4
+#: pics/themes/simple/Theme.rc:4
 msgid "Simple Splash Screen"
 msgstr ""
 
 #. Description
-#: simple/Theme.rc:5
+#: pics/themes/simple/Theme.rc:5
 msgid "Very Simple Optimized Splash Screen"
 msgstr ""
 
 #. Name
-#: unified/Theme.rc:4
+#: pics/themes/unified/Theme.rc:4
 msgid "Trinity Unified Splash Screen"
 msgstr ""
 
 #. Description
-#: unified/Theme.rc:5
+#: 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 ""
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr ""
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr ""
diff --git a/translations/desktop_files/ksplash-themes/pt.po b/translations/desktop_files/ksplash-themes/pt.po
new file mode 100644
index 000000000..999ac71ec
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/pt.po
@@ -0,0 +1,97 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020.
+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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: pics/themes/TDE-Classic/Theme.rc:4
+#: pics/themes/TDE-Classic/locolor/Theme.rc:4
+msgid "TDE 3.5 Splash Screen"
+msgstr ""
+
+#. 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 ""
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr ""
+
+#. Name
+#: pics/themes/default/Theme.rc:6
+msgid "Refresh TDE Splash Theme"
+msgstr ""
+
+#. Description
+#: pics/themes/default/Theme.rc:7
+msgid "Load Refresh TDE KSplash theme."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. Name
+#: themeengine/standard/Theme.rc:2
+msgid "Standard Splash Screen"
+msgstr ""
+
+#. Description
+#: themeengine/standard/Theme.rc:3
+msgid "Standard TDE KSplash theme."
+msgstr ""
diff --git a/translations/desktop_files/ksplash-themes/ru.po b/translations/desktop_files/ksplash-themes/ru.po
new file mode 100644
index 000000000..146be4e9a
--- /dev/null
+++ b/translations/desktop_files/ksplash-themes/ru.po
@@ -0,0 +1,101 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# 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: 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"
+"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
+#: 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 "Синий изгиб KDE"
+
+#. Description
+#: pics/themes/blue-bend/Theme.rc:7
+msgid "Load Blue-Bend KDE KSplash theme."
+msgstr "Тема KSplash «Синий изгиб KDE»."
+
+#. 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 "Тема за�тавки TDE Load Refresh."
+
+#. 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."
diff --git a/translations/desktop_files/ksplash-themes/uk.po b/translations/desktop_files/ksplash-themes/uk.po
index 819735171..6065f0d86 100644
--- a/translations/desktop_files/ksplash-themes/uk.po
+++ b/translations/desktop_files/ksplash-themes/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, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 19:33+0200\n"
-"PO-Revision-Date: 2020-07-22 06:31+0000\n"
+"POT-Creation-Date: 2021-01-24 18:26+0100\n"
+"PO-Revision-Date: 2021-02-03 18:44+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/ksplash-themes/uk/>\n"
@@ -16,64 +16,86 @@ 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.1.1\n"
+"X-Generator: Weblate 4.4.2\n"
 
 #. Name
-#: TDE-Classic/Theme.rc:4 TDE-Classic/locolor/Theme.rc:4
+#: 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
-#: TDE-Classic/Theme.rc:5 TDE-Classic/locolor/Theme.rc:5
+#: pics/themes/TDE-Classic/Theme.rc:5
+#: pics/themes/TDE-Classic/locolor/Theme.rc:5
 msgid "Waves of change"
 msgstr "Хвилі змін"
 
 #. Name
-#: blue-bend/Theme.rc:6
+#: pics/themes/blue-bend/Theme.rc:6
 msgid "Blue-Bend KDE Splash Theme"
 msgstr "За�тавка Екрану KDE Блакитний-Згин"
 
 #. Description
-#: blue-bend/Theme.rc:7
+#: pics/themes/blue-bend/Theme.rc:7
 msgid "Load Blue-Bend KDE KSplash theme."
 msgstr "Завантажити тему KDE KSplash Блакитний-Згин."
 
 #. Name
-#: default/Theme.rc:6
+#: pics/themes/default/Theme.rc:6
 msgid "Refresh TDE Splash Theme"
 msgstr "О�віжити Тему За�тавки TDE"
 
 #. Description
-#: default/Theme.rc:7
+#: pics/themes/default/Theme.rc:7
 msgid "Load Refresh TDE KSplash theme."
 msgstr "Завантажити тему TDE KSplash."
 
 #. Name
-#: none/Theme.rc:4
+#: pics/themes/none/Theme.rc:4
 msgid "No Splash Screen"
 msgstr "�емає За�тавки Екрану"
 
 #. Description
-#: none/Theme.rc:5
+#: pics/themes/none/Theme.rc:5
 msgid "Splash Screen Turned Off"
 msgstr "За�тавку Екрану Вимкнено"
 
 #. Name
-#: simple/Theme.rc:4
+#: pics/themes/simple/Theme.rc:4
 msgid "Simple Splash Screen"
 msgstr "Про�та За�тавка Екрану"
 
 #. Description
-#: simple/Theme.rc:5
+#: pics/themes/simple/Theme.rc:5
 msgid "Very Simple Optimized Splash Screen"
 msgstr "Дуже Про�та Оптимізована За�тавка Екрану"
 
 #. Name
-#: unified/Theme.rc:4
+#: pics/themes/unified/Theme.rc:4
 msgid "Trinity Unified Splash Screen"
 msgstr "Уніфікована За�тавка Екрану Trinity"
 
 #. Description
-#: unified/Theme.rc:5
+#: pics/themes/unified/Theme.rc:5
 msgid "Unified system startup screen"
 msgstr "Уніфікований �и�темний �тартовий екран"
+
+#. 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 "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/ksysguard-desktops/cs.po b/translations/desktop_files/ksysguard-desktops/cs.po
index b5e173581..269ef0958 100644
--- a/translations/desktop_files/ksysguard-desktops/cs.po
+++ b/translations/desktop_files/ksysguard-desktops/cs.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
 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: 2021-01-31 02:00+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksysguard-desktop-files/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.4.2\n"
 
 #. Name
 #: gui/ksysguard.desktop:2
-#, fuzzy
 msgid "KSysGuard"
-msgstr "Strážce systému"
+msgstr "KSysGuard"
 
 #. GenericName
 #: gui/ksysguard.desktop:4
@@ -40,4 +40,4 @@ msgstr "Pokro�ilý monitor systému, který pohlcuje displeje strážce TDE"
 #. Comment
 #: gui/x-ksysguard.desktop:5
 msgid "TDE System Guard"
-msgstr "Správce systému TDE"
+msgstr "Strážce systému TDE"
diff --git a/translations/desktop_files/ksysguard-desktops/it.po b/translations/desktop_files/ksysguard-desktops/it.po
index 1d00708e7..95d069e8c 100644
--- a/translations/desktop_files/ksysguard-desktops/it.po
+++ b/translations/desktop_files/ksysguard-desktops/it.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-01-30 18:18+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksysguard-desktop-files/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.10.1\n"
 
 #. Name
 #: gui/ksysguard.desktop:2
-#, fuzzy
 msgid "KSysGuard"
-msgstr "Controllo del sistema"
+msgstr "KSysGuard"
 
 #. GenericName
 #: gui/ksysguard.desktop:4
diff --git a/translations/desktop_files/ksysguard-desktops/pl.po b/translations/desktop_files/ksysguard-desktops/pl.po
index dae360557..d22262669 100644
--- a/translations/desktop_files/ksysguard-desktops/pl.po
+++ b/translations/desktop_files/ksysguard-desktops/pl.po
@@ -1,24 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksysguard-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.1.1\n"
 
 #. Name
 #: gui/ksysguard.desktop:2
-#, fuzzy
 msgid "KSysGuard"
 msgstr "Strażnik Systemu"
 
diff --git a/translations/desktop_files/ksysguard-desktops/ru.po b/translations/desktop_files/ksysguard-desktops/ru.po
index 78abb6434..dba04e197 100644
--- a/translations/desktop_files/ksysguard-desktops/ru.po
+++ b/translations/desktop_files/ksysguard-desktops/ru.po
@@ -1,24 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2022.
 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: 2022-02-14 23:01+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksysguard-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.10.1\n"
 
 #. Name
 #: gui/ksysguard.desktop:2
-#, fuzzy
 msgid "KSysGuard"
 msgstr "Си�темный монитор"
 
diff --git a/translations/desktop_files/ksysguard-eventsrc/cs.po b/translations/desktop_files/ksysguard-eventsrc/cs.po
index f534d8a5a..fc79a6f60 100644
--- a/translations/desktop_files/ksysguard-eventsrc/cs.po
+++ b/translations/desktop_files/ksysguard-eventsrc/cs.po
@@ -1,31 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
 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: 2021-01-31 02:00+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ksysguard-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.4.2\n"
 
 #. Comment
 #: eventsrc:3
 msgid "System Guard"
-msgstr "Správce systému"
+msgstr "Strážce systému"
 
 #. Name
 #: eventsrc:6
-#, fuzzy
 msgid "pattern_match"
-msgstr "Hledaný vzor odpovídá"
+msgstr "pattern_match"
 
 #. Comment
 #: eventsrc:7
@@ -35,7 +35,7 @@ msgstr "Hledaný vzor odpovídá"
 #. Name
 #: eventsrc:10
 msgid "sensor_alarm"
-msgstr ""
+msgstr "sensor_alarm"
 
 #. Comment
 #: eventsrc:11
diff --git a/translations/desktop_files/ksysguard-eventsrc/ru.po b/translations/desktop_files/ksysguard-eventsrc/ru.po
index 7c1f3a795..54b3bde40 100644
--- a/translations/desktop_files/ksysguard-eventsrc/ru.po
+++ b/translations/desktop_files/ksysguard-eventsrc/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>, 2022.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 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: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ksysguard-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
@@ -23,9 +26,8 @@ msgstr "Си�темный монитор"
 
 #. Name
 #: eventsrc:6
-#, fuzzy
 msgid "pattern_match"
-msgstr "Соответ�твие шаблону пои�ка"
+msgstr "pattern_match"
 
 #. Comment
 #: eventsrc:7
@@ -35,7 +37,7 @@ msgstr "Соответ�твие шаблону пои�ка"
 #. Name
 #: eventsrc:10
 msgid "sensor_alarm"
-msgstr ""
+msgstr "sensor_alarm"
 
 #. Comment
 #: eventsrc:11
diff --git a/translations/desktop_files/ktip.desktop/cs.po b/translations/desktop_files/ktip.desktop/cs.po
index 332da87f6..e33200164 100644
--- a/translations/desktop_files/ktip.desktop/cs.po
+++ b/translations/desktop_files/ktip.desktop/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ktip-ktipdesktop/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.2.2\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "KTip"
 
 #. GenericName
 #: ktip.desktop:4
diff --git a/translations/desktop_files/ktip.desktop/el.po b/translations/desktop_files/ktip.desktop/el.po
index f4af786ac..bf0aa7e11 100644
--- a/translations/desktop_files/ktip.desktop/el.po
+++ b/translations/desktop_files/ktip.desktop/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>, 2021.
 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: 2021-10-10 09:30+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/ktip-ktipdesktop/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.8.1\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "KTip"
 
 #. GenericName
 #: ktip.desktop:4
diff --git a/translations/desktop_files/ktip.desktop/es.po b/translations/desktop_files/ktip.desktop/es.po
index 59b640cc8..fcd687cb6 100644
--- a/translations/desktop_files/ktip.desktop/es.po
+++ b/translations/desktop_files/ktip.desktop/es.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Real name <sbdc1wdfzk@crossmailjet.com>, 2022.
 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: 2022-08-29 21:56+0000\n"
+"Last-Translator: Real name <sbdc1wdfzk@crossmailjet.com>\n"
+"Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ktip-ktipdesktop/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.13.1\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "KTip"
 
 #. GenericName
 #: ktip.desktop:4
diff --git a/translations/desktop_files/ktip.desktop/it.po b/translations/desktop_files/ktip.desktop/it.po
index 90d0ccf45..97c20a7b1 100644
--- a/translations/desktop_files/ktip.desktop/it.po
+++ b/translations/desktop_files/ktip.desktop/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-02-03 15:00+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ktip-ktipdesktop/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.10.1\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "KTip"
 
 #. GenericName
 #: ktip.desktop:4
diff --git a/translations/desktop_files/ktip.desktop/pl.po b/translations/desktop_files/ktip.desktop/pl.po
index ef76cc85f..2ca086aad 100644
--- a/translations/desktop_files/ktip.desktop/pl.po
+++ b/translations/desktop_files/ktip.desktop/pl.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ktip-ktipdesktop/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.1.1\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "Porady"
 
 #. GenericName
 #: ktip.desktop:4
diff --git a/translations/desktop_files/ktip.desktop/ru.po b/translations/desktop_files/ktip.desktop/ru.po
index f3f28b50c..60549075e 100644
--- a/translations/desktop_files/ktip.desktop/ru.po
+++ b/translations/desktop_files/ktip.desktop/ru.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# blu.256 <mavridisf@gmail.com>, 2021.
 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: 2021-10-10 09:30+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/ktip-ktipdesktop/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.8.1\n"
 
 #. Name
 #: ktip.desktop:2
 msgid "KTip"
-msgstr ""
+msgstr "KTip"
 
 #. GenericName
 #: ktip.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/it.po b/translations/desktop_files/kxkb-eventsrc/it.po
new file mode 100644
index 000000000..d7fb9cc64
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/it.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-12-25 17:45+0900\n"
+"PO-Revision-Date: 2024-01-15 08:06+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"
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..c4fefe679
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/kxkb-eventsrc.pot
@@ -0,0 +1,32 @@
+# 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: 2023-12-25 17:45+0900\n"
+"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 ""
diff --git a/translations/desktop_files/kxkb-eventsrc/ru.po b/translations/desktop_files/kxkb-eventsrc/ru.po
new file mode 100644
index 000000000..1591aaeb8
--- /dev/null
+++ b/translations/desktop_files/kxkb-eventsrc/ru.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Alexander Golubev <fatzer2@gmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-12-25 17:45+0900\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-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 "Ра�кладка клавиатуры была переключена"
diff --git a/translations/desktop_files/l10n-desktops/af.po b/translations/desktop_files/l10n-desktops/af.po
index d97e4e334..957f68ceb 100644
--- a/translations/desktop_files/l10n-desktops/af.po
+++ b/translations/desktop_files/l10n-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brazilië"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Westelike Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonesië"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenië"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Marshall EIlande"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nuwe Seeland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedoniese"
@@ -909,11 +931,6 @@ msgid "Niue"
 msgstr "Nieu"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nuwe Seeland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/ar.po b/translations/desktop_files/l10n-desktops/ar.po
index 314561405..d513f8323 100644
--- a/translations/desktop_files/l10n-desktops/ar.po
+++ b/translations/desktop_files/l10n-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "البرازيل"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "جزر الباهاما"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "الصحراء الغربية"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "اريتريا"
@@ -633,6 +643,13 @@ msgid "Japan"
 msgstr "اليابان"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "إندونيسيا"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "كينيا"
@@ -774,6 +791,11 @@ msgid "Marshall Islands"
 msgstr "جزر مارشال"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "نيوزيلاندا"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "مقدونيا"
@@ -904,11 +926,6 @@ msgid "Niue"
 msgstr "نيوي"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "نيوزيلاندا"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "ع�مان"
diff --git a/translations/desktop_files/l10n-desktops/az.po b/translations/desktop_files/l10n-desktops/az.po
index 0650fa782..8ccbb77a5 100644
--- a/translations/desktop_files/l10n-desktops/az.po
+++ b/translations/desktop_files/l10n-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -271,6 +271,11 @@ msgid "Brazil"
 msgstr "Braziliya"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -439,6 +444,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -647,6 +657,13 @@ msgid "Japan"
 msgstr "Yaponiya"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Ä°ndoneziya"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -789,6 +806,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Yeni Zellandiya"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonya"
@@ -923,11 +945,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Yeni Zellandiya"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/be.po b/translations/desktop_files/l10n-desktops/be.po
index c879f4a47..dfd5316de 100644
--- a/translations/desktop_files/l10n-desktops/be.po
+++ b/translations/desktop_files/l10n-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Бразілі�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Багамы"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Заходн�� Сахара"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Эрытр��"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "Японі�"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Інданезі�"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кені�"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "Маршалавы� вы�пы"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�ова� Зеланды�"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Македоні�"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "�ю�"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�ова� Зеланды�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "�ман"
diff --git a/translations/desktop_files/l10n-desktops/bg.po b/translations/desktop_files/l10n-desktops/bg.po
index 4765fad4a..030231c68 100644
--- a/translations/desktop_files/l10n-desktops/bg.po
+++ b/translations/desktop_files/l10n-desktops/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Бразили�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Бахам�ки о�трови"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Западна Сахара"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Еритре�"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "Япони�"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Индонези�"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кени�"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "Маршал�ки о�трови"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�ова Зеланди�"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Македони�"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "�иуе"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�ова Зеланди�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Оман"
diff --git a/translations/desktop_files/l10n-desktops/bn.po b/translations/desktop_files/l10n-desktops/bn.po
index 0e06eedeb..1a59d217d 100644
--- a/translations/desktop_files/l10n-desktops/bn.po
+++ b/translations/desktop_files/l10n-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "ব�রাজিল"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "বাহামাস"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "পশ�চিম সাহারা"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "�রিট�রিয়া"
@@ -633,6 +643,13 @@ msgid "Japan"
 msgstr "জাপান"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "ইন�দোনেশিয়া"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "কেনিয়া"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "মারশাল দ�বীপপ�ঞ�জ"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "নিউজিল�যাণ�ড"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "ম�যাসিডোনিয়া"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "নিউই"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "নিউজিল�যাণ�ড"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "ওমান"
diff --git a/translations/desktop_files/l10n-desktops/br.po b/translations/desktop_files/l10n-desktops/br.po
index 5e222e864..a30be10cb 100644
--- a/translations/desktop_files/l10n-desktops/br.po
+++ b/translations/desktop_files/l10n-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Sahara occidental"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritre"
@@ -636,6 +646,13 @@ msgid "Japan"
 msgstr "Japon"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezi"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -777,6 +794,11 @@ msgid "Marshall Islands"
 msgstr "Inizi Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Zeland nevez"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonia"
@@ -908,11 +930,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Zeland nevez"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/bs.po b/translations/desktop_files/l10n-desktops/bs.po
index 8ecc61109..d4970455b 100644
--- a/translations/desktop_files/l10n-desktops/bs.po
+++ b/translations/desktop_files/l10n-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahami"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Zapadna Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritreja"
@@ -634,6 +644,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezija"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenija"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Maršalova ostrva"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Novi Zeland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonija"
@@ -906,11 +928,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Novi Zeland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/ca.po b/translations/desktop_files/l10n-desktops/ca.po
index b96aadf1b..9fbf7e837 100644
--- a/translations/desktop_files/l10n-desktops/ca.po
+++ b/translations/desktop_files/l10n-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahames"
@@ -430,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Sàhara Occidental"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Japó"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonèsia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -776,6 +793,11 @@ msgid "Marshall Islands"
 msgstr "Illes Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nova Zelanda"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedònia"
@@ -908,11 +930,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nova Zelanda"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/cs.po b/translations/desktop_files/l10n-desktops/cs.po
index 857444371..b5365b289 100644
--- a/translations/desktop_files/l10n-desktops/cs.po
+++ b/translations/desktop_files/l10n-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+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: 2021-05-16 18:21+0000\n"
+"PO-Revision-Date: 2021-09-10 12:45+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/l10n-desktop-files/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.8.1\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -119,7 +120,7 @@ msgstr "Výchozí"
 #. Name
 #: ad/entry.desktop:2
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #. Name
 #: ae/entry.desktop:2
@@ -129,7 +130,7 @@ msgstr "Spojené arabské emiráty"
 #. Name
 #: af/entry.desktop:2
 msgid "Afghanistan"
-msgstr "Afghanistán"
+msgstr "Afghánistán"
 
 #. Name
 #: ag/entry.desktop:2
@@ -139,7 +140,7 @@ msgstr "Antigua a Barbuda"
 #. Name
 #: ai/entry.desktop:2
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #. Name
 #: al/entry.desktop:2
@@ -158,14 +159,13 @@ msgstr "Nizozemské Antily"
 
 #. Name
 #: ao/entry.desktop:2
-#, fuzzy
 msgid "Angola"
-msgstr "Mongolsko"
+msgstr "Angola"
 
 #. Name
 #: ar/entry.desktop:2
 msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
 
 #. Name
 #: as/entry.desktop:2
@@ -185,7 +185,7 @@ msgstr "Austrálie"
 #. Name
 #: aw/entry.desktop:2
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #. Name
 #: ax/entry.desktop:2
@@ -195,17 +195,17 @@ msgstr "Ålandské ostrovy"
 #. Name
 #: az/entry.desktop:2
 msgid "Azerbaijan"
-msgstr "�zerbajdžánský"
+msgstr "�zerbájdžán"
 
 #. Name
 #: ba/entry.desktop:2
 msgid "Bosnia and Herzegovina"
-msgstr "Bosna a Herzegovina"
+msgstr "Bosna a Hercegovina"
 
 #. Name
 #: bb/entry.desktop:2
 msgid "Barbados"
-msgstr ""
+msgstr "Barbados"
 
 #. Name
 #: bd/entry.desktop:2
@@ -220,7 +220,7 @@ msgstr "Belgie"
 #. Name
 #: bf/entry.desktop:2
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #. Name
 #: bg/entry.desktop:2
@@ -235,12 +235,12 @@ msgstr "Bahrajn"
 #. 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
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brazílie"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr "Braillovo"
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamy"
@@ -275,7 +280,7 @@ msgstr "Bhútán"
 #. Name
 #: bw/entry.desktop:2
 msgid "Botswana"
-msgstr ""
+msgstr "Botswana"
 
 #. Name
 #: by/entry.desktop:3
@@ -285,7 +290,7 @@ msgstr "Bělorusko"
 #. Name
 #: bz/entry.desktop:2
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #. Name
 #: ca/entry.desktop:5
@@ -300,7 +305,7 @@ msgstr "Kokosové ostrovy (Keeling)"
 #. Name
 #: cd/entry.desktop:2
 msgid "Congo, The Democratic Republic of the"
-msgstr "Kongo"
+msgstr "Konžská demokratická republika"
 
 #. Name
 #: cf/entry.desktop:2
@@ -330,7 +335,7 @@ msgstr "Cookovy ostrovy"
 #. Name
 #: cl/entry.desktop:2
 msgid "Chile"
-msgstr ""
+msgstr "Chile"
 
 #. Name
 #: cm/entry.desktop:2
@@ -375,7 +380,7 @@ msgstr "Kypr"
 #. Name
 #: cz/entry.desktop:2
 msgid "Czechia"
-msgstr "Česká republika"
+msgstr "ÄŒesko"
 
 #. Name
 #: de/entry.desktop:2
@@ -385,7 +390,7 @@ msgstr "Německo"
 #. Name
 #: dj/entry.desktop:2
 msgid "Djibouti"
-msgstr "Džibuti"
+msgstr "Džibutsko"
 
 #. Name
 #: dk/entry.desktop:3
@@ -420,7 +425,7 @@ msgstr "Estonsko"
 #. Name
 #: eg/entry.desktop:2
 msgid "Egypt"
-msgstr ""
+msgstr "Egypt"
 
 #. Name
 #: eh/entry.desktop:2
@@ -428,9 +433,14 @@ msgid "Western Sahara"
 msgstr "Západní Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #. Name
 #: es/entry.desktop:2
@@ -460,7 +470,7 @@ msgstr "Falklandy (Malvíny)"
 #. Name
 #: fm/entry.desktop:2
 msgid "Micronesia, Federated States of"
-msgstr "Mikronésie"
+msgstr "Federativní státy Mikronésie"
 
 #. Name
 #: fo/entry.desktop:2
@@ -475,7 +485,7 @@ msgstr "Francie"
 #. Name
 #: ga/entry.desktop:2
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #. Name
 #: gb/entry.desktop:2
@@ -484,9 +494,8 @@ msgstr "Spojené království"
 
 #. Name
 #: gd/entry.desktop:2
-#, fuzzy
 msgid "Grenada"
-msgstr "Kanada"
+msgstr "Grenada"
 
 #. Name
 #: ge/entry.desktop:2
@@ -496,12 +505,12 @@ msgstr "Gruzie"
 #. 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
@@ -516,12 +525,12 @@ msgstr "Gambie"
 #. 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
@@ -536,22 +545,22 @@ msgstr "Řecko"
 #. 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
@@ -561,7 +570,7 @@ msgstr "Hong Kong SAR (Čína)"
 #. Name
 #: hn/entry.desktop:2
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #. Name
 #: hr/entry.desktop:2
@@ -571,7 +580,7 @@ msgstr "Chorvatsko"
 #. Name
 #: ht/entry.desktop:2
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #. Name
 #: hu/entry.desktop:2
@@ -626,7 +635,7 @@ msgstr "Jamajka"
 #. Name
 #: jo/entry.desktop:2
 msgid "Jordan"
-msgstr "Jordán"
+msgstr "Jordánsko"
 
 #. Name
 #: jp/entry.desktop:2
@@ -634,6 +643,11 @@ msgid "Japan"
 msgstr "Japonsko"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr "Indonésie (Jáva)"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Keňa"
@@ -651,7 +665,7 @@ msgstr "Kambodža"
 #. Name
 #: ki/entry.desktop:2
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #. Name
 #: km/entry.desktop:2
@@ -661,7 +675,7 @@ msgstr "Komory"
 #. Name
 #: kn/entry.desktop:2
 msgid "St. Kitts and Nevis"
-msgstr "Sv. Kitts a Nevis"
+msgstr "Svatý Kryštof a Nevis"
 
 #. Name
 #: kp/entry.desktop:2
@@ -691,7 +705,7 @@ msgstr "Kazachstán"
 #. Name
 #: la/entry.desktop:2
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 #. Name
 #: lb/entry.desktop:2
@@ -721,7 +735,7 @@ msgstr "Libérie"
 #. Name
 #: ls/entry.desktop:2
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesotho"
 
 #. Name
 #: lt/entry.desktop:2
@@ -741,7 +755,7 @@ msgstr "Lotyšsko"
 #. Name
 #: ly/entry.desktop:2
 msgid "Libya"
-msgstr "Lýbie"
+msgstr "Libye"
 
 #. Name
 #: ma/entry.desktop:2
@@ -774,6 +788,11 @@ msgid "Marshall Islands"
 msgstr "Marshallovy ostrovy"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nový Zéland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonie"
@@ -781,12 +800,12 @@ msgstr "Makedonie"
 #. 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
@@ -806,18 +825,17 @@ msgstr "Martinik"
 #. Name
 #: mr/entry.desktop:2
 msgid "Mauritania"
-msgstr "Mauretánie"
+msgstr "Mauritánie"
 
 #. Name
 #: ms/entry.desktop:2
-#, fuzzy
 msgid "Montserrat"
-msgstr "Černá hora"
+msgstr "Montserrat"
 
 #. Name
 #: mt/entry.desktop:3
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #. Name
 #: mu/entry.desktop:2
@@ -831,9 +849,8 @@ msgstr "Maledivy"
 
 #. Name
 #: mw/entry.desktop:2
-#, fuzzy
 msgid "Malawi"
-msgstr "Malajsie"
+msgstr "Malawi"
 
 #. Name
 #: mx/entry.desktop:2
@@ -848,12 +865,12 @@ msgstr "Malajsie"
 #. Name
 #: mz/entry.desktop:2
 msgid "Mozambique"
-msgstr "Mozambik"
+msgstr "Mosambik"
 
 #. Name
 #: na/entry.desktop:2
 msgid "Namibia"
-msgstr "Namíbie"
+msgstr "Namibie"
 
 #. Name
 #: nc/entry.desktop:2
@@ -862,15 +879,13 @@ msgstr "Nová Kaledonie"
 
 #. Name
 #: ne/entry.desktop:2
-#, fuzzy
 msgid "Niger"
-msgstr "Nigérie"
+msgstr "Niger"
 
 #. Name
 #: nf/entry.desktop:2
-#, fuzzy
 msgid "Norfolk Island"
-msgstr "Cookovy ostrovy"
+msgstr "Norfolk"
 
 #. Name
 #: ng/entry.desktop:2
@@ -900,17 +915,12 @@ msgstr "Nepál"
 #. Name
 #: nr/entry.desktop:2
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. Name
 #: nu/entry.desktop:2
 msgid "Niue"
-msgstr ""
-
-#. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nový Zéland"
+msgstr "Niue"
 
 #. Name
 #: om/entry.desktop:2
@@ -920,12 +930,12 @@ msgstr "Omán"
 #. 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
@@ -935,7 +945,7 @@ msgstr "Francouzská Polynésie"
 #. Name
 #: pg/entry.desktop:2
 msgid "Papua New Guinea"
-msgstr "Papua - Nová Guinea"
+msgstr "Papua Nová Guinea"
 
 #. Name
 #: ph/entry.desktop:2
@@ -960,7 +970,7 @@ msgstr "Saint Pierre a Miquelon"
 #. Name
 #: pn/entry.desktop:2
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #. Name
 #: pr/entry.desktop:2
@@ -980,13 +990,12 @@ msgstr "Portugalsko"
 #. Name
 #: pw/entry.desktop:2
 msgid "Palau"
-msgstr ""
+msgstr "Palau"
 
 #. Name
 #: py/entry.desktop:2
-#, fuzzy
 msgid "Paraguay"
-msgstr "Nikaragua"
+msgstr "Paraguay"
 
 #. Name
 #: qa/entry.desktop:2
@@ -1011,7 +1020,7 @@ msgstr "Rusko"
 #. Name
 #: rw/entry.desktop:2
 msgid "Rwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #. Name
 #: sa/entry.desktop:2
@@ -1026,12 +1035,12 @@ msgstr "Å alamounovy ostrovy"
 #. Name
 #: sc/entry.desktop:2
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychely"
 
 #. Name
 #: sd/entry.desktop:2
 msgid "Sudan"
-msgstr "Sudán"
+msgstr "Súdán"
 
 #. Name
 #: se/entry.desktop:2
@@ -1061,12 +1070,12 @@ msgstr "Slovensko"
 #. 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
@@ -1081,7 +1090,7 @@ msgstr "Surinam"
 #. Name
 #: st/entry.desktop:2
 msgid "Sao Tome and Principe"
-msgstr "Sao Tome a Principe"
+msgstr "Svatý Tomáš a Princův ostrov"
 
 #. Name
 #: sv/entry.desktop:2
@@ -1095,9 +1104,8 @@ msgstr "Sýrie"
 
 #. Name
 #: sz/entry.desktop:2
-#, fuzzy
 msgid "Swaziland"
-msgstr "Thajsko"
+msgstr "Svazijsko"
 
 #. Name
 #: tc/entry.desktop:2
@@ -1112,7 +1120,7 @@ msgstr "ÄŒad"
 #. Name
 #: tg/entry.desktop:2
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. Name
 #: th/entry.desktop:2
@@ -1127,7 +1135,7 @@ msgstr "Tádžikistán"
 #. Name
 #: tk/entry.desktop:2
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #. Name
 #: tm/entry.desktop:2
@@ -1142,7 +1150,7 @@ msgstr "Tunisko"
 #. Name
 #: to/entry.desktop:2
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. Name
 #: tp/entry.desktop:2
@@ -1162,17 +1170,17 @@ msgstr "Trinidad a Tobago"
 #. Name
 #: tv/entry.desktop:2
 msgid "Tuvalu"
-msgstr ""
+msgstr "Tuvalu"
 
 #. Name
 #: tw/entry.desktop:3
 msgid "Taiwan"
-msgstr ""
+msgstr "Tchaj-wan"
 
 #. Name
 #: tz/entry.desktop:2
 msgid "Tanzania, United Republic of"
-msgstr "Tanzánie"
+msgstr "Tanzanie"
 
 #. Name
 #: ua/entry.desktop:3
@@ -1182,7 +1190,7 @@ msgstr "Ukrajina"
 #. Name
 #: ug/entry.desktop:2
 msgid "Uganda"
-msgstr ""
+msgstr "Uganda"
 
 #. Name
 #: us/entry.desktop:2
@@ -1192,7 +1200,7 @@ msgstr "Spojené státy americké"
 #. Name
 #: uy/entry.desktop:2
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #. Name
 #: uz/entry.desktop:2
@@ -1207,33 +1215,32 @@ msgstr "Vatikán"
 #. Name
 #: vc/entry.desktop:2
 msgid "St. Vincent and the Grenadines"
-msgstr "St. Vincent a Grenadiny"
+msgstr "Svatý Vincenc a Grenadiny"
 
 #. Name
 #: ve/entry.desktop:2
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #. Name
 #: vg/entry.desktop:2
-#, fuzzy
 msgid "Virgin Islands, British"
-msgstr "Panenské ostrovy, U.S."
+msgstr "Britské Panenské ostrovy"
 
 #. Name
 #: vi/entry.desktop:2
 msgid "Virgin Islands, U.S."
-msgstr "Panenské ostrovy, U.S."
+msgstr "Americké Panenské ostrovy"
 
 #. Name
 #: vn/entry.desktop:2
 msgid "Vietnam"
-msgstr "Panenské ostrovy, U.K."
+msgstr "Vietnam"
 
 #. Name
 #: vu/entry.desktop:2
 msgid "Vanuatu"
-msgstr ""
+msgstr "Vanuatu"
 
 #. Name
 #: wf/entry.desktop:2
@@ -1243,7 +1250,7 @@ msgstr "Wallis a Futuna"
 #. Name
 #: ws/entry.desktop:3
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #. Name
 #: ye/entry.desktop:2
@@ -1263,4 +1270,4 @@ msgstr "Zambie"
 #. Name
 #: zw/entry.desktop:2
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
diff --git a/translations/desktop_files/l10n-desktops/csb.po b/translations/desktop_files/l10n-desktops/csb.po
index 754555e67..39791ba26 100644
--- a/translations/desktop_files/l10n-desktops/csb.po
+++ b/translations/desktop_files/l10n-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Brazylskô"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamë"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Zôpônô Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Erytrea"
@@ -633,6 +643,13 @@ msgid "Japan"
 msgstr "Japòńskô"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezëjô"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenijô"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "Òstrowë Marshalla"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nowô Zelandzkô"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedońskô"
@@ -907,11 +929,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nowô Zelandzkô"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Ã’man"
diff --git a/translations/desktop_files/l10n-desktops/cy.po b/translations/desktop_files/l10n-desktops/cy.po
index b9f19af31..fca653426 100644
--- a/translations/desktop_files/l10n-desktops/cy.po
+++ b/translations/desktop_files/l10n-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Ynysoedd Bahama"
@@ -430,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Gorllewin Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -636,6 +646,11 @@ msgid "Japan"
 msgstr "Siapan"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Cenia"
@@ -776,6 +791,11 @@ msgid "Marshall Islands"
 msgstr "Ynysoedd Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Seland Newydd"
+
+#. Name
 #: mk/entry.desktop:3
 #, fuzzy
 msgid "Macedonia"
@@ -908,11 +928,6 @@ msgid "Niue"
 msgstr "Niwe"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Seland Newydd"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/da.po b/translations/desktop_files/l10n-desktops/da.po
index 0be0ae7b2..b531e17cd 100644
--- a/translations/desktop_files/l10n-desktops/da.po
+++ b/translations/desktop_files/l10n-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasilien"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -431,6 +436,11 @@ msgid "Western Sahara"
 msgstr "Vestsahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -637,6 +647,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonesien"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -778,6 +795,12 @@ msgid "Marshall Islands"
 msgstr "Marshall-øerne"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+#, fuzzy
+msgid "New Zealand"
+msgstr "Holland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonien"
@@ -910,12 +933,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-#, fuzzy
-msgid "New Zealand"
-msgstr "Holland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/de.po b/translations/desktop_files/l10n-desktops/de.po
index bd6918ee1..d43779590 100644
--- a/translations/desktop_files/l10n-desktops/de.po
+++ b/translations/desktop_files/l10n-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasilien"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Westsahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -636,6 +646,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonesien"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -776,6 +793,11 @@ msgid "Marshall Islands"
 msgstr "Marshall-Inseln"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Neuseeland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonien"
@@ -908,11 +930,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Neuseeland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/dz.po b/translations/desktop_files/l10n-desktops/dz.po
index 182bff6d3..c27a7d91f 100644
--- a/translations/desktop_files/l10n-desktops/dz.po
+++ b/translations/desktop_files/l10n-desktops/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -632,6 +642,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -772,6 +787,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -902,11 +922,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/el.po b/translations/desktop_files/l10n-desktops/el.po
index 3f07a1148..04c6fbca9 100644
--- a/translations/desktop_files/l10n-desktops/el.po
+++ b/translations/desktop_files/l10n-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Β�αζιλία"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Μπαχάμες"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Δυτική Σαχά�α"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Ε�υθ�αία"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "Ιαπωνία"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Ινδονησία"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Κένυα"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "�ησιά Μά�σαλ"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�έα Ζηλανδία"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Σλαβομακεδονία"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "�ιο�ε"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�έα Ζηλανδία"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Ομάν"
diff --git a/translations/desktop_files/l10n-desktops/eo.po b/translations/desktop_files/l10n-desktops/eo.po
index e397ffaa0..49386cbed 100644
--- a/translations/desktop_files/l10n-desktops/eo.po
+++ b/translations/desktop_files/l10n-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Brazilo"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamoj"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Okcidenta Saharo"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritreo"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "Japanio"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezio"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenjo"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "Mar�aloj"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nov-Zelando"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonujo"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "Niuo"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nov-Zelando"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omano"
diff --git a/translations/desktop_files/l10n-desktops/es.po b/translations/desktop_files/l10n-desktops/es.po
index a404db70e..af70b4d31 100644
--- a/translations/desktop_files/l10n-desktops/es.po
+++ b/translations/desktop_files/l10n-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -265,6 +265,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -431,6 +436,11 @@ msgid "Western Sahara"
 msgstr "Sahara occidental"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -637,6 +647,11 @@ msgid "Japan"
 msgstr "Japón"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -777,6 +792,11 @@ 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
 #, fuzzy
 msgid "Macedonia"
@@ -912,11 +932,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nueva Zelanda"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omán"
diff --git a/translations/desktop_files/l10n-desktops/et.po b/translations/desktop_files/l10n-desktops/et.po
index 14da8624c..4c382601b 100644
--- a/translations/desktop_files/l10n-desktops/et.po
+++ b/translations/desktop_files/l10n-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "Brasiilia"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahama"
@@ -430,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Lääne-Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -637,6 +647,13 @@ msgid "Japan"
 msgstr "Jaapan"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indoneesia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -777,6 +794,11 @@ msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Uus-Meremaa"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedoonia"
@@ -911,11 +933,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Uus-Meremaa"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omaan"
diff --git a/translations/desktop_files/l10n-desktops/eu.po b/translations/desktop_files/l10n-desktops/eu.po
index 8e1da1e91..35b4177f5 100644
--- a/translations/desktop_files/l10n-desktops/eu.po
+++ b/translations/desktop_files/l10n-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Mendebaldeko Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -635,6 +645,11 @@ msgid "Japan"
 msgstr "Japonia"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -775,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "Marshall Irlak"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Zelanda Berria"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Mazedonia"
@@ -908,11 +928,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Zelanda Berria"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/fa.po b/translations/desktop_files/l10n-desktops/fa.po
index 763df53a1..d499387f9 100644
--- a/translations/desktop_files/l10n-desktops/fa.po
+++ b/translations/desktop_files/l10n-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "برزیل"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "باهاما"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "صحرای غربی"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "اریتره"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "ژاپن"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "اندونزی"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "کنیا"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "جزایر مارشال"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "زلاندنو"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "مقدونیه"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "نیوئه"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "زلاندنو"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "عمان"
diff --git a/translations/desktop_files/l10n-desktops/fi.po b/translations/desktop_files/l10n-desktops/fi.po
index e3849d8a0..76dcb5be7 100644
--- a/translations/desktop_files/l10n-desktops/fi.po
+++ b/translations/desktop_files/l10n-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasilia"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahaman saaret"
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Länsi-Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -636,6 +646,11 @@ msgid "Japan"
 msgstr "Japani"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -777,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Marshallinsaaret"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Uusi-Seelanti"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonia"
@@ -912,11 +932,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Uusi-Seelanti"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/fo.po b/translations/desktop_files/l10n-desktops/fo.po
index d7f31ae06..9e86168ec 100644
--- a/translations/desktop_files/l10n-desktops/fo.po
+++ b/translations/desktop_files/l10n-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -273,6 +273,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -439,6 +444,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -647,6 +657,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -787,6 +802,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nýsæland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -917,11 +937,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nýsæland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/fr.po b/translations/desktop_files/l10n-desktops/fr.po
index cf2657f6d..86aeba6ff 100644
--- a/translations/desktop_files/l10n-desktops/fr.po
+++ b/translations/desktop_files/l10n-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brésil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -430,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Sahara occidental"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Érythrée"
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Japon"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonésie"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -776,6 +793,11 @@ msgid "Marshall Islands"
 msgstr "ÃŽles Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nouvelle Zélande"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macédoine"
@@ -909,11 +931,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nouvelle Zélande"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/fy.po b/translations/desktop_files/l10n-desktops/fy.po
index ba69981fe..a965d4311 100644
--- a/translations/desktop_files/l10n-desktops/fy.po
+++ b/translations/desktop_files/l10n-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brazilië"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -430,6 +435,11 @@ msgid "Western Sahara"
 msgstr "West Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -636,6 +646,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonesië"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -777,6 +794,11 @@ msgid "Marshall Islands"
 msgstr "Marshall Eilânen"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nij Seelân"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedonië"
@@ -910,11 +932,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nij Seelân"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/ga.po b/translations/desktop_files/l10n-desktops/ga.po
index 0ffec1e42..39c6a2dbf 100644
--- a/translations/desktop_files/l10n-desktops/ga.po
+++ b/translations/desktop_files/l10n-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "An Bhrasaíl"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Na Bahámaí"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "An Sahára Thiar"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eiritré"
@@ -633,6 +643,13 @@ msgid "Japan"
 msgstr "An tSeapáin"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "An Indinéis"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "An Chéinia"
@@ -774,6 +791,11 @@ msgid "Marshall Islands"
 msgstr "Oileáin Mharshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "An Nua-Shéalainn"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "An Mhacadóin (IPIM)"
@@ -904,11 +926,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "An Nua-Shéalainn"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/gl.po b/translations/desktop_files/l10n-desktops/gl.po
index 27aee7bb1..e2eed2ca5 100644
--- a/translations/desktop_files/l10n-desktops/gl.po
+++ b/translations/desktop_files/l10n-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Baamas"
@@ -431,6 +436,11 @@ msgid "Western Sahara"
 msgstr "Saara Ocidental"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -637,6 +647,13 @@ msgid "Japan"
 msgstr "Xapón"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonésia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -777,6 +794,11 @@ msgid "Marshall Islands"
 msgstr "Illas Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nova Celándia"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedónia"
@@ -910,11 +932,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nova Celándia"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omán"
diff --git a/translations/desktop_files/l10n-desktops/he.po b/translations/desktop_files/l10n-desktops/he.po
index 8471ab155..3ca9cb21c 100644
--- a/translations/desktop_files/l10n-desktops/he.po
+++ b/translations/desktop_files/l10n-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "ברזיל"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "בהמס"
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "מערב סהרה"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "�ריתרי�ה"
@@ -634,6 +644,13 @@ msgid "Japan"
 msgstr "יפן"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "�ינדונזיה"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "קניה"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "�יי מרשל"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "ניו זילנד"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "מקדוניה"
@@ -905,11 +927,6 @@ msgid "Niue"
 msgstr "ניווה"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "ניו זילנד"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "עומן"
diff --git a/translations/desktop_files/l10n-desktops/hi.po b/translations/desktop_files/l10n-desktops/hi.po
index cfef394d2..7c0289521 100644
--- a/translations/desktop_files/l10n-desktops/hi.po
+++ b/translations/desktop_files/l10n-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "ब�राजील"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "बहामा"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "पश�चिमी सहारा"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "�रिट�रीया"
@@ -634,6 +644,13 @@ msgid "Japan"
 msgstr "जापान"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "इंडोनेशिया"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "केन�या"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "मार�शल आइलैंड"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "न�यूजीलैंड"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "मकदूनिया"
@@ -905,11 +927,6 @@ msgid "Niue"
 msgstr "नियू"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "न�यूजीलैंड"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "ओमन"
diff --git a/translations/desktop_files/l10n-desktops/hr.po b/translations/desktop_files/l10n-desktops/hr.po
index 8afcbba0e..a1571f189 100644
--- a/translations/desktop_files/l10n-desktops/hr.po
+++ b/translations/desktop_files/l10n-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Zapadna Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritreja"
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezija"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenija"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Marshall Otoci"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Novi Zeland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonija"
@@ -908,11 +930,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Novi Zeland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/hsb.po b/translations/desktop_files/l10n-desktops/hsb.po
index 9cd861549..fa49adcb0 100644
--- a/translations/desktop_files/l10n-desktops/hsb.po
+++ b/translations/desktop_files/l10n-desktops/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -632,6 +642,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -772,6 +787,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -902,11 +922,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/hu.po b/translations/desktop_files/l10n-desktops/hu.po
index 27de3f257..c875f0f67 100644
--- a/translations/desktop_files/l10n-desktops/hu.po
+++ b/translations/desktop_files/l10n-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brazília"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamák"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Nyugat-Szahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Japán"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonézia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Marshall-szigetek"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Új-Zéland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedónia"
@@ -910,11 +932,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Új-Zéland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omán"
diff --git a/translations/desktop_files/l10n-desktops/hy.po b/translations/desktop_files/l10n-desktops/hy.po
index 51ceb3f2e..a6caf1cf3 100644
--- a/translations/desktop_files/l10n-desktops/hy.po
+++ b/translations/desktop_files/l10n-desktops/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -632,6 +642,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -772,6 +787,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -902,11 +922,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/id.po b/translations/desktop_files/l10n-desktops/id.po
index e63db58b1..7ad528ea8 100644
--- a/translations/desktop_files/l10n-desktops/id.po
+++ b/translations/desktop_files/l10n-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -431,6 +436,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -639,6 +649,11 @@ msgid "Japan"
 msgstr "Jepang"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -779,6 +794,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Selandia Baru"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Masedonia"
@@ -912,11 +932,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Selandia Baru"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/is.po b/translations/desktop_files/l10n-desktops/is.po
index 7436b0be0..0afe655df 100644
--- a/translations/desktop_files/l10n-desktops/is.po
+++ b/translations/desktop_files/l10n-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Brasilía"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamaeyjar"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Vestur-Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Erítrea"
@@ -633,6 +643,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indónesía"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenía"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "Marshall-eyjar"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nýja-Sjáland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedónía"
@@ -904,11 +926,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nýja-Sjáland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Óman"
diff --git a/translations/desktop_files/l10n-desktops/it.po b/translations/desktop_files/l10n-desktops/it.po
index 1c65d33f0..2d2cc85c8 100644
--- a/translations/desktop_files/l10n-desktops/it.po
+++ b/translations/desktop_files/l10n-desktops/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+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: 2021-05-16 18:21+0000\n"
+"PO-Revision-Date: 2022-02-06 09:01+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/l10n-desktop-files/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.10.1\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -74,7 +75,7 @@ msgstr "Europa settentrionale"
 #. Name
 #: oceania.desktop:2
 msgid "Oceania"
-msgstr ""
+msgstr "Oceania"
 
 #. Name
 #: southafrica.desktop:2
@@ -119,7 +120,7 @@ msgstr "Predefinito"
 #. Name
 #: ad/entry.desktop:2
 msgid "Andorra"
-msgstr ""
+msgstr "Andorra"
 
 #. Name
 #: ae/entry.desktop:2
@@ -139,17 +140,17 @@ msgstr "Antigua e Barbuda"
 #. Name
 #: ai/entry.desktop:2
 msgid "Anguilla"
-msgstr ""
+msgstr "Anguilla"
 
 #. Name
 #: al/entry.desktop:2
 msgid "Albania"
-msgstr ""
+msgstr "Albania"
 
 #. Name
 #: am/entry.desktop:2
 msgid "Armenia"
-msgstr ""
+msgstr "Armenia"
 
 #. Name
 #: an/entry.desktop:2
@@ -159,12 +160,12 @@ msgstr "Antille Olandesi"
 #. Name
 #: ao/entry.desktop:2
 msgid "Angola"
-msgstr ""
+msgstr "Angola"
 
 #. Name
 #: ar/entry.desktop:2
 msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
 
 #. Name
 #: as/entry.desktop:2
@@ -174,17 +175,17 @@ msgstr "Samoa Americane"
 #. Name
 #: at/entry.desktop:2
 msgid "Austria"
-msgstr ""
+msgstr "Austria"
 
 #. Name
 #: au/entry.desktop:2
 msgid "Australia"
-msgstr ""
+msgstr "Australia"
 
 #. Name
 #: aw/entry.desktop:2
 msgid "Aruba"
-msgstr ""
+msgstr "Aruba"
 
 #. Name
 #: ax/entry.desktop:2
@@ -204,12 +205,12 @@ msgstr "Bosnia e Erzegovina"
 #. 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
@@ -219,32 +220,32 @@ msgstr "Belgio"
 #. Name
 #: bf/entry.desktop:2
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #. Name
 #: bg/entry.desktop:2
 msgid "Bulgaria"
-msgstr ""
+msgstr "Bulgaria"
 
 #. Name
 #: bh/entry.desktop:2
 msgid "Bahrain"
-msgstr ""
+msgstr "Bahrain"
 
 #. 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
@@ -254,7 +255,7 @@ msgstr "Brunei"
 #. Name
 #: bo/entry.desktop:2
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #. Name
 #: br/entry.desktop:2
@@ -262,19 +263,24 @@ msgid "Brazil"
 msgstr "Brasile"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr "Braille"
+
+#. 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
@@ -284,13 +290,12 @@ msgstr "Bielorussia"
 #. Name
 #: bz/entry.desktop:2
 msgid "Belize"
-msgstr ""
+msgstr "Belize"
 
 #. Name
 #: ca/entry.desktop:5
-#, fuzzy
 msgid "Canada"
-msgstr "Granada"
+msgstr "Canada"
 
 #. Name
 #: cc/entry.desktop:2
@@ -310,7 +315,7 @@ msgstr "Repubblica Centrafricana"
 #. Name
 #: cg/entry.desktop:2
 msgid "Congo"
-msgstr ""
+msgstr "Congo"
 
 #. Name
 #: ch/entry.desktop:2
@@ -345,17 +350,17 @@ msgstr "Cina"
 #. 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
 msgid "Cuba"
-msgstr ""
+msgstr "Cuba"
 
 #. Name
 #: cv/entry.desktop:2
@@ -394,7 +399,6 @@ msgstr "Danimarca"
 
 #. Name
 #: dm/entry.desktop:2
-#, fuzzy
 msgid "Dominica"
 msgstr "Repubblica Dominicana"
 
@@ -406,7 +410,7 @@ msgstr "Repubblica Dominicana"
 #. Name
 #: dz/entry.desktop:2
 msgid "Algeria"
-msgstr ""
+msgstr "Algeria"
 
 #. Name
 #: ec/entry.desktop:2
@@ -416,7 +420,7 @@ msgstr "Ecuador"
 #. Name
 #: ee/entry.desktop:2
 msgid "Estonia"
-msgstr ""
+msgstr "Estonia"
 
 #. Name
 #: eg/entry.desktop:2
@@ -429,9 +433,14 @@ msgid "Western Sahara"
 msgstr "Sahara Occidentale"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
-msgstr ""
+msgstr "Eritrea"
 
 #. Name
 #: es/entry.desktop:2
@@ -476,7 +485,7 @@ msgstr "Francia"
 #. Name
 #: ga/entry.desktop:2
 msgid "Gabon"
-msgstr ""
+msgstr "Gabon"
 
 #. Name
 #: gb/entry.desktop:2
@@ -491,12 +500,12 @@ msgstr "Granada"
 #. Name
 #: ge/entry.desktop:2
 msgid "Georgia"
-msgstr ""
+msgstr "Georgia"
 
 #. Name
 #: gh/entry.desktop:2
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #. Name
 #: gi/entry.desktop:2
@@ -511,12 +520,12 @@ msgstr "Groenlandia"
 #. 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
@@ -536,22 +545,22 @@ msgstr "Grecia"
 #. 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
@@ -561,7 +570,7 @@ msgstr "Hong Kong SAR(Cina)"
 #. Name
 #: hn/entry.desktop:2
 msgid "Honduras"
-msgstr ""
+msgstr "Honduras"
 
 #. Name
 #: hr/entry.desktop:2
@@ -571,7 +580,7 @@ msgstr "Croazia"
 #. Name
 #: ht/entry.desktop:2
 msgid "Haiti"
-msgstr ""
+msgstr "Haiti"
 
 #. Name
 #: hu/entry.desktop:2
@@ -581,7 +590,7 @@ msgstr "Ungheria"
 #. Name
 #: id/entry.desktop:2
 msgid "Indonesia"
-msgstr ""
+msgstr "Indonesia"
 
 #. Name
 #: ie/entry.desktop:2
@@ -596,17 +605,17 @@ msgstr "Israele"
 #. Name
 #: in/entry.desktop:2
 msgid "India"
-msgstr ""
+msgstr "India"
 
 #. Name
 #: iq/entry.desktop:2
 msgid "Iraq"
-msgstr ""
+msgstr "Iraq"
 
 #. Name
 #: ir/entry.desktop:2
 msgid "Iran"
-msgstr ""
+msgstr "Iran"
 
 #. Name
 #: is/entry.desktop:2
@@ -634,9 +643,14 @@ msgid "Japan"
 msgstr "Giappone"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr "Indonesia (Java)"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
-msgstr ""
+msgstr "Kenya"
 
 #. Name
 #: kg/entry.desktop:2
@@ -651,7 +665,7 @@ msgstr "Cambogia"
 #. Name
 #: ki/entry.desktop:2
 msgid "Kiribati"
-msgstr ""
+msgstr "Kiribati"
 
 #. Name
 #: km/entry.desktop:2
@@ -676,7 +690,7 @@ msgstr "Corea del Sud"
 #. Name
 #: kw/entry.desktop:2
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #. Name
 #: ky/entry.desktop:2
@@ -691,7 +705,7 @@ msgstr "Kazakistan"
 #. Name
 #: la/entry.desktop:2
 msgid "Laos"
-msgstr ""
+msgstr "Laos"
 
 #. Name
 #: lb/entry.desktop:2
@@ -706,22 +720,22 @@ msgstr "Santa 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
@@ -751,7 +765,7 @@ msgstr "Marocco"
 #. Name
 #: mc/entry.desktop:2
 msgid "Monaco"
-msgstr ""
+msgstr "Monaco"
 
 #. Name
 #: md/entry.desktop:2
@@ -760,14 +774,13 @@ msgstr "Moldavia"
 
 #. Name
 #: me/entry.desktop:3
-#, fuzzy
 msgid "Montenegro"
-msgstr "Monserrat"
+msgstr "Montenegro"
 
 #. Name
 #: mg/entry.desktop:2
 msgid "Madagascar"
-msgstr ""
+msgstr "Madagascar"
 
 #. Name
 #: mh/entry.desktop:2
@@ -775,25 +788,29 @@ msgid "Marshall Islands"
 msgstr "Isole Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nuova Zelanda"
+
+#. Name
 #: mk/entry.desktop:3
-#, fuzzy
 msgid "Macedonia"
-msgstr "Nuova Caledonia"
+msgstr "Macedonia"
 
 #. Name
 #: ml/entry.desktop:2
 msgid "Mali"
-msgstr ""
+msgstr "Mali"
 
 #. Name
 #: mm/entry.desktop:2
 msgid "Myanmar"
-msgstr ""
+msgstr "Birmania"
 
 #. Name
 #: mn/entry.desktop:2
 msgid "Mongolia"
-msgstr ""
+msgstr "Mongolia"
 
 #. Name
 #: mo/entry.desktop:2
@@ -807,9 +824,8 @@ msgstr "Martinica"
 
 #. Name
 #: mr/entry.desktop:2
-#, fuzzy
 msgid "Mauritania"
-msgstr "Lituania"
+msgstr "Mauritania"
 
 #. Name
 #: ms/entry.desktop:2
@@ -819,12 +835,12 @@ msgstr "Monserrat"
 #. Name
 #: mt/entry.desktop:3
 msgid "Malta"
-msgstr ""
+msgstr "Malta"
 
 #. Name
 #: mu/entry.desktop:2
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauritius"
 
 #. Name
 #: mv/entry.desktop:2
@@ -834,7 +850,7 @@ msgstr "Maldive"
 #. Name
 #: mw/entry.desktop:2
 msgid "Malawi"
-msgstr ""
+msgstr "Malawi"
 
 #. Name
 #: mx/entry.desktop:2
@@ -844,7 +860,7 @@ msgstr "Messico"
 #. Name
 #: my/entry.desktop:2
 msgid "Malaysia"
-msgstr ""
+msgstr "Malaysia"
 
 #. Name
 #: mz/entry.desktop:2
@@ -854,7 +870,7 @@ msgstr "Mozambico"
 #. Name
 #: na/entry.desktop:2
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #. Name
 #: nc/entry.desktop:2
@@ -864,7 +880,7 @@ msgstr "Nuova Caledonia"
 #. Name
 #: ne/entry.desktop:2
 msgid "Niger"
-msgstr ""
+msgstr "Niger"
 
 #. Name
 #: nf/entry.desktop:2
@@ -874,12 +890,12 @@ msgstr "Isola Norfolk"
 #. Name
 #: ng/entry.desktop:2
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #. Name
 #: ni/entry.desktop:2
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #. Name
 #: nl/entry.desktop:3
@@ -894,32 +910,27 @@ msgstr "Norvegia"
 #. 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 ""
-
-#. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nuova Zelanda"
+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
@@ -943,9 +954,8 @@ msgstr "Filippine"
 
 #. Name
 #: pk/entry.desktop:2
-#, fuzzy
 msgid "Pakistan"
-msgstr "Tagikistan"
+msgstr "Pakistan"
 
 #. Name
 #: pl/entry.desktop:2
@@ -960,7 +970,7 @@ msgstr "Saint Pierre e Miquelon"
 #. Name
 #: pn/entry.desktop:2
 msgid "Pitcairn"
-msgstr ""
+msgstr "Pitcairn"
 
 #. Name
 #: pr/entry.desktop:2
@@ -980,32 +990,32 @@ msgstr "Portogallo"
 #. 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
 msgid "Romania"
-msgstr ""
+msgstr "Romania"
 
 #. Name
 #: rs/entry.desktop:3
 msgid "Serbia"
-msgstr ""
+msgstr "Serbia"
 
 #. Name
 #: ru/entry.desktop:3
 msgid "Russia"
-msgstr ""
+msgstr "Russia"
 
 #. Name
 #: rw/entry.desktop:2
@@ -1025,12 +1035,12 @@ msgstr "Isole Salomone"
 #. Name
 #: sc/entry.desktop:2
 msgid "Seychelles"
-msgstr ""
+msgstr "Seychelles"
 
 #. Name
 #: sd/entry.desktop:2
 msgid "Sudan"
-msgstr ""
+msgstr "Sudan"
 
 #. Name
 #: se/entry.desktop:2
@@ -1040,7 +1050,7 @@ msgstr "Svezia"
 #. Name
 #: sg/entry.desktop:2
 msgid "Singapore"
-msgstr ""
+msgstr "Singapore"
 
 #. Name
 #: sh/entry.desktop:2
@@ -1049,9 +1059,8 @@ msgstr "Sant'Elena"
 
 #. Name
 #: si/entry.desktop:2
-#, fuzzy
 msgid "Slovenia"
-msgstr "Slovacchia"
+msgstr "Slovenia"
 
 #. Name
 #: sk/entry.desktop:2
@@ -1061,22 +1070,22 @@ msgstr "Slovacchia"
 #. 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
 msgid "Suriname"
-msgstr ""
+msgstr "Suriname"
 
 #. Name
 #: st/entry.desktop:2
@@ -1086,7 +1095,7 @@ msgstr "São Tomé e Príncipe"
 #. Name
 #: sv/entry.desktop:2
 msgid "El Salvador"
-msgstr ""
+msgstr "El Salvador"
 
 #. Name
 #: sy/entry.desktop:2
@@ -1095,9 +1104,8 @@ msgstr "Siria"
 
 #. Name
 #: sz/entry.desktop:2
-#, fuzzy
 msgid "Swaziland"
-msgstr "Tailandia"
+msgstr "Swaziland"
 
 #. Name
 #: tc/entry.desktop:2
@@ -1112,7 +1120,7 @@ msgstr "Ciad"
 #. Name
 #: tg/entry.desktop:2
 msgid "Togo"
-msgstr ""
+msgstr "Togo"
 
 #. Name
 #: th/entry.desktop:2
@@ -1127,23 +1135,22 @@ msgstr "Tagikistan"
 #. Name
 #: tk/entry.desktop:2
 msgid "Tokelau"
-msgstr ""
+msgstr "Tokelau"
 
 #. Name
 #: tm/entry.desktop:2
-#, fuzzy
 msgid "Turkmenistan"
-msgstr "Tagikistan"
+msgstr "Turkmenistan"
 
 #. Name
 #: tn/entry.desktop:2
 msgid "Tunisia"
-msgstr ""
+msgstr "Tunisia"
 
 #. Name
 #: to/entry.desktop:2
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. Name
 #: tp/entry.desktop:2
@@ -1163,12 +1170,12 @@ msgstr "Trinidad e 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
@@ -1182,9 +1189,8 @@ msgstr "Ucraina"
 
 #. Name
 #: ug/entry.desktop:2
-#, fuzzy
 msgid "Uganda"
-msgstr "Ruanda"
+msgstr "Uganda"
 
 #. Name
 #: us/entry.desktop:2
@@ -1194,13 +1200,12 @@ msgstr "Stati Uniti d'America"
 #. Name
 #: uy/entry.desktop:2
 msgid "Uruguay"
-msgstr ""
+msgstr "Uruguay"
 
 #. Name
 #: uz/entry.desktop:2
-#, fuzzy
 msgid "Uzbekistan"
-msgstr "Tagikistan"
+msgstr "Uzbekistan"
 
 #. Name
 #: va/entry.desktop:2
@@ -1215,7 +1220,7 @@ msgstr "Saint Vincent e Grenadines"
 #. Name
 #: ve/entry.desktop:2
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #. Name
 #: vg/entry.desktop:2
@@ -1230,12 +1235,12 @@ msgstr "Isole Vergini Americane"
 #. 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
@@ -1245,12 +1250,12 @@ msgstr "Wallis e Futuna"
 #. Name
 #: ws/entry.desktop:3
 msgid "Samoa"
-msgstr ""
+msgstr "Samoa"
 
 #. Name
 #: ye/entry.desktop:2
 msgid "Yemen"
-msgstr ""
+msgstr "Yemen"
 
 #. Name
 #: za/entry.desktop:3
@@ -1260,12 +1265,12 @@ msgstr "Sud Africa"
 #. Name
 #: zm/entry.desktop:2
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #. Name
 #: zw/entry.desktop:2
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Zimbabwe"
 
 #~ msgid "F"
 #~ msgstr "F"
diff --git a/translations/desktop_files/l10n-desktops/ja.po b/translations/desktop_files/l10n-desktops/ja.po
index 73f1ad6ec..0c4aa0676 100644
--- a/translations/desktop_files/l10n-desktops/ja.po
+++ b/translations/desktop_files/l10n-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "ブラジル"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "��マ"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "西サ�ラ"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "エリトリア"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "日本"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "インド�シア"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "ケニア"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "マーシャル諸島"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "ニュージーランド"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "マケドニア"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "ニウエ"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "ニュージーランド"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "オマーン"
diff --git a/translations/desktop_files/l10n-desktops/ka.po b/translations/desktop_files/l10n-desktops/ka.po
index fefe02c1a..1925aff45 100644
--- a/translations/desktop_files/l10n-desktops/ka.po
+++ b/translations/desktop_files/l10n-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "ბრ�ზილი�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "ბ�ჰ�მ�"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "დ�ს�ვლეთ ს�ჰ�რ�"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "ერითრე�"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "ი�პ�ნი�"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "ინდ�ნეზი�"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "კენი�"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "მ�რშ�ლის კუნძულები"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�ხ�ლი ზელ�ნდი�"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "მ�კედ�ნი�"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "ნიუე"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�ხ�ლი ზელ�ნდი�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "�მ�ნი"
diff --git a/translations/desktop_files/l10n-desktops/kk.po b/translations/desktop_files/l10n-desktops/kk.po
index abb1a4a04..cf14c8fa7 100644
--- a/translations/desktop_files/l10n-desktops/kk.po
+++ b/translations/desktop_files/l10n-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Бразили�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Багам ар-ы"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Баты� Сахара"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Эритре�"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "Жапони�"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Индонези�"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кени�"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "Маршалл ар-ы"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Жаңа Зеланди�"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Македони�"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "�иу�"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Жаңа Зеланди�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Оман"
diff --git a/translations/desktop_files/l10n-desktops/km.po b/translations/desktop_files/l10n-desktops/km.po
index e8ef53107..2031a70fc 100644
--- a/translations/desktop_files/l10n-desktops/km.po
+++ b/translations/desktop_files/l10n-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "ប្រ�ហ្ស៊ីល"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "បាហាម៉ា"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "សាហារ៉ា​�ាង​លិច"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "អ�រីទ្រា"
@@ -633,6 +643,13 @@ msgid "Japan"
 msgstr "ជប៉ុន"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "ឥណ្ឌូន�ស៊ី"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "ក�នយ៉ា"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "កោះ​ម៉ាស្យល"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "នូវែលហ្ស�ឡង់"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "ម៉ាស�ដូនី"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "នីវ"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "នូវែលហ្ស�ឡង់"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "អូម៉ង់"
diff --git a/translations/desktop_files/l10n-desktops/ko.po b/translations/desktop_files/l10n-desktops/ko.po
index 64367fc83..d0543817a 100644
--- a/translations/desktop_files/l10n-desktops/ko.po
+++ b/translations/desktop_files/l10n-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "브�질"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "바하마"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "서사하�"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "�리트리아"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "�본"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "��네시아"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "케�"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "마샬 제�"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "뉴질랜드"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "마케�니아"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "니우�"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "뉴질랜드"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "오만"
diff --git a/translations/desktop_files/l10n-desktops/ku.po b/translations/desktop_files/l10n-desktops/ku.po
index 0a92bb346..ba4bb1961 100644
--- a/translations/desktop_files/l10n-desktops/ku.po
+++ b/translations/desktop_files/l10n-desktops/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -632,6 +642,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -772,6 +787,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -902,11 +922,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/l10n-desktops.pot b/translations/desktop_files/l10n-desktops/l10n-desktops.pot
index a70f3e4fc..6568068b6 100644
--- a/translations/desktop_files/l10n-desktops/l10n-desktops.pot
+++ b/translations/desktop_files/l10n-desktops/l10n-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -632,6 +642,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -772,6 +787,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -902,11 +922,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/lo.po b/translations/desktop_files/l10n-desktops/lo.po
index c6ac5068e..ea0aaaca8 100644
--- a/translations/desktop_files/l10n-desktops/lo.po
+++ b/translations/desktop_files/l10n-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -270,6 +270,11 @@ msgid "Brazil"
 msgstr "ບາຊີລ"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "ປານາມາ"
@@ -436,6 +441,11 @@ msgid "Western Sahara"
 msgstr "ພື້ນທີ່ທຳງານ"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "��້ໄຂ�ຟ້ມທຳງານ"
@@ -642,6 +652,13 @@ msgid "Japan"
 msgstr "�ີ່ປຸ່ນ"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "ອີ�ໂດນີເຊີ�"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "ເວນດາ"
@@ -783,6 +800,11 @@ msgid "Marshall Islands"
 msgstr "ລາດສະອານາຈັ�ໄທ�"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "ນີວຊີ�ລນ"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "ມາເຊໂດເນີ�"
@@ -913,11 +935,6 @@ msgid "Niue"
 msgstr "ເນ໊ຕ"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "ນີວຊີ�ລນ"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "ເ�ີ�ລະມັນ"
diff --git a/translations/desktop_files/l10n-desktops/lt.po b/translations/desktop_files/l10n-desktops/lt.po
index d829b4d3f..745556256 100644
--- a/translations/desktop_files/l10n-desktops/lt.po
+++ b/translations/desktop_files/l10n-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "Brazilija"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamų"
@@ -430,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Vakarų Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "EritrÄ—ja"
@@ -637,6 +647,13 @@ msgid "Japan"
 msgstr "Japonija"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezija"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenija"
@@ -778,6 +795,11 @@ msgid "Marshall Islands"
 msgstr "Marshalo salos"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Naujoji Zelandija"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonija"
@@ -912,11 +934,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Naujoji Zelandija"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omanas"
diff --git a/translations/desktop_files/l10n-desktops/lv.po b/translations/desktop_files/l10n-desktops/lv.po
index 0141ff644..1bd6242bd 100644
--- a/translations/desktop_files/l10n-desktops/lv.po
+++ b/translations/desktop_files/l10n-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "Brazīlija"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Rietumsah�ra"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritreja"
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Jap�na"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonēzija"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenija"
@@ -776,6 +793,11 @@ msgid "Marshall Islands"
 msgstr "M�ršalu salas"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "JaunZÄ“lande"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "MaÄ·edonija"
@@ -906,11 +928,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "JaunZÄ“lande"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Om�na"
diff --git a/translations/desktop_files/l10n-desktops/mi.po b/translations/desktop_files/l10n-desktops/mi.po
index 334b00677..41ddec507 100644
--- a/translations/desktop_files/l10n-desktops/mi.po
+++ b/translations/desktop_files/l10n-desktops/mi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -632,6 +642,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -772,6 +787,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -902,11 +922,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/mk.po b/translations/desktop_files/l10n-desktops/mk.po
index e75d184ca..db98ad41d 100644
--- a/translations/desktop_files/l10n-desktops/mk.po
+++ b/translations/desktop_files/l10n-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Бразил"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Бахами"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Западна Сахара"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Еритреја"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "Јапонија"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Индонезија"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кенија"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "Маршалови О�трови"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�ов Зеланд"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Македонија"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "�ије"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�ов Зеланд"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Оман"
diff --git a/translations/desktop_files/l10n-desktops/mn.po b/translations/desktop_files/l10n-desktops/mn.po
index 88cb64fd2..291aff4ad 100644
--- a/translations/desktop_files/l10n-desktops/mn.po
+++ b/translations/desktop_files/l10n-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -270,6 +270,11 @@ msgid "Brazil"
 msgstr "Бразил"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Бахама�"
@@ -435,6 +440,11 @@ msgid "Western Sahara"
 msgstr "Барууг �ахар"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Эритреа"
@@ -641,6 +651,13 @@ msgid "Japan"
 msgstr "Япон"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Индонез"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кени�"
@@ -782,6 +799,11 @@ msgid "Marshall Islands"
 msgstr "Маршаллын арлууд"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Шин� зеаланд"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Макидон"
@@ -912,11 +934,6 @@ msgid "Niue"
 msgstr "�иуе"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Шин� зеаланд"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Оман"
diff --git a/translations/desktop_files/l10n-desktops/ms.po b/translations/desktop_files/l10n-desktops/ms.po
index be5634503..bac1d787f 100644
--- a/translations/desktop_files/l10n-desktops/ms.po
+++ b/translations/desktop_files/l10n-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -270,6 +270,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -435,6 +440,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -640,6 +650,11 @@ msgid "Japan"
 msgstr "Jepun"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -781,6 +796,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -911,11 +931,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/mt.po b/translations/desktop_files/l10n-desktops/mt.po
index 1ab9a3377..e928fba48 100644
--- a/translations/desktop_files/l10n-desktops/mt.po
+++ b/translations/desktop_files/l10n-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "Brażil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Baħamas"
@@ -430,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Saħara tal-Punent"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -637,6 +647,13 @@ msgid "Japan"
 msgstr "Ä appun"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indoneżja"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenja"
@@ -777,6 +794,12 @@ msgid "Marshall Islands"
 msgstr "Gżejjer Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+#, fuzzy
+msgid "New Zealand"
+msgstr "Sważilandja"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Maċedonja"
@@ -909,12 +932,6 @@ msgid "Niue"
 msgstr "Niwe"
 
 #. Name
-#: nz/entry.desktop:3
-#, fuzzy
-msgid "New Zealand"
-msgstr "Sważilandja"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/nb.po b/translations/desktop_files/l10n-desktops/nb.po
index 7c51900c0..f75b156b6 100644
--- a/translations/desktop_files/l10n-desktops/nb.po
+++ b/translations/desktop_files/l10n-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -635,6 +645,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -775,6 +790,12 @@ msgid "Marshall Islands"
 msgstr "Marshalløyene"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nederland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonia"
@@ -909,12 +930,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-#, fuzzy
-msgid "New Zealand"
-msgstr "Nederland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/nds.po b/translations/desktop_files/l10n-desktops/nds.po
index 01f3d7042..2f0506e11 100644
--- a/translations/desktop_files/l10n-desktops/nds.po
+++ b/translations/desktop_files/l10n-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasilien"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Westsahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -636,6 +646,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonesien"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -776,6 +793,11 @@ msgid "Marshall Islands"
 msgstr "Marshall-Eilannen"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nieg Seeland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonien"
@@ -909,11 +931,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nieg Seeland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/ne.po b/translations/desktop_files/l10n-desktops/ne.po
index 56bb02df5..cb7cdf681 100644
--- a/translations/desktop_files/l10n-desktops/ne.po
+++ b/translations/desktop_files/l10n-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "ब�राजील"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "बहामस"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "पश�चिमी साहारा"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "इरिट�राया"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "जापान"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "इन�डोनेसिया"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "केन�या"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "मार�सल आइसल�याण�ड"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "न�य�जील�याण�ड"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "मेसिडोनिया"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "निउ"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "न�य�जील�याण�ड"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "ओमान"
diff --git a/translations/desktop_files/l10n-desktops/nl.po b/translations/desktop_files/l10n-desktops/nl.po
index 75fe5e743..83b9670d0 100644
--- a/translations/desktop_files/l10n-desktops/nl.po
+++ b/translations/desktop_files/l10n-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brazilië"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -432,6 +437,11 @@ msgid "Western Sahara"
 msgstr "West Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -638,6 +648,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonesië"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -778,6 +795,11 @@ msgid "Marshall Islands"
 msgstr "Marshall Eilanden"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nieuw Zeeland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedonië"
@@ -911,11 +933,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nieuw Zeeland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/nn.po b/translations/desktop_files/l10n-desktops/nn.po
index 6bc27c472..a03c83512 100644
--- a/translations/desktop_files/l10n-desktops/nn.po
+++ b/translations/desktop_files/l10n-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -635,6 +645,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -775,6 +790,12 @@ msgid "Marshall Islands"
 msgstr "Marshalløyane"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+#, fuzzy
+msgid "New Zealand"
+msgstr "Nederland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonia"
@@ -909,12 +930,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-#, fuzzy
-msgid "New Zealand"
-msgstr "Nederland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/nso.po b/translations/desktop_files/l10n-desktops/nso.po
index ab5264df5..70536a537 100644
--- a/translations/desktop_files/l10n-desktops/nso.po
+++ b/translations/desktop_files/l10n-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -271,6 +271,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -436,6 +441,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -641,6 +651,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -781,6 +796,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -911,11 +931,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/oc.po b/translations/desktop_files/l10n-desktops/oc.po
index ecf0b9186..5812ea867 100644
--- a/translations/desktop_files/l10n-desktops/oc.po
+++ b/translations/desktop_files/l10n-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -271,6 +271,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -439,6 +444,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -646,6 +656,11 @@ msgid "Japan"
 msgstr "Japon"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -786,6 +801,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Navera Zelanda"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedònian"
@@ -918,11 +938,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Navera Zelanda"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/pa.po b/translations/desktop_files/l10n-desktops/pa.po
index 5fce83e1f..6bb95aa22 100644
--- a/translations/desktop_files/l10n-desktops/pa.po
+++ b/translations/desktop_files/l10n-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "ਬਰਾਜ਼ੀਲ"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "ਬਾਹਾਮਾਸ"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "ਦੱਖਣੀ ਸਹਾਰਾ"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "ਈਰੀਟਰੀਆ"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "ਜਾਪਾਨ"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "ਇੰਡੋਨੇਸ਼ੀਆ"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "ਕੀਨੀਆ"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "ਮਾਰਸ਼ਲ ਟਾਪੂ"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "ਨਿਊਜ਼ੀਲੈਂਡ"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "ਮੈਕਡੋਨੀਆ"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "ਨੀਉਈ"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "ਨਿਊਜ਼ੀਲੈਂਡ"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "ਓਮਾਨ"
diff --git a/translations/desktop_files/l10n-desktops/pl.po b/translations/desktop_files/l10n-desktops/pl.po
index 03d541db5..7666e1f11 100644
--- a/translations/desktop_files/l10n-desktops/pl.po
+++ b/translations/desktop_files/l10n-desktops/pl.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+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: 2021-05-16 18:21+0000\n"
+"PO-Revision-Date: 2022-10-25 18:06+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/l10n-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.13.1\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -74,7 +77,7 @@ msgstr "Europa Północna"
 #. Name
 #: oceania.desktop:2
 msgid "Oceania"
-msgstr ""
+msgstr "Oceania"
 
 #. Name
 #: southafrica.desktop:2
@@ -262,6 +265,11 @@ msgid "Brazil"
 msgstr "Brazylia"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamy"
@@ -427,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Zachodnia Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Erytrea"
@@ -485,7 +498,7 @@ msgstr "Wielka Brytania"
 #: gd/entry.desktop:2
 #, fuzzy
 msgid "Grenada"
-msgstr "Kanada"
+msgstr "Grenada"
 
 #. Name
 #: ge/entry.desktop:2
@@ -633,6 +646,13 @@ msgid "Japan"
 msgstr "Japonia"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezja"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -773,10 +793,15 @@ msgid "Marshall Islands"
 msgstr "Wyspy Marshalla"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nowa Zelandia"
+
+#. Name
 #: mk/entry.desktop:3
 #, fuzzy
 msgid "Macedonia"
-msgstr "Nowa Kaledonia"
+msgstr "Macedonia"
 
 #. Name
 #: ml/entry.desktop:2
@@ -792,7 +817,7 @@ msgstr ""
 #: mn/entry.desktop:2
 #, fuzzy
 msgid "Mongolia"
-msgstr "Kongo"
+msgstr "Mongolia"
 
 #. Name
 #: mo/entry.desktop:2
@@ -876,7 +901,7 @@ msgstr "Wyspy Norfolk"
 #: ng/entry.desktop:2
 #, fuzzy
 msgid "Nigeria"
-msgstr "Algieria"
+msgstr "Nigeria"
 
 #. Name
 #: ni/entry.desktop:2
@@ -909,11 +934,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nowa Zelandia"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
@@ -947,7 +967,7 @@ msgstr "Filipiny"
 #: pk/entry.desktop:2
 #, fuzzy
 msgid "Pakistan"
-msgstr "Tadżykistan"
+msgstr "Pakistan"
 
 #. Name
 #: pl/entry.desktop:2
@@ -1133,7 +1153,7 @@ msgstr ""
 #: tm/entry.desktop:2
 #, fuzzy
 msgid "Turkmenistan"
-msgstr "Tadżykistan"
+msgstr "Turkmenistan"
 
 #. Name
 #: tn/entry.desktop:2
@@ -1184,7 +1204,7 @@ msgstr "Ukraina"
 #: ug/entry.desktop:2
 #, fuzzy
 msgid "Uganda"
-msgstr "Ruanda"
+msgstr "Uganda"
 
 #. Name
 #: us/entry.desktop:2
@@ -1200,7 +1220,7 @@ msgstr "Urugwaj"
 #: uz/entry.desktop:2
 #, fuzzy
 msgid "Uzbekistan"
-msgstr "Tadżykistan"
+msgstr "Uzbekistan"
 
 #. Name
 #: va/entry.desktop:2
diff --git a/translations/desktop_files/l10n-desktops/pt.po b/translations/desktop_files/l10n-desktops/pt.po
index b200149e7..4fd790c7d 100644
--- a/translations/desktop_files/l10n-desktops/pt.po
+++ b/translations/desktop_files/l10n-desktops/pt.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+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: 2021-05-16 18:21+0000\n"
+"PO-Revision-Date: 2021-11-23 16:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/l10n-desktop-files/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.9.1\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -158,9 +159,8 @@ msgstr "Antilhas Holandesas"
 
 #. Name
 #: ao/entry.desktop:2
-#, fuzzy
 msgid "Angola"
-msgstr "Mongólia"
+msgstr "Angola"
 
 #. Name
 #: ar/entry.desktop:2
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -309,9 +314,8 @@ msgstr "República Central Africana"
 
 #. Name
 #: cg/entry.desktop:2
-#, fuzzy
 msgid "Congo"
-msgstr "Mongólia"
+msgstr ""
 
 #. Name
 #: ch/entry.desktop:2
@@ -430,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Sara Ocidental"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritreia"
@@ -635,6 +644,13 @@ msgid "Japan"
 msgstr "Japão"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonésia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Quénia"
@@ -775,6 +791,11 @@ msgid "Marshall Islands"
 msgstr "Ilhas Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nova Zelândia"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedónia"
@@ -906,11 +927,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nova Zelândia"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omã"
diff --git a/translations/desktop_files/l10n-desktops/pt_BR.po b/translations/desktop_files/l10n-desktops/pt_BR.po
index ca4b26d51..04846c971 100644
--- a/translations/desktop_files/l10n-desktops/pt_BR.po
+++ b/translations/desktop_files/l10n-desktops/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-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Sahara Ocidental"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritréia"
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Japão"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonésia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Quênia"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Ilhas Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nova Zelândia"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedônia"
@@ -906,11 +928,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nova Zelândia"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omã"
diff --git a/translations/desktop_files/l10n-desktops/ro.po b/translations/desktop_files/l10n-desktops/ro.po
index 1ee2a6d97..2b94844e8 100644
--- a/translations/desktop_files/l10n-desktops/ro.po
+++ b/translations/desktop_files/l10n-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brazilia"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Sahara de Vest"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Japonia"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Insulele Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Noua Zeelandă"
+
+#. Name
 #: mk/entry.desktop:3
 #, fuzzy
 msgid "Macedonia"
@@ -910,11 +932,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Noua Zeelandă"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/ru.po b/translations/desktop_files/l10n-desktops/ru.po
index f24d5540c..47f7d4dba 100644
--- a/translations/desktop_files/l10n-desktops/ru.po
+++ b/translations/desktop_files/l10n-desktops/ru.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 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: 2020-06-22 18:27+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: 2021-05-16 18:21+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/l10n-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
 #: caribbean.desktop:2
@@ -244,7 +247,7 @@ msgstr "Бенин"
 #. Name
 #: bm/entry.desktop:2
 msgid "Bermuda"
-msgstr "Бермуд�кие О�трова"
+msgstr "Бермуды"
 
 #. Name
 #: bn/entry.desktop:3
@@ -262,6 +265,11 @@ msgid "Brazil"
 msgstr "Бразили�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr "Шрифт Брайл�"
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Багам�кие о�трова"
@@ -304,7 +312,7 @@ msgstr "Демократиче�ка� Ре�публика Конго"
 #. Name
 #: cf/entry.desktop:2
 msgid "Central African Republic"
-msgstr "Центрально-�фрикан�ка� Ре�публика"
+msgstr "Центральноафрикан�ка� Ре�публика"
 
 #. Name
 #: cg/entry.desktop:2
@@ -319,7 +327,7 @@ msgstr "Швейцари�"
 #. Name
 #: ci/entry.desktop:2
 msgid "Cote d'ivoire"
-msgstr "Кот Д'Ивуар"
+msgstr "Кот-д’Ивуар"
 
 #. Name
 #: ck/entry.desktop:2
@@ -399,7 +407,7 @@ msgstr "Доминика"
 #. Name
 #: do/entry.desktop:2
 msgid "Dominican Republic"
-msgstr "Доминикан�ка� ре�публика"
+msgstr "Доминикан�ка� Ре�публика"
 
 #. Name
 #: dz/entry.desktop:2
@@ -427,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Западна� Сахара"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr "Э�перанто"
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Эритре�"
@@ -454,7 +467,7 @@ msgstr "Фиджи"
 #. Name
 #: fk/entry.desktop:2
 msgid "Falkland Islands (Malvinas)"
-msgstr "Фолкленд�кие (Мальвин�кие) о�трова"
+msgstr "Фолкленд�кие о�трова (Мальвин�кие)"
 
 #. Name
 #: fm/entry.desktop:2
@@ -632,6 +645,11 @@ msgid "Japan"
 msgstr "Япони�"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr "Индонези� (Ява)"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кени�"
@@ -639,7 +657,7 @@ msgstr "Кени�"
 #. Name
 #: kg/entry.desktop:2
 msgid "Kyrgyzstan"
-msgstr "Киргиз�тан"
+msgstr "Киргизи�"
 
 #. Name
 #: kh/entry.desktop:2
@@ -679,7 +697,7 @@ msgstr "Кувейт"
 #. Name
 #: ky/entry.desktop:2
 msgid "Cayman Islands"
-msgstr "Каймановы о�трова"
+msgstr "О�трова Кайман"
 
 #. Name
 #: kz/entry.desktop:2
@@ -769,7 +787,12 @@ msgstr "Мадага�кар"
 #. Name
 #: mh/entry.desktop:2
 msgid "Marshall Islands"
-msgstr "Маршалловы о�трова"
+msgstr "Маршалловы О�трова"
+
+#. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�ова� Зеланди�"
 
 #. Name
 #: mk/entry.desktop:3
@@ -824,7 +847,7 @@ msgstr "Маврикий"
 #. Name
 #: mv/entry.desktop:2
 msgid "Maldives"
-msgstr "Мальдив�кие о�трова"
+msgstr "Мальдивы"
 
 #. Name
 #: mw/entry.desktop:2
@@ -902,11 +925,6 @@ msgid "Niue"
 msgstr "�иуе"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�ова� Зеланди�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Оман"
@@ -929,7 +947,7 @@ msgstr "Француз�ка� Полинези�"
 #. Name
 #: pg/entry.desktop:2
 msgid "Papua New Guinea"
-msgstr "Папуа-�ова� Гвине�"
+msgstr "Папуа �ова� Гвине�"
 
 #. Name
 #: ph/entry.desktop:2
@@ -1039,7 +1057,7 @@ msgstr "Сингапур"
 #. Name
 #: sh/entry.desktop:2
 msgid "Saint Helena"
-msgstr "о�тров Св�той Елены"
+msgstr "О�тров Св�той Елены"
 
 #. Name
 #: si/entry.desktop:2
diff --git a/translations/desktop_files/l10n-desktops/rw.po b/translations/desktop_files/l10n-desktops/rw.po
index ec6eaa3aa..ff1a25a9a 100644
--- a/translations/desktop_files/l10n-desktops/rw.po
+++ b/translations/desktop_files/l10n-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Burezile"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamasi"
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Sahara y'Iburengerazuba"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritereya"
@@ -634,6 +644,13 @@ msgid "Japan"
 msgstr "Ubuyapani"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonesiya"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Ibirwa bya Marishali"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nuveli Zelande"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Masedoniya"
@@ -907,11 +929,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nuveli Zelande"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omani"
diff --git a/translations/desktop_files/l10n-desktops/se.po b/translations/desktop_files/l10n-desktops/se.po
index a0ad9027a..3900f7155 100644
--- a/translations/desktop_files/l10n-desktops/se.po
+++ b/translations/desktop_files/l10n-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Oarje-Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -634,6 +644,11 @@ msgid "Japan"
 msgstr "Japána"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -774,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "Marshallsullot"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Ođđa Zealánda"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonia"
@@ -907,11 +927,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Ođđa Zealánda"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/sk.po b/translations/desktop_files/l10n-desktops/sk.po
index 196ab2a09..824735228 100644
--- a/translations/desktop_files/l10n-desktops/sk.po
+++ b/translations/desktop_files/l10n-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brazília"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamy"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Západná Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -634,6 +644,13 @@ msgid "Japan"
 msgstr "Japonsko"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonézia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Keňa"
@@ -774,6 +791,11 @@ msgid "Marshall Islands"
 msgstr "Marshallove ostrovy"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nový Zéland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedónsko"
@@ -906,11 +928,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nový Zéland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Omán"
diff --git a/translations/desktop_files/l10n-desktops/sl.po b/translations/desktop_files/l10n-desktops/sl.po
index 079460815..b2da95de9 100644
--- a/translations/desktop_files/l10n-desktops/sl.po
+++ b/translations/desktop_files/l10n-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brazilija"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahami"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Zahodna Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritreja"
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Japonska"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezija"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenija"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Marshallovi otoki"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nova Zelandija"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonija"
@@ -908,11 +930,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nova Zelandija"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/sq.po b/translations/desktop_files/l10n-desktops/sq.po
index bc927ff47..b2f593812 100644
--- a/translations/desktop_files/l10n-desktops/sq.po
+++ b/translations/desktop_files/l10n-desktops/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -632,6 +642,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -772,6 +787,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -902,11 +922,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/sr.po b/translations/desktop_files/l10n-desktops/sr.po
index c605984e0..09e313b61 100644
--- a/translations/desktop_files/l10n-desktops/sr.po
+++ b/translations/desktop_files/l10n-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Бразил"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Бахами"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Западна Сахара"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Еритреја"
@@ -633,6 +643,13 @@ msgid "Japan"
 msgstr "Јапан"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Индонезија"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кенија"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "Маршалова о�трва"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�ови Зеланд"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Македонија"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "�иуе"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�ови Зеланд"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Оман"
diff --git a/translations/desktop_files/l10n-desktops/sr@Latn.po b/translations/desktop_files/l10n-desktops/sr@Latn.po
index 02c79dc74..1e9364758 100644
--- a/translations/desktop_files/l10n-desktops/sr@Latn.po
+++ b/translations/desktop_files/l10n-desktops/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-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahami"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Zapadna Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritreja"
@@ -634,6 +644,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezija"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenija"
@@ -774,6 +791,11 @@ msgid "Marshall Islands"
 msgstr "Maršalova ostrva"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Novi Zeland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonija"
@@ -905,11 +927,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Novi Zeland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/ss.po b/translations/desktop_files/l10n-desktops/ss.po
index 40ea5d416..2a751b18f 100644
--- a/translations/desktop_files/l10n-desktops/ss.po
+++ b/translations/desktop_files/l10n-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -272,6 +272,11 @@ msgid "Brazil"
 msgstr "I-Brazil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -439,6 +444,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -646,6 +656,13 @@ msgid "Japan"
 msgstr "I-Japan"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "I-Indonesia "
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -786,6 +803,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "I-New Zealand"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "I-Macedonia"
@@ -919,11 +941,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "I-New Zealand"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "I-Oman"
diff --git a/translations/desktop_files/l10n-desktops/sv.po b/translations/desktop_files/l10n-desktops/sv.po
index 54ed9e77c..166698a84 100644
--- a/translations/desktop_files/l10n-desktops/sv.po
+++ b/translations/desktop_files/l10n-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasilien"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Västsahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -636,6 +646,13 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonesien"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -776,6 +793,11 @@ msgid "Marshall Islands"
 msgstr "Marshallöarna"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nya Zeeland"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonien"
@@ -909,11 +931,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nya Zeeland"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/ta.po b/translations/desktop_files/l10n-desktops/ta.po
index 620bc5736..dac7e00cb 100644
--- a/translations/desktop_files/l10n-desktops/ta.po
+++ b/translations/desktop_files/l10n-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "பிரேசில�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "பனாமா"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "மேற�கத�திய சஹாரா"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "ரிட�ரியா"
@@ -634,6 +644,13 @@ msgid "Japan"
 msgstr "சப�பான�"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "இந�தோனீசியா"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "கென�யா"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "மார�ஷல� தீவ�கள�"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "நியூசிலாந�த�"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "மாசிடோ னியா"
@@ -905,11 +927,6 @@ msgid "Niue"
 msgstr "நீய�"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "நியூசிலாந�த�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "ஓமன�"
diff --git a/translations/desktop_files/l10n-desktops/te.po b/translations/desktop_files/l10n-desktops/te.po
index 78ffc3783..b90b50113 100644
--- a/translations/desktop_files/l10n-desktops/te.po
+++ b/translations/desktop_files/l10n-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "బ�రాజిల�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "బహామాస�"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "పశ�చిమ సహారా"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "ఎరిట�రియా"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "జపాన�"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "ఇండొనెషియా"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "కెన�యా"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "మార�షల� ద�విపాల�"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "న�య�జీలాండ�"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "మెసిడొనియా"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "నియ�"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "న�య�జీలాండ�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "ఒమాన�"
diff --git a/translations/desktop_files/l10n-desktops/tg.po b/translations/desktop_files/l10n-desktops/tg.po
index 9fb49402f..9d936a63e 100644
--- a/translations/desktop_files/l10n-desktops/tg.po
+++ b/translations/desktop_files/l10n-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "Бразил"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Боҳомо�"
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Саҳрои Ғарбӣ"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Эритри�"
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Ҷопон"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Индонезӣ"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Куниё"
@@ -776,6 +793,11 @@ msgid "Marshall Islands"
 msgstr "Ҷазираи Маршал"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Зилонди �ав"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Мақдуниё"
@@ -906,11 +928,6 @@ msgid "Niue"
 msgstr "�иу"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Зилонди �ав"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Оман"
diff --git a/translations/desktop_files/l10n-desktops/th.po b/translations/desktop_files/l10n-desktops/th.po
index 01aee81dc..c62696477 100644
--- a/translations/desktop_files/l10n-desktops/th.po
+++ b/translations/desktop_files/l10n-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "บราซิล"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "บาฮามา"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "ซาฮาร่าตะวันต�"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "เอริเทรีย"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "�ี่ปุ่น"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "อินโดนีเซีย"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "เคนยา"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "หมู่เ�าะมา�ชล"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "นิวซี�ลนด์"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "มาเซโดเนีย"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "นิอุเอ"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "นิวซี�ลนด์"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "โอมาน"
diff --git a/translations/desktop_files/l10n-desktops/ti.po b/translations/desktop_files/l10n-desktops/ti.po
index cea6ad074..5acac36b7 100644
--- a/translations/desktop_files/l10n-desktops/ti.po
+++ b/translations/desktop_files/l10n-desktops/ti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -632,6 +642,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -772,6 +787,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -902,11 +922,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/tr.po b/translations/desktop_files/l10n-desktops/tr.po
index 4f6266e2c..8bbfd987f 100644
--- a/translations/desktop_files/l10n-desktops/tr.po
+++ b/translations/desktop_files/l10n-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brezilya"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bahamalar"
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Batı Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritre"
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Japonya"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Ä°ndonezya"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Marşal Adaları"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Yeni Zelanda"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonya"
@@ -906,11 +928,6 @@ msgid "Niue"
 msgstr "Nive"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Yeni Zelanda"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Umman"
diff --git a/translations/desktop_files/l10n-desktops/tt.po b/translations/desktop_files/l10n-desktops/tt.po
index b51819cfe..7e07e9015 100644
--- a/translations/desktop_files/l10n-desktops/tt.po
+++ b/translations/desktop_files/l10n-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Batış Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -635,6 +645,13 @@ msgid "Japan"
 msgstr "Japan, Yaponia"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Ä°ndonesia"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Marşal Utrawları"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Yaña Zealand"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedonia"
@@ -907,11 +929,6 @@ msgid "Niue"
 msgstr "Niu"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Yaña Zealand"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/uk.po b/translations/desktop_files/l10n-desktops/uk.po
index f6409bbf4..4c8749dd6 100644
--- a/translations/desktop_files/l10n-desktops/uk.po
+++ b/translations/desktop_files/l10n-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, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2021-05-16 18:21+0000\n"
+"PO-Revision-Date: 2021-10-06 16:31+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/l10n-desktop-files/uk/>\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.1.1\n"
+"X-Generator: Weblate 4.8.1\n"
 
 #. Name
 #: caribbean.desktop:2
@@ -264,6 +264,11 @@ msgid "Brazil"
 msgstr "Бразилі�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr "Брайль"
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Багами"
@@ -429,6 +434,11 @@ msgid "Western Sahara"
 msgstr "Західна Сахара"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr "Е�перанто"
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Еритре�"
@@ -634,6 +644,11 @@ msgid "Japan"
 msgstr "Японі�"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr "Індонезі� (Java)"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кені�"
@@ -774,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "Маршаль�ькі о�трови"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�ова Зеланді�"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Македоні�"
@@ -904,11 +924,6 @@ msgid "Niue"
 msgstr "�іуе"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�ова Зеланді�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Оман"
diff --git a/translations/desktop_files/l10n-desktops/uz.po b/translations/desktop_files/l10n-desktops/uz.po
index 760bfff83..15a8d3c56 100644
--- a/translations/desktop_files/l10n-desktops/uz.po
+++ b/translations/desktop_files/l10n-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Braziliya"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Bagama Orollari"
@@ -428,6 +433,11 @@ msgid "Western Sahara"
 msgstr "Gʻarbiy Saxara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritriya"
@@ -634,6 +644,13 @@ msgid "Japan"
 msgstr "Yaponiya"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indoneziya"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Keniya"
@@ -775,6 +792,11 @@ msgid "Marshall Islands"
 msgstr "Marshall Orollari"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Yangi Zelandiya"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Makedoniya"
@@ -906,11 +928,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Yangi Zelandiya"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Ummon"
diff --git a/translations/desktop_files/l10n-desktops/uz@cyrillic.po b/translations/desktop_files/l10n-desktops/uz@cyrillic.po
index 128153626..9354f0a7e 100644
--- a/translations/desktop_files/l10n-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/l10n-desktops/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-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "Бразили�"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "Багама Ороллари"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "Ғарбий Сахара"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Эритри�"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "Япони�"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Индонези�"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Кени�"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "Маршалл Ороллари"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Янги Зеланди�"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Македони�"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "�иуе"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Янги Зеланди�"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Уммон"
diff --git a/translations/desktop_files/l10n-desktops/ven.po b/translations/desktop_files/l10n-desktops/ven.po
index ac77d8989..1b74e47b3 100644
--- a/translations/desktop_files/l10n-desktops/ven.po
+++ b/translations/desktop_files/l10n-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -271,6 +271,11 @@ msgid "Brazil"
 msgstr "Burazili"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -438,6 +443,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -646,6 +656,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -786,6 +801,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Masedonia"
@@ -917,11 +937,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/vi.po b/translations/desktop_files/l10n-desktops/vi.po
index 59a4d3f9d..015411411 100644
--- a/translations/desktop_files/l10n-desktops/vi.po
+++ b/translations/desktop_files/l10n-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -430,6 +435,11 @@ msgid "Western Sahara"
 msgstr "Tây Sahara"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -638,6 +648,11 @@ msgid "Japan"
 msgstr "Nhật Bản"
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -779,6 +794,12 @@ msgid "Marshall Islands"
 msgstr "�ảo Faroe"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+#, fuzzy
+msgid "New Zealand"
+msgstr "Hà Lan"
+
+#. Name
 #: mk/entry.desktop:3
 #, fuzzy
 msgid "Macedonia"
@@ -910,12 +931,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-#, fuzzy
-msgid "New Zealand"
-msgstr "Hà Lan"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/wa.po b/translations/desktop_files/l10n-desktops/wa.po
index 8f2ff3ae1..e08efca4b 100644
--- a/translations/desktop_files/l10n-desktops/wa.po
+++ b/translations/desktop_files/l10n-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -263,6 +263,11 @@ msgid "Brazil"
 msgstr "Braezi"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -431,6 +436,11 @@ msgid "Western Sahara"
 msgstr "Sara Coûtchantrece"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "Eritrêye"
@@ -636,6 +646,13 @@ msgid "Japan"
 msgstr "Djapon"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "Indonezeye"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "Kenia"
@@ -777,6 +794,11 @@ msgid "Marshall Islands"
 msgstr "Iyes Marshall"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "Nouve Zelande"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "Macedoneye"
@@ -908,11 +930,6 @@ msgid "Niue"
 msgstr "Niuwé"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "Nouve Zelande"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/l10n-desktops/xh.po b/translations/desktop_files/l10n-desktops/xh.po
index e6f403b03..0c3e2c338 100644
--- a/translations/desktop_files/l10n-desktops/xh.po
+++ b/translations/desktop_files/l10n-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -271,6 +271,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -438,6 +443,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -643,6 +653,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -783,6 +798,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -913,11 +933,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "Oman"
diff --git a/translations/desktop_files/l10n-desktops/zh_CN.po b/translations/desktop_files/l10n-desktops/zh_CN.po
index 431aa8687..bce603410 100644
--- a/translations/desktop_files/l10n-desktops/zh_CN.po
+++ b/translations/desktop_files/l10n-desktops/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-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "巴西"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "巴哈马"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "西撒哈拉"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "厄立特里亚"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "日本"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "�度尼西亚"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "肯尼亚"
@@ -773,6 +790,11 @@ msgid "Marshall Islands"
 msgstr "马�群岛"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "新西兰"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "马其顿"
@@ -903,11 +925,6 @@ msgid "Niue"
 msgstr "纽埃"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "新西兰"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "阿曼"
diff --git a/translations/desktop_files/l10n-desktops/zh_TW.po b/translations/desktop_files/l10n-desktops/zh_TW.po
index 9eed76851..528ea161c 100644
--- a/translations/desktop_files/l10n-desktops/zh_TW.po
+++ b/translations/desktop_files/l10n-desktops/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-22 18:27+0200\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"
@@ -262,6 +262,11 @@ msgid "Brazil"
 msgstr "巴西"
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr "巴拿馬"
@@ -427,6 +432,11 @@ msgid "Western Sahara"
 msgstr "西盛哈拉"
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr "厄利垂亞"
@@ -632,6 +642,13 @@ msgid "Japan"
 msgstr "日本"
 
 #. Name
+#: jv/entry.desktop:2
+#, fuzzy
+#| msgid "Indonesia"
+msgid "Indonesia (Java)"
+msgstr "�尼"
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr "肯亞"
@@ -772,6 +789,11 @@ msgid "Marshall Islands"
 msgstr "馬紹爾群島"
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr "�西蘭"
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr "馬其頓"
@@ -902,11 +924,6 @@ msgid "Niue"
 msgstr "�鄂島"
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr "�西蘭"
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr "阿曼"
diff --git a/translations/desktop_files/l10n-desktops/zu.po b/translations/desktop_files/l10n-desktops/zu.po
index b2c1383cb..75338e47f 100644
--- a/translations/desktop_files/l10n-desktops/zu.po
+++ b/translations/desktop_files/l10n-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-22 18:27+0200\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"
@@ -271,6 +271,11 @@ msgid "Brazil"
 msgstr ""
 
 #. Name
+#: braille/entry.desktop:2
+msgid "Braille"
+msgstr ""
+
+#. Name
 #: bs/entry.desktop:2
 msgid "Bahamas"
 msgstr ""
@@ -436,6 +441,11 @@ msgid "Western Sahara"
 msgstr ""
 
 #. Name
+#: eo/entry.desktop:2
+msgid "Esperanto"
+msgstr ""
+
+#. Name
 #: er/entry.desktop:2
 msgid "Eritrea"
 msgstr ""
@@ -643,6 +653,11 @@ msgid "Japan"
 msgstr ""
 
 #. Name
+#: jv/entry.desktop:2
+msgid "Indonesia (Java)"
+msgstr ""
+
+#. Name
 #: ke/entry.desktop:2
 msgid "Kenya"
 msgstr ""
@@ -783,6 +798,11 @@ msgid "Marshall Islands"
 msgstr ""
 
 #. Name
+#: mi/entry.desktop:2 nz/entry.desktop:3
+msgid "New Zealand"
+msgstr ""
+
+#. Name
 #: mk/entry.desktop:3
 msgid "Macedonia"
 msgstr ""
@@ -913,11 +933,6 @@ msgid "Niue"
 msgstr ""
 
 #. Name
-#: nz/entry.desktop:3
-msgid "New Zealand"
-msgstr ""
-
-#. Name
 #: om/entry.desktop:2
 msgid "Oman"
 msgstr ""
diff --git a/translations/desktop_files/libkonq-desktops/cs.po b/translations/desktop_files/libkonq-desktops/cs.po
index 047789c93..084069615 100644
--- a/translations/desktop_files/libkonq-desktops/cs.po
+++ b/translations/desktop_files/libkonq-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/libkonq-desktop-files/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.2.2\n"
 
 #. Name
 #: directory_bookmarkbar.desktop:3
@@ -24,7 +25,7 @@ msgstr "Lišta se záložkami"
 #. Name
 #: favicons/favicons.desktop:3
 msgid "KDED Favicon Module"
-msgstr "Modul KDEDu Favicon"
+msgstr "KDED modul favicon"
 
 #. Comment
 #: favicons/favicons.desktop:4
@@ -39,4 +40,4 @@ msgstr "Modul pro kontextovou nabídku Konqueroru"
 #. Name
 #: servicemenus/edit-as-root.desktop:6
 msgid "Edit as system administrator"
-msgstr ""
+msgstr "Upravit jako správce"
diff --git a/translations/desktop_files/libkonq-desktops/pl.po b/translations/desktop_files/libkonq-desktops/pl.po
index 442c52bde..0ecc246b3 100644
--- a/translations/desktop_files/libkonq-desktops/pl.po
+++ b/translations/desktop_files/libkonq-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/libkonq-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.1.1\n"
 
 #. Name
 #: directory_bookmarkbar.desktop:3
@@ -39,4 +41,4 @@ msgstr "Wtyczka do menu (otwieranego przyciskiem myszy) Konquerora"
 #. Name
 #: servicemenus/edit-as-root.desktop:6
 msgid "Edit as system administrator"
-msgstr ""
+msgstr "Edytuj jako administrator"
diff --git a/translations/desktop_files/libkonq-desktops/ru.po b/translations/desktop_files/libkonq-desktops/ru.po
index d555442f9..a9469b816 100644
--- a/translations/desktop_files/libkonq-desktops/ru.po
+++ b/translations/desktop_files/libkonq-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>, 2023.
 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: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/libkonq-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
 #: directory_bookmarkbar.desktop:3
@@ -39,4 +41,4 @@ msgstr "Модуль дл� диалога на�троек"
 #. Name
 #: servicemenus/edit-as-root.desktop:6
 msgid "Edit as system administrator"
-msgstr ""
+msgstr "Править от �и�темного админи�тратора"
diff --git a/translations/desktop_files/tde_release_notes.desktop/cs.po b/translations/desktop_files/tde_release_notes.desktop/cs.po
new file mode 100644
index 000000000..41e0f455d
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/cs.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
+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: 2020-09-13 17:05+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tde_release_notesdesktop/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.2.2\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "tde_release_notes"
diff --git a/translations/desktop_files/tde_release_notes.desktop/it.po b/translations/desktop_files/tde_release_notes.desktop/it.po
new file mode 100644
index 000000000..e529d839e
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/it.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
+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: 2022-03-16 06:11+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tde_release_notesdesktop/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.11.2\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "Note di rilascio di TDE"
diff --git a/translations/desktop_files/tde_release_notes.desktop/pt.po b/translations/desktop_files/tde_release_notes.desktop/pt.po
new file mode 100644
index 000000000..353c6a711
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/pt.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021.
+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: 2021-11-27 12:59+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tde_release_notesdesktop/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.9.1\n"
+
+#. Name
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "notas de lançamento tde"
diff --git a/translations/desktop_files/tde_release_notes.desktop/ru.po b/translations/desktop_files/tde_release_notes.desktop/ru.po
new file mode 100644
index 000000000..344bc6ac8
--- /dev/null
+++ b/translations/desktop_files/tde_release_notes.desktop/ru.po
@@ -0,0 +1,24 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+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: 2023-06-04 15:15+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tde_release_notesdesktop/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
+#: tde_release_notes.desktop:3
+msgid "tde_release_notes"
+msgstr "Примечани� к выпу�ку TDE"
diff --git a/translations/desktop_files/tdehtml_plugins.desktop/ru.po b/translations/desktop_files/tdehtml_plugins.desktop/ru.po
index cf4df8d42..392528381 100644
--- a/translations/desktop_files/tdehtml_plugins.desktop/ru.po
+++ b/translations/desktop_files/tdehtml_plugins.desktop/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-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: 2023-12-09 05:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdehtml_pluginsdesktop/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
 #: tdehtml_plugins.desktop:14
@@ -30,3 +32,4 @@ msgstr "�а�тройка модулей браузера"
 #: 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/tdeintegration.desktop/cs.po b/translations/desktop_files/tdeintegration.desktop/cs.po
new file mode 100644
index 000000000..f8cfe5958
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/cs.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
+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: 2021-09-02 21:14+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdeintegrationdesktop/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.8\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr "Modul pro integraci s TDE"
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr "Modul pro integraci uživatelského rozhraní pro ne-TDE aplikace"
diff --git a/translations/desktop_files/tdeintegration.desktop/it.po b/translations/desktop_files/tdeintegration.desktop/it.po
new file mode 100644
index 000000000..9f13538d1
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/it.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
+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: 2021-04-18 18:00+0000\n"
+"Last-Translator: Fiflagar Lorizen <fiflagar.lorizen@posteo.net>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeintegrationdesktop/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.5.3\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr "Modulo di Integrazione TDE"
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr "Modulo per integrare l'interfaccia di applicazioni non native TDE"
diff --git a/translations/desktop_files/tdeintegration.desktop/pt.po b/translations/desktop_files/tdeintegration.desktop/pt.po
new file mode 100644
index 000000000..c6001f75c
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/pt.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021.
+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: 2021-03-10 14:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeintegrationdesktop/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.5.1\n"
+
+#. Name
+#: tdeintegration.desktop:12
+msgid "TDE Integration Module"
+msgstr "Módulo de Integração TDE"
+
+#. Comment
+#: tdeintegration.desktop:14
+msgid "Module for integrating UI of non-TDE applications"
+msgstr "Módulo para a integração de aplicações não-TDE"
diff --git a/translations/desktop_files/tdeintegration.desktop/ru.po b/translations/desktop_files/tdeintegration.desktop/ru.po
new file mode 100644
index 000000000..b8fc55ec5
--- /dev/null
+++ b/translations/desktop_files/tdeintegration.desktop/ru.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# 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 21:05+0200\n"
+"PO-Revision-Date: 2023-06-04 15:15+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeintegrationdesktop/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
+#: 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/tdeioslave-desktops/af.po b/translations/desktop_files/tdeioslave-desktops/af.po
index 08125f4a3..ef37217c5 100644
--- a/translations/desktop_files/tdeioslave-desktops/af.po
+++ b/translations/desktop_files/tdeioslave-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Uitskiet"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Koppel"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Verwyder veilig"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Ontkoppel"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ar.po b/translations/desktop_files/tdeioslave-desktops/ar.po
index fdce85e39..3a60497b1 100644
--- a/translations/desktop_files/tdeioslave-desktops/ar.po
+++ b/translations/desktop_files/tdeioslave-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "أقذ�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "رك�ب"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "أزل التركيب"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/az.po b/translations/desktop_files/tdeioslave-desktops/az.po
index 43c1ecb71..346b7b677 100644
--- a/translations/desktop_files/tdeioslave-desktops/az.po
+++ b/translations/desktop_files/tdeioslave-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Çıxart"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "BaÄŸla"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Ayır"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/be.po b/translations/desktop_files/tdeioslave-desktops/be.po
index 61309ba98..0f170766e 100644
--- a/translations/desktop_files/tdeioslave-desktops/be.po
+++ b/translations/desktop_files/tdeioslave-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Вызваліць"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Прымацаваць"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "�дмацаваць"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/bg.po b/translations/desktop_files/tdeioslave-desktops/bg.po
index ddfcfccea..ef83708ad 100644
--- a/translations/desktop_files/tdeioslave-desktops/bg.po
+++ b/translations/desktop_files/tdeioslave-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+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/"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "При�тавка за на�тройване на монтирането (Konqueror)"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr "Отключи"
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Изваждане"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Монтиране"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr "Отключи"
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Демонтиране"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/bn.po b/translations/desktop_files/tdeioslave-desktops/bn.po
index 83c045f2e..0480917dc 100644
--- a/translations/desktop_files/tdeioslave-desktops/bn.po
+++ b/translations/desktop_files/tdeioslave-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "ইজেক�ট"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "মাউন�ট"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "আনমাউন�ট"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/br.po b/translations/desktop_files/tdeioslave-desktops/br.po
index 82d0c8686..97424c876 100644
--- a/translations/desktop_files/tdeioslave-desktops/br.po
+++ b/translations/desktop_files/tdeioslave-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Stlepel"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Marc'hañ"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Divarc'hañ"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/bs.po b/translations/desktop_files/tdeioslave-desktops/bs.po
index 20f9342cf..c60f8ade4 100644
--- a/translations/desktop_files/tdeioslave-desktops/bs.po
+++ b/translations/desktop_files/tdeioslave-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Izbaci"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montiraj"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Sigurno ukloni"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Demontiraj"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ca.po b/translations/desktop_files/tdeioslave-desktops/ca.po
index 97ce4a9c7..7b6a47704 100644
--- a/translations/desktop_files/tdeioslave-desktops/ca.po
+++ b/translations/desktop_files/tdeioslave-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -370,27 +370,37 @@ msgstr ""
 "comportament de muntatge"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Expulsa"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Munta"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Obre la carpeta de mitjans del sistema"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Extreu amb seguretat"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Desmunta"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ca@valencia.po b/translations/desktop_files/tdeioslave-desktops/ca@valencia.po
index 3152f7769..d97ddcda4 100644
--- a/translations/desktop_files/tdeioslave-desktops/ca@valencia.po
+++ b/translations/desktop_files/tdeioslave-desktops/ca@valencia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/cs.po b/translations/desktop_files/tdeioslave-desktops/cs.po
index 094f74056..c0fc666c0 100644
--- a/translations/desktop_files/tdeioslave-desktops/cs.po
+++ b/translations/desktop_files/tdeioslave-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2021-09-05 17:59+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdeioslave-desktop-files/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.8\n"
 
 #. Name
 #: cgi/kcmcgi/kcmcgi.desktop:9
@@ -38,14 +39,13 @@ msgstr "Démon upozorňování na domovské URL"
 
 #. Comment
 #: home/kdedmodule/homedirnotify.desktop:6
-#, fuzzy
 msgid "Provides change notification for user's home folder ($HOME)"
-msgstr "Poskytuje oznamování o změnách síťových složek"
+msgstr "Poskytuje oznamování o změnách uživatelovo domovské složky ($HOME)"
 
 #. Name
 #: man/kmanpart.desktop:4
 msgid "KManPart"
-msgstr ""
+msgstr "KManPart"
 
 #. Comment
 #: man/kmanpart.desktop:6
@@ -60,7 +60,8 @@ msgstr "KDED správce médií"
 #. Comment
 #: media/mediamanager/mediamanager.desktop:6
 msgid "Keep track of media activities and allow to (un)mount (media:/)"
-msgstr "Udržuje přehled o připojených zařízeních"
+msgstr ""
+"Udržuje přehled o zařízeních a umožňuje připojování a odpojování (media:/)"
 
 #. Name
 #: media/medianotifier/medianotifier.desktop:4
@@ -80,137 +81,137 @@ msgstr "Zvukové CD"
 #. Comment
 #: media/mimetypes/blankbluray.desktop:6
 msgid "Blank BLURAY"
-msgstr "Prázdné BLURAY"
+msgstr "Prázdný disk BLURAY"
 
 #. Comment
 #: media/mimetypes/blankcd.desktop:6
 msgid "Blank CD"
-msgstr "Prázdné CD"
+msgstr "Prázdný disk CD"
 
 #. Comment
 #: media/mimetypes/blankdvd.desktop:6
 msgid "Blank DVD"
-msgstr "Prázdné DVD"
+msgstr "Prázdný disk DVD"
 
 #. Comment
 #: media/mimetypes/bluray_encrypted_locked.desktop:7
 msgid "Encrypted Locked BLURAY"
-msgstr ""
+msgstr "Zam�ený šifrovaný disk BLURAY"
 
 #. Comment
 #: media/mimetypes/bluray_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked BLURAY"
-msgstr ""
+msgstr "Odem�ený šifrovaný disk BLURAY"
 
 #. Comment
 #: media/mimetypes/bluray_mounted.desktop:6
 msgid "Mounted BLURAY"
-msgstr "Připojené BLURAY"
+msgstr "Připojený disk BLURAY"
 
 #. Comment
 #: media/mimetypes/bluray_unmounted.desktop:6
 msgid "Unmounted BLURAY"
-msgstr "Odpojené BLURAY"
+msgstr "Odpojený disk BLURAY"
 
 #. Comment
 #: media/mimetypes/blurayvideo.desktop:6
 msgid "BLURAY Video Disk"
-msgstr "BLURAY video"
+msgstr "Disk BLURAY video"
 
 #. Comment
 #: media/mimetypes/camera_mounted.desktop:6
 msgid "Mounted Camera"
-msgstr "Připojená kamera"
+msgstr "Připojený fotoaparát"
 
 #. Comment
 #: media/mimetypes/camera_unmounted.desktop:6
 msgid "Unmounted Camera"
-msgstr "Odpojená kamera"
+msgstr "Odpojený fotoaparát"
 
 #. Comment
 #: media/mimetypes/cd-r_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-R"
-msgstr ""
+msgstr "Zam�ený šifrovaný disk CD-R"
 
 #. Comment
 #: media/mimetypes/cd-r_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-R"
-msgstr ""
+msgstr "Odem�ený šifrovaný disk CD-R"
 
 #. Comment
 #: media/mimetypes/cd-r_mounted.desktop:6
 msgid "Mounted CD-R"
-msgstr "Připojená vypalova�ka CD"
+msgstr "Připojený disk CD-R"
 
 #. Comment
 #: media/mimetypes/cd-r_unmounted.desktop:6
 msgid "Unmounted CD-R"
-msgstr "Odpojená vypalova�ka CD"
+msgstr "Odpojený disk CD-R"
 
 #. Comment
 #: media/mimetypes/cd-rw_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-RW"
-msgstr ""
+msgstr "Zam�ený šifrovaný disk CD-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-RW"
-msgstr ""
+msgstr "Odem�ený šifrovaný disk CD-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_mounted.desktop:6
 msgid "Mounted CD-RW"
-msgstr "Připojená vypalova�ka CD"
+msgstr "Připojený disk CD-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_unmounted.desktop:6
 msgid "Unmounted CD-RW"
-msgstr "Odpojená vypalova�ka CD"
+msgstr "Odpojený disk CD-RW"
 
 #. Comment
 #: media/mimetypes/cdrom_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-ROM"
-msgstr ""
+msgstr "Zam�ený šifrovaný disk CD-ROM"
 
 #. Comment
 #: media/mimetypes/cdrom_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-ROM"
-msgstr ""
+msgstr "Odem�ený šifrovaný disk CD-ROM"
 
 #. Comment
 #: media/mimetypes/cdrom_mounted.desktop:6
 msgid "Mounted CD-ROM"
-msgstr "Připojená CDROM"
+msgstr "Připojený disk CD-ROM"
 
 #. Comment
 #: media/mimetypes/cdrom_unmounted.desktop:6
 msgid "Unmounted CD-ROM"
-msgstr "Odpojená CDROM"
+msgstr "Odpojený disk CD-ROM"
 
 #. Comment
 #: media/mimetypes/dvd_encrypted_locked.desktop:7
 msgid "Encrypted Locked DVD"
-msgstr ""
+msgstr "Zam�ený šifrovaný disk DVD"
 
 #. Comment
 #: media/mimetypes/dvd_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked DVD"
-msgstr ""
+msgstr "Odem�ený šifrovaný disk DVD"
 
 #. Comment
 #: media/mimetypes/dvd_mounted.desktop:6
 msgid "Mounted DVD"
-msgstr "Připojené DVD"
+msgstr "Připojený disk DVD"
 
 #. Comment
 #: media/mimetypes/dvd_unmounted.desktop:6
 msgid "Unmounted DVD"
-msgstr "Odpojené DVD"
+msgstr "Odpojený disk DVD"
 
 #. Comment
 #: media/mimetypes/dvdvideo.desktop:6
 msgid "DVD Video Disk"
-msgstr "DVD video"
+msgstr "Disk DVD video"
 
 #. Comment
 #: media/mimetypes/floppy5_mounted.desktop:6
@@ -235,19 +236,17 @@ msgstr "Odpojená disketa"
 #. Comment
 #: media/mimetypes/gphoto2camera.desktop:6
 msgid "Camera"
-msgstr "Kamera"
+msgstr "Fotoaparát"
 
 #. Comment
 #: media/mimetypes/hdd_encrypted_locked.desktop:7
-#, fuzzy
 msgid "Encrypted Locked Hard Disk Volume"
-msgstr "Připojený oddíl pevného disku"
+msgstr "Zam�ený šifrovaný oddíl pevného disku"
 
 #. Comment
 #: media/mimetypes/hdd_encrypted_unlocked.desktop:7
-#, fuzzy
 msgid "Encrypted Unlocked Hard Disk Volume"
-msgstr "Odpojený oddíl pevného disku"
+msgstr "Odem�ený šifrovaný oddíl pevného disku"
 
 #. Comment
 #: media/mimetypes/hdd_mounted.desktop:6
@@ -262,17 +261,15 @@ msgstr "Odpojený oddíl pevného disku"
 #. Comment
 #: media/mimetypes/mycomputer.desktop:6
 msgid "My Computer"
-msgstr ""
+msgstr "Po�íta�"
 
 #. Comment
 #: media/mimetypes/mydocuments.desktop:6
-#, fuzzy
 msgid "My Documents"
-msgstr "Složka s dokumenty"
+msgstr "Dokumenty"
 
 #. Comment
 #: media/mimetypes/mynetworkplaces.desktop:6
-#, fuzzy
 msgid "My Network Places"
 msgstr "Vzdálená umístění"
 
@@ -289,19 +286,17 @@ msgstr "Odpojený zdroj NFS"
 #. Comment
 #: media/mimetypes/printers.desktop:6
 msgid "Printers"
-msgstr ""
+msgstr "Tiskárny"
 
 #. Comment
 #: media/mimetypes/removable_encrypted_locked.desktop:7
-#, fuzzy
 msgid "Encrypted Locked Removable Medium"
-msgstr "Připojené výměnné médium"
+msgstr "Zam�ené šifrované výměnné médium"
 
 #. Comment
 #: media/mimetypes/removable_encrypted_unlocked.desktop:7
-#, fuzzy
 msgid "Encrypted Unlocked Removable Medium"
-msgstr "Odpojené výměnné médium"
+msgstr "Odem�ené šifrované výměnné médium"
 
 #. Comment
 #: media/mimetypes/removable_mounted.desktop:6
@@ -316,17 +311,17 @@ msgstr "Odpojené výměnné médium"
 #. Comment
 #: media/mimetypes/smb_mounted.desktop:6
 msgid "Mounted Samba (Microsoft Network) Share"
-msgstr "Připojený Samba (Microsoft Network) prostředek"
+msgstr "Připojený zdroj Samba (síť Microsoft)"
 
 #. Comment
 #: media/mimetypes/smb_unmounted.desktop:6
 msgid "Unmounted Samba (Microsoft Network) Share"
-msgstr "Odpojený Samba (Microsoft Network) prostředek"
+msgstr "Odpojený zdroj Samba (síť Microsoft)"
 
 #. Comment
 #: media/mimetypes/svcd.desktop:6
 msgid "Super Video CD"
-msgstr ""
+msgstr "Disk Super Video CD"
 
 #. Comment
 #. Name
@@ -337,14 +332,13 @@ msgstr "Koš"
 
 #. Comment
 #: media/mimetypes/vcd.desktop:6
-#, fuzzy
 msgid "Video CD"
-msgstr "DVD video"
+msgstr "Disk Video CD"
 
 #. Comment
 #: media/mimetypes/webbrowser.desktop:6
 msgid "Web Browser"
-msgstr ""
+msgstr "Prohlíže� Webu"
 
 #. Comment
 #: media/mimetypes/zip_mounted.desktop:6
@@ -364,30 +358,40 @@ msgstr "Stránka vlastností média"
 #. Comment
 #: media/propsdlgplugin/media_propsdlgplugin.desktop:8
 msgid "Konqueror properties dialog plugin to configure mount behaviour"
-msgstr "Dialog nastavení chování připojení modulu pro Konqueror"
+msgstr "Modul dialogu vlastností v Konqueroru pro konfiguraci připojování disků"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Vysunout"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr "Uzamknout"
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Připojit"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Otevřít systémovou složku média"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Bezpe�ně odstranit"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr "Odemknout"
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Odpojit"
 
@@ -399,7 +403,7 @@ msgstr "Úložná zařízení"
 #. Comment
 #: media/tdecmodule/media.desktop:12
 msgid "Configure Storage Media"
-msgstr "Nastavení úložných médií"
+msgstr "Nastavení úložných zařízení"
 
 #. Keywords
 #: media/tdecmodule/media.desktop:14
@@ -424,7 +428,7 @@ msgstr "Poskytuje oznamování o změnách síťových složek"
 #. Name
 #: smb/smb-network.desktop:4
 msgid "Samba Shares"
-msgstr "Sdílené disky Samby"
+msgstr "Sdílené zdroje Samby"
 
 #. Comment
 #: smb/x-smb-server.desktop:2
@@ -439,7 +443,7 @@ msgstr "Pracovní skupina Windows"
 #. Name
 #: system/entries/documents.desktop:6
 msgid "Documents Folder"
-msgstr "Složka s dokumenty"
+msgstr "Složka s dokumenty"
 
 #. Name
 #: system/entries/home.desktop:6
@@ -454,7 +458,7 @@ msgstr "Vzdálená umístění"
 #. Name
 #: system/entries/users.desktop:6
 msgid "Users Folders"
-msgstr "Složka uživatelů"
+msgstr "Složky uživatelů"
 
 #. Name
 #: system/kdedmodule/systemdirnotify.desktop:4
@@ -463,11 +467,11 @@ msgstr "Démon upozorňování na systémová URL"
 
 #. Comment
 #: system/kdedmodule/systemdirnotify.desktop:6
-#, fuzzy
 msgid ""
 "Provides change notification for folders monitored by the system:/ tdeio "
 "plugin"
-msgstr "Poskytuje oznamování o změnách síťových složek"
+msgstr ""
+"Poskytuje oznamování o změnách složek sledovaných tdeio modulem system:/"
 
 #. Comment
 #: system/mimetypes/system_directory.desktop:6
@@ -477,7 +481,7 @@ msgstr "Systémová složka"
 #. Name
 #: thumbnail/cursorthumbnail.desktop:4
 msgid "Cursor Files"
-msgstr "Soubory s kurzory"
+msgstr "Soubory s kurzory"
 
 #. Name
 #: thumbnail/djvuthumbnail.desktop:4
@@ -524,7 +528,7 @@ msgstr "koš;vlastnosti;velikost;limity;odstranit"
 #: trash/tdefile-plugin/tdefile_trash.desktop:4
 #: trash/tdefile-plugin/tdefile_trash_system.desktop:4
 msgid "Trash File Info"
-msgstr "Info o koši"
+msgstr "Informace o koši"
 
 #. Description
 #: fish/fish.protocol:14
@@ -539,12 +543,12 @@ msgstr "Pomocný protokol pro NXFISH"
 #. Description
 #: mac/mac.protocol:9
 msgid "A tdeioslave for MacOS HFS+ partitions"
-msgstr "Pomocný protokol pro diskové oddíly MacOS HFS+"
+msgstr "Pomocný modul pro diskové oddíly MacOS HFS+"
 
 #. Description
 #: sftp/sftp.protocol:15
 msgid "A tdeioslave for sftp"
-msgstr "Protokol TDE pro sftp"
+msgstr "Pomocný modul pro sftp"
 
 #. ExtraNames
 #: trash/trash.protocol:25
diff --git a/translations/desktop_files/tdeioslave-desktops/csb.po b/translations/desktop_files/tdeioslave-desktops/csb.po
index 27c47bb41..c496a0f18 100644
--- a/translations/desktop_files/tdeioslave-desktops/csb.po
+++ b/translations/desktop_files/tdeioslave-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgstr ""
 "Plugins òkna swòjiznë Konquerora do kònfigùracëji zachówaniô mòntowaniô"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Wësënie"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Mòntujë"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Remôj na bezpieczny ôrt"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Òdmòntujë"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/cy.po b/translations/desktop_files/tdeioslave-desktops/cy.po
index d85182eed..fa7a9ca8c 100644
--- a/translations/desktop_files/tdeioslave-desktops/cy.po
+++ b/translations/desktop_files/tdeioslave-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Allfwrw"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Gosod"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Dadosod"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/da.po b/translations/desktop_files/tdeioslave-desktops/da.po
index 1cc592f94..d8e40d2c5 100644
--- a/translations/desktop_files/tdeioslave-desktops/da.po
+++ b/translations/desktop_files/tdeioslave-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgstr ""
 "Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Skub ud"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montér"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Ã…bn medium-system-mappen"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Fjern sikkert"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Afmontér"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/de.po b/translations/desktop_files/tdeioslave-desktops/de.po
index e6b8fc4f2..e3b59d705 100644
--- a/translations/desktop_files/tdeioslave-desktops/de.po
+++ b/translations/desktop_files/tdeioslave-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -363,27 +363,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Auswerfen"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Laufwerk einbinden"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Systemordner des Mediums öffnen"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Sicher entfernen"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Laufwerkeinbindung lösen"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/el.po b/translations/desktop_files/tdeioslave-desktops/el.po
index 7b243d8c7..0c7a04dce 100644
--- a/translations/desktop_files/tdeioslave-desktops/el.po
+++ b/translations/desktop_files/tdeioslave-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgstr ""
 "π�οσά�τησης"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Εξαγωγή"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Π�οσά�τηση"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Αποπ�οσά�τηση"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/en_GB.po b/translations/desktop_files/tdeioslave-desktops/en_GB.po
index eb9008bfe..732375fcb 100644
--- a/translations/desktop_files/tdeioslave-desktops/en_GB.po
+++ b/translations/desktop_files/tdeioslave-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/eo.po b/translations/desktop_files/tdeioslave-desktops/eo.po
index dddd96bd6..689038574 100644
--- a/translations/desktop_files/tdeioslave-desktops/eo.po
+++ b/translations/desktop_files/tdeioslave-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Konkeranto eco-dialogo kromaĵo por agordi surmeto-konduton"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Eligo"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Surmeti"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Malfermu mediosisteman dosierujon"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Sekura Forigo"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Demeti"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/es.po b/translations/desktop_files/tdeioslave-desktops/es.po
index bbe0184cc..908bfff4f 100644
--- a/translations/desktop_files/tdeioslave-desktops/es.po
+++ b/translations/desktop_files/tdeioslave-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -370,27 +370,37 @@ msgstr ""
 "comportamiento del montaje"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Expulsar"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montar"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Abrir la carpeta del administrador de medios"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Extracción segura"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Desmontar"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/et.po b/translations/desktop_files/tdeioslave-desktops/et.po
index 68ae26c44..13d723338 100644
--- a/translations/desktop_files/tdeioslave-desktops/et.po
+++ b/translations/desktop_files/tdeioslave-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -370,27 +370,37 @@ msgstr ""
 "Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Väljastamine"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Ãœhenda"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Ava andmekandja süsteemi kataloog"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Eemalda turvaliselt"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Lahuta"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/eu.po b/translations/desktop_files/tdeioslave-desktops/eu.po
index 694383976..0a5d6a9cb 100644
--- a/translations/desktop_files/tdeioslave-desktops/eu.po
+++ b/translations/desktop_files/tdeioslave-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Egotzi"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Muntatu"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Ireki euskarriaren kudeatzailea"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Atera arriskurik gabe"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Desmuntatu"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/fa.po b/translations/desktop_files/tdeioslave-desktops/fa.po
index 26ba9c9a1..8ea268977 100644
--- a/translations/desktop_files/tdeioslave-desktops/fa.po
+++ b/translations/desktop_files/tdeioslave-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "وصلۀ محاورۀ ویژگیهای Konqueror برای پیکربندی ر�تار سوار کردن"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "پس زدن"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "سوار کردن"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "پیاده کردن"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/fi.po b/translations/desktop_files/tdeioslave-desktops/fi.po
index 4462ad372..078b98ea2 100644
--- a/translations/desktop_files/tdeioslave-desktops/fi.po
+++ b/translations/desktop_files/tdeioslave-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Poista"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Liitä"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Avaa mediajärjestelmän kansio"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Poista turvallisesti"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Irrota"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/fr.po b/translations/desktop_files/tdeioslave-desktops/fr.po
index ff8de8ddb..cf5f95b6c 100644
--- a/translations/desktop_files/tdeioslave-desktops/fr.po
+++ b/translations/desktop_files/tdeioslave-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Module de Konqueror pour configurer le comportement du montage"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Éjecter"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Monter"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Dossier système d'ouverture de média"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Enlever en toute sécurité"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Libérer"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/fy.po b/translations/desktop_files/tdeioslave-desktops/fy.po
index 235a60269..5c16a5352 100644
--- a/translations/desktop_files/tdeioslave-desktops/fy.po
+++ b/translations/desktop_files/tdeioslave-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Konqueror eigenskip-dialooch-plugin om keppelgedrach te konfigurearjen"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Utsmytknop"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Oankeppelje (mount)"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Systeemmap medium iepenje"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Feilich ferwiderje"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Ofkeppelje (unmount)"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ga.po b/translations/desktop_files/tdeioslave-desktops/ga.po
index 649bc4cdb..c496b623c 100644
--- a/translations/desktop_files/tdeioslave-desktops/ga.po
+++ b/translations/desktop_files/tdeioslave-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Díchuir"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Feistigh"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Bain Amach go Sábháilte"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Dífheistigh"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/gl.po b/translations/desktop_files/tdeioslave-desktops/gl.po
index 01a80f2c5..a626b9e3c 100644
--- a/translations/desktop_files/tdeioslave-desktops/gl.po
+++ b/translations/desktop_files/tdeioslave-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgstr ""
 "comportamento das montaxes"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Expulsar"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montar"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Cartafol de Sistema de Médio Aberto"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Eliminar de Maneira Segura"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Desmontar"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/he.po b/translations/desktop_files/tdeioslave-desktops/he.po
index a3b544764..4e5882cc4 100644
--- a/translations/desktop_files/tdeioslave-desktops/he.po
+++ b/translations/desktop_files/tdeioslave-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "תוסף חלון מ�פייני� של Konqueror לקביעת �פשרויות חיבור"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "הוצ�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "חבר"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "נתק"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/hi.po b/translations/desktop_files/tdeioslave-desktops/hi.po
index a65aefc0d..b6d40ba3b 100644
--- a/translations/desktop_files/tdeioslave-desktops/hi.po
+++ b/translations/desktop_files/tdeioslave-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "बाहर"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "माउन�ट"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "अनमाउन�ट"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/hr.po b/translations/desktop_files/tdeioslave-desktops/hr.po
index 6fecc06a8..da6005976 100644
--- a/translations/desktop_files/tdeioslave-desktops/hr.po
+++ b/translations/desktop_files/tdeioslave-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgstr ""
 "Konqueror dodatak dijaloga svojstava za konfiguriranje na�ina pristupanja"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Izbaci"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Pristupi"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Otvaranje srednjih mapa sustava"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Slobodno uklonite"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Napusti"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/hsb.po b/translations/desktop_files/tdeioslave-desktops/hsb.po
index fcd32c643..af037c066 100644
--- a/translations/desktop_files/tdeioslave-desktops/hsb.po
+++ b/translations/desktop_files/tdeioslave-desktops/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -371,27 +371,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "montować"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Wotmontować"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/hu.po b/translations/desktop_files/tdeioslave-desktops/hu.po
index 39ee2c6f5..50ba08b73 100644
--- a/translations/desktop_files/tdeioslave-desktops/hu.po
+++ b/translations/desktop_files/tdeioslave-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Konqueror beállítómodul a csatlakoztatási mód megadásához"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Kidobás"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Csatlakoztatás"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "A médiaanyagok rendszerkönyvtárának megnyitása"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Biztonságos leválasztás"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Leválasztás"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ia.po b/translations/desktop_files/tdeioslave-desktops/ia.po
index 278a4a51d..742dbf453 100644
--- a/translations/desktop_files/tdeioslave-desktops/ia.po
+++ b/translations/desktop_files/tdeioslave-desktops/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/id.po b/translations/desktop_files/tdeioslave-desktops/id.po
index 3fcba24c9..bd4ba731b 100644
--- a/translations/desktop_files/tdeioslave-desktops/id.po
+++ b/translations/desktop_files/tdeioslave-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/is.po b/translations/desktop_files/tdeioslave-desktops/is.po
index 5df0a5c64..b94738038 100644
--- a/translations/desktop_files/tdeioslave-desktops/is.po
+++ b/translations/desktop_files/tdeioslave-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Konqueror eiginleikagluggi til að stilla tengihegðun"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Henda út"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Tengja"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Opin miðils kerfismappa"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Fjarlægja öruggt"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Aftengja"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/it.po b/translations/desktop_files/tdeioslave-desktops/it.po
index d0a8645c7..bd439fa6c 100644
--- a/translations/desktop_files/tdeioslave-desktops/it.po
+++ b/translations/desktop_files/tdeioslave-desktops/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-03-01 07:11+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeioslave-desktop-files/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.11\n"
 
 #. Name
 #: cgi/kcmcgi/kcmcgi.desktop:9
@@ -38,14 +39,13 @@ msgstr "Notifica KDED Home Base URL"
 
 #. Comment
 #: home/kdedmodule/homedirnotify.desktop:6
-#, fuzzy
 msgid "Provides change notification for user's home folder ($HOME)"
-msgstr "Dà notifiche dei cambiamenti per le cartelle di rete"
+msgstr "Fornisce notifiche di modifica per la cartella home dell'utente ($HOME)"
 
 #. Name
 #: man/kmanpart.desktop:4
 msgid "KManPart"
-msgstr ""
+msgstr "KManPart"
 
 #. Comment
 #: man/kmanpart.desktop:6
@@ -262,19 +262,17 @@ msgstr "Volume disco rigido non montato"
 #. Comment
 #: media/mimetypes/mycomputer.desktop:6
 msgid "My Computer"
-msgstr ""
+msgstr "Computer"
 
 #. Comment
 #: media/mimetypes/mydocuments.desktop:6
-#, fuzzy
 msgid "My Documents"
-msgstr "Cartella documenti"
+msgstr "Documenti"
 
 #. Comment
 #: media/mimetypes/mynetworkplaces.desktop:6
-#, fuzzy
 msgid "My Network Places"
-msgstr "Indirizzi remoti"
+msgstr "Indirizzi di rete"
 
 #. Comment
 #: media/mimetypes/nfs_mounted.desktop:6
@@ -289,7 +287,7 @@ msgstr "Risorsa NFS non montata"
 #. Comment
 #: media/mimetypes/printers.desktop:6
 msgid "Printers"
-msgstr ""
+msgstr "Stampanti"
 
 #. Comment
 #: media/mimetypes/removable_encrypted_locked.desktop:7
@@ -335,14 +333,13 @@ msgstr "Cestino"
 
 #. Comment
 #: media/mimetypes/vcd.desktop:6
-#, fuzzy
 msgid "Video CD"
-msgstr "Super video CD"
+msgstr "Video CD"
 
 #. Comment
 #: media/mimetypes/webbrowser.desktop:6
 msgid "Web Browser"
-msgstr ""
+msgstr "Browser di rete"
 
 #. Comment
 #: media/mimetypes/zip_mounted.desktop:6
@@ -365,27 +362,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Plugin della configurazione di Konqueror per configurare il montaggio"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Espelli"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr "Blocca"
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Monta"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Apri cartella del disco"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Rimozione sicura"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr "Sblocca"
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Smonta"
 
@@ -461,11 +468,12 @@ msgstr "Notifica KDED System Base URL"
 
 #. Comment
 #: system/kdedmodule/systemdirnotify.desktop:6
-#, fuzzy
 msgid ""
 "Provides change notification for folders monitored by the system:/ tdeio "
 "plugin"
-msgstr "Dà notifiche dei cambiamenti per le cartelle di rete"
+msgstr ""
+"Fornisce notifiche di modifica per le cartelle monitorate dal plug-in "
+"system:/tdeio"
 
 #. Comment
 #: system/mimetypes/system_directory.desktop:6
diff --git a/translations/desktop_files/tdeioslave-desktops/ja.po b/translations/desktop_files/tdeioslave-desktops/ja.po
index 0f17f675a..c779bfc47 100644
--- a/translations/desktop_files/tdeioslave-desktops/ja.po
+++ b/translations/desktop_files/tdeioslave-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "mount �挙動を設定�る Konqueror プロパティダイアログ プラグイン"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "�り出�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "マウント"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "マウント解除"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ka.po b/translations/desktop_files/tdeioslave-desktops/ka.po
index 1d3cce0f4..caaf63779 100644
--- a/translations/desktop_files/tdeioslave-desktops/ka.po
+++ b/translations/desktop_files/tdeioslave-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "CD-ს �მ�ღებ�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "მ�ნტირებ�"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "დემ�ნტირებ�"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/kk.po b/translations/desktop_files/tdeioslave-desktops/kk.po
index fa978fa52..18811711f 100644
--- a/translations/desktop_files/tdeioslave-desktops/kk.po
+++ b/translations/desktop_files/tdeioslave-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Жалғау тәртібін баптайтын Konqueror қа�иеттер диалогының плагин модулі"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "�лып-шығару"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Тіркеу"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Тіркеуден шығару"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/km.po b/translations/desktop_files/tdeioslave-desktops/km.po
index 77e4041c6..81f28fb4b 100644
--- a/translations/desktop_files/tdeioslave-desktops/km.po
+++ b/translations/desktop_files/tdeioslave-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្�ណៈសម្ប�្�ិ Konqueror ដើម្បី​កំណ�់​រចនាសម្ព�ន្ធ​ឥរិយាប�​ម៉ោន"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "ច្រាន​ច�ញ"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "រៀបចំ"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "មិន​រៀបចំ"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/kn.po b/translations/desktop_files/tdeioslave-desktops/kn.po
index 0d4e57fcd..d5b027cc9 100644
--- a/translations/desktop_files/tdeioslave-desktops/kn.po
+++ b/translations/desktop_files/tdeioslave-desktops/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ko.po b/translations/desktop_files/tdeioslave-desktops/ko.po
index d5efb23c9..c355401b1 100644
--- a/translations/desktop_files/tdeioslave-desktops/ko.po
+++ b/translations/desktop_files/tdeioslave-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -361,27 +361,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "꺼내기"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/lo.po b/translations/desktop_files/tdeioslave-desktops/lo.po
index cb72815aa..5d598c792 100644
--- a/translations/desktop_files/tdeioslave-desktops/lo.po
+++ b/translations/desktop_files/tdeioslave-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "ເອົາ�ຜ່ນອອ�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "ຈ�ພາບ"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "ຫັງ�າລີ"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/lt.po b/translations/desktop_files/tdeioslave-desktops/lt.po
index 047e24ef2..ec954bd9d 100644
--- a/translations/desktop_files/tdeioslave-desktops/lt.po
+++ b/translations/desktop_files/tdeioslave-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgstr ""
 "Konqueror savybių dialogo priedas, leidžiantis konfigūruoti montavimo elgseną"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "IÅ¡mesti"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montuoti"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Saugiai pašalinti"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "IÅ¡montuoti"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/lv.po b/translations/desktop_files/tdeioslave-desktops/lv.po
index 65d65a371..44bbb7a61 100644
--- a/translations/desktop_files/tdeioslave-desktops/lv.po
+++ b/translations/desktop_files/tdeioslave-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Izņemt"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Piemontēt"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Nomontēt"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/mk.po b/translations/desktop_files/tdeioslave-desktops/mk.po
index 1c9fb68b2..f150c1567 100644
--- a/translations/desktop_files/tdeioslave-desktops/mk.po
+++ b/translations/desktop_files/tdeioslave-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Извади"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Монтирај"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Одмонтирај"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ml.po b/translations/desktop_files/tdeioslave-desktops/ml.po
index 5a4aa03bc..4f47947c2 100644
--- a/translations/desktop_files/tdeioslave-desktops/ml.po
+++ b/translations/desktop_files/tdeioslave-desktops/ml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/mn.po b/translations/desktop_files/tdeioslave-desktops/mn.po
index 2b40363bc..c155f081c 100644
--- a/translations/desktop_files/tdeioslave-desktops/mn.po
+++ b/translations/desktop_files/tdeioslave-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Гаргах"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Залгах"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Салгах"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ms.po b/translations/desktop_files/tdeioslave-desktops/ms.po
index 0dfa5cff2..e6f78de24 100644
--- a/translations/desktop_files/tdeioslave-desktops/ms.po
+++ b/translations/desktop_files/tdeioslave-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Lenting"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Lekap"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Buang Dengan Selamat"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Nyahlekap"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/mt.po b/translations/desktop_files/tdeioslave-desktops/mt.po
index 2f1f2df30..7807cf947 100644
--- a/translations/desktop_files/tdeioslave-desktops/mt.po
+++ b/translations/desktop_files/tdeioslave-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Iftaħ"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Immonta"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Żmonta"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/nb.po b/translations/desktop_files/tdeioslave-desktops/nb.po
index d03826122..629cbf12e 100644
--- a/translations/desktop_files/tdeioslave-desktops/nb.po
+++ b/translations/desktop_files/tdeioslave-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Et programtillegg for å sette opp montering av enheter i Konqueror"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Løs ut"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Monter"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Ã…pne systemmappe for medie"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Sikker fjerning"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Avmonter"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/nds.po b/translations/desktop_files/tdeioslave-desktops/nds.po
index 023aca78f..67531d712 100644
--- a/translations/desktop_files/tdeioslave-desktops/nds.po
+++ b/translations/desktop_files/tdeioslave-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgstr ""
 "Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Rutsmieten"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Inhangen"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Systeemorner vun't Medium opmaken"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Seker rutnehmen"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Afhangen"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ne.po b/translations/desktop_files/tdeioslave-desktops/ne.po
index 4f6ea75bf..155a6bb2d 100644
--- a/translations/desktop_files/tdeioslave-desktops/ne.po
+++ b/translations/desktop_files/tdeioslave-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -364,27 +364,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "माउन�ट व�यवहार कन�फिगर गर�न कन�क�वेरर विशेषता संवाद प�लगइन"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "निकाल�न�होस�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "माउन�ट"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "अनमाउन�ट"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/nl.po b/translations/desktop_files/tdeioslave-desktops/nl.po
index 9a621f7d8..1ece858fa 100644
--- a/translations/desktop_files/tdeioslave-desktops/nl.po
+++ b/translations/desktop_files/tdeioslave-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Uitwerpen"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Aankoppelen (mount)"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Systeemmap medium openen"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Veilig verwijderen"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Afkoppelen (unmount)"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/nn.po b/translations/desktop_files/tdeioslave-desktops/nn.po
index df668d202..88f75c31e 100644
--- a/translations/desktop_files/tdeioslave-desktops/nn.po
+++ b/translations/desktop_files/tdeioslave-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Programtillegg for oppsett av montering i Konqueror"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Løys ut"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Monter"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Opna mediesystemmappe"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Trygg fjerning"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Avmonter"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/nso.po b/translations/desktop_files/tdeioslave-desktops/nso.po
index d8585c315..b7416397c 100644
--- a/translations/desktop_files/tdeioslave-desktops/nso.po
+++ b/translations/desktop_files/tdeioslave-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Ntsha"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Nameletsa"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Theosa"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/oc.po b/translations/desktop_files/tdeioslave-desktops/oc.po
index b5418d3e6..f35fe7b42 100644
--- a/translations/desktop_files/tdeioslave-desktops/oc.po
+++ b/translations/desktop_files/tdeioslave-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -359,27 +359,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Expulsa"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/pa.po b/translations/desktop_files/tdeioslave-desktops/pa.po
index ea9775363..2ef7c1026 100644
--- a/translations/desktop_files/tdeioslave-desktops/pa.po
+++ b/translations/desktop_files/tdeioslave-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "ਬਾਹਰ ਕੱਢੋ"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "ਮਾਊਟ"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "ਅਨਮਾਉਟ"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/pl.po b/translations/desktop_files/tdeioslave-desktops/pl.po
index 909897e81..a20f66682 100644
--- a/translations/desktop_files/tdeioslave-desktops/pl.po
+++ b/translations/desktop_files/tdeioslave-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2020-11-10 18:59+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeioslave-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.3.2\n"
 
 #. Name
 #: cgi/kcmcgi/kcmcgi.desktop:9
@@ -38,14 +40,13 @@ msgstr "Powiadamianie o URL-ach katalogu domowego dla KDED"
 
 #. Comment
 #: home/kdedmodule/homedirnotify.desktop:6
-#, fuzzy
 msgid "Provides change notification for user's home folder ($HOME)"
-msgstr "Udostępnia powiadomienia o zmianach w katalogach sieciowych"
+msgstr "Udostępnia powiadomienia o zmianach w katalogu domowym ($HOME)"
 
 #. Name
 #: man/kmanpart.desktop:4
 msgid "KManPart"
-msgstr ""
+msgstr "KManPart"
 
 #. Comment
 #: man/kmanpart.desktop:6
@@ -97,12 +98,12 @@ msgstr "Pusta płyta DVD"
 #. Comment
 #: media/mimetypes/bluray_encrypted_locked.desktop:7
 msgid "Encrypted Locked BLURAY"
-msgstr ""
+msgstr "Zaszyfrowany i zablokowany dysk BLURAY"
 
 #. Comment
 #: media/mimetypes/bluray_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked BLURAY"
-msgstr ""
+msgstr "Zaszyfrowany i odblokowany dysk BLURAY"
 
 #. Comment
 #: media/mimetypes/bluray_mounted.desktop:6
@@ -132,12 +133,12 @@ msgstr "Odmontowany aparat fotograficzny"
 #. Comment
 #: media/mimetypes/cd-r_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-R"
-msgstr ""
+msgstr "Zaszyfrowany i zablokowany dysk CD-R"
 
 #. Comment
 #: media/mimetypes/cd-r_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-R"
-msgstr ""
+msgstr "Zaszyfrowany i odblokowany dysk CD-R"
 
 #. Comment
 #: media/mimetypes/cd-r_mounted.desktop:6
@@ -152,12 +153,12 @@ msgstr "Odmontowana nagrywarka CD"
 #. Comment
 #: media/mimetypes/cd-rw_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-RW"
-msgstr ""
+msgstr "Zaszyfrowany i zablokowany dysk CD-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-RW"
-msgstr ""
+msgstr "Zaszyfrowany i odblokowany dysk CD-RW"
 
 #. Comment
 #: media/mimetypes/cd-rw_mounted.desktop:6
@@ -172,12 +173,12 @@ msgstr "Odmontowana nagrywarka CD"
 #. Comment
 #: media/mimetypes/cdrom_encrypted_locked.desktop:7
 msgid "Encrypted Locked CD-ROM"
-msgstr ""
+msgstr "Zaszyfrowany i zablokowany dysk CD-ROM"
 
 #. Comment
 #: media/mimetypes/cdrom_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked CD-ROM"
-msgstr ""
+msgstr "Zaszyfrowany i odblokowany dysk CD-ROM"
 
 #. Comment
 #: media/mimetypes/cdrom_mounted.desktop:6
@@ -192,12 +193,12 @@ msgstr "Odmontowany CD-ROM"
 #. Comment
 #: media/mimetypes/dvd_encrypted_locked.desktop:7
 msgid "Encrypted Locked DVD"
-msgstr ""
+msgstr "Zaszyfrowany i zablokowany dysk DVD"
 
 #. Comment
 #: media/mimetypes/dvd_encrypted_unlocked.desktop:7
 msgid "Encrypted Unlocked DVD"
-msgstr ""
+msgstr "Zaszyfrowany i odblokowany dysk DVD"
 
 #. Comment
 #: media/mimetypes/dvd_mounted.desktop:6
@@ -241,15 +242,13 @@ msgstr "Aparat fotograficzny"
 
 #. Comment
 #: media/mimetypes/hdd_encrypted_locked.desktop:7
-#, fuzzy
 msgid "Encrypted Locked Hard Disk Volume"
-msgstr "Zamontowana partycja dysku twardego"
+msgstr "Zaszyfrowana i zablokowana partycja dysku twardego"
 
 #. Comment
 #: media/mimetypes/hdd_encrypted_unlocked.desktop:7
-#, fuzzy
 msgid "Encrypted Unlocked Hard Disk Volume"
-msgstr "Odmontowana partycja dysku twardego"
+msgstr "Zaszyfrowana i odblokowana partycja dysku twardego"
 
 #. Comment
 #: media/mimetypes/hdd_mounted.desktop:6
@@ -264,19 +263,17 @@ msgstr "Odmontowana partycja dysku twardego"
 #. Comment
 #: media/mimetypes/mycomputer.desktop:6
 msgid "My Computer"
-msgstr ""
+msgstr "Mój komputer"
 
 #. Comment
 #: media/mimetypes/mydocuments.desktop:6
-#, fuzzy
 msgid "My Documents"
-msgstr "Katalog dokumentów"
+msgstr "Moje dokumenty"
 
 #. Comment
 #: media/mimetypes/mynetworkplaces.desktop:6
-#, fuzzy
 msgid "My Network Places"
-msgstr "Zdalne miejsca"
+msgstr "Moje miejsca sieciowe"
 
 #. Comment
 #: media/mimetypes/nfs_mounted.desktop:6
@@ -291,19 +288,17 @@ msgstr "Odmontowany system plików NFS"
 #. Comment
 #: media/mimetypes/printers.desktop:6
 msgid "Printers"
-msgstr ""
+msgstr "Drukarki"
 
 #. Comment
 #: media/mimetypes/removable_encrypted_locked.desktop:7
-#, fuzzy
 msgid "Encrypted Locked Removable Medium"
-msgstr "Zamontowany nośnik wymienny"
+msgstr "Zaszyfrowany i zablokowany nośnik wymienny"
 
 #. Comment
 #: media/mimetypes/removable_encrypted_unlocked.desktop:7
-#, fuzzy
 msgid "Encrypted Unlocked Removable Medium"
-msgstr "Odmontowany nośnik wymienny"
+msgstr "Zaszyfrowany i odblokowany nośnik wymienny"
 
 #. Comment
 #: media/mimetypes/removable_mounted.desktop:6
@@ -345,7 +340,7 @@ msgstr "PÅ‚yta Video CD"
 #. Comment
 #: media/mimetypes/webbrowser.desktop:6
 msgid "Web Browser"
-msgstr ""
+msgstr "PrzeglÄ…darka internetowa"
 
 #. Comment
 #: media/mimetypes/zip_mounted.desktop:6
@@ -369,27 +364,37 @@ msgstr ""
 "Wtyczka okna właściwości Konquerora do konfiguracji zachowania montowania"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Wysuń"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr "Zablokuj"
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Zamontuj"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Otwórz folder systemowy mediów"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Usuń w sposób bezpieczny"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr "Odblokuj"
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Odmontuj"
 
@@ -466,11 +471,12 @@ msgstr "Powiadamianie o systemowych URL-ach dla KDED"
 
 #. Comment
 #: system/kdedmodule/systemdirnotify.desktop:6
-#, fuzzy
 msgid ""
 "Provides change notification for folders monitored by the system:/ tdeio "
 "plugin"
-msgstr "Udostępnia powiadomienia o zmianach w katalogach sieciowych"
+msgstr ""
+"Udostępnia powiadomienia o zmianach monitorowanych przez wtyczkę system:/ "
+"tdeio"
 
 #. Comment
 #: system/mimetypes/system_directory.desktop:6
@@ -515,14 +521,13 @@ msgstr "Program obsługujący miniaturki"
 #. Comment
 #. Name
 #: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7
-#, fuzzy
 msgid "Trash Properties"
-msgstr "Strona właściwości nośnika"
+msgstr "Właściwości kosza"
 
 #. Keywords
 #: trash/kcmtrash.desktop:15
 msgid "trash;properties;size;limits;delete"
-msgstr ""
+msgstr "kosz;właściwości;rozmiar;usuwanie"
 
 #. Name
 #: trash/tdefile-plugin/tdefile_trash.desktop:4
diff --git a/translations/desktop_files/tdeioslave-desktops/pt.po b/translations/desktop_files/tdeioslave-desktops/pt.po
index d9578d7dc..2548f1fe8 100644
--- a/translations/desktop_files/tdeioslave-desktops/pt.po
+++ b/translations/desktop_files/tdeioslave-desktops/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -370,27 +370,37 @@ msgstr ""
 "comportamento da montagem"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Ejectar"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montar"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Abrir a Pasta de Sistema do Dispositivo"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Retirar com Segurança"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Desmontar"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/pt_BR.po b/translations/desktop_files/tdeioslave-desktops/pt_BR.po
index 2b8c74ae5..f94a885a3 100644
--- a/translations/desktop_files/tdeioslave-desktops/pt_BR.po
+++ b/translations/desktop_files/tdeioslave-desktops/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-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgstr ""
 "comportamento da montagem"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Ejetar"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montar"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Abrir a Pasta de Mídias do Sistema"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Remover de Modo Seguro"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Desmontar"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ro.po b/translations/desktop_files/tdeioslave-desktops/ro.po
index eae45c287..9938b5964 100644
--- a/translations/desktop_files/tdeioslave-desktops/ro.po
+++ b/translations/desktop_files/tdeioslave-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgstr ""
 "lui mount"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Ejectează"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montează"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Scoate în siguranță"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Demontează"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ru.po b/translations/desktop_files/tdeioslave-desktops/ru.po
index 57023e1f4..e6e644a4d 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2024-04-12 17:44+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.17\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
@@ -369,27 +371,37 @@ msgstr ""
 "файловых �и�тем"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Извлечь CD"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Подключить"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Отключить"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/rw.po b/translations/desktop_files/tdeioslave-desktops/rw.po
index 49022d34c..93548be65 100644
--- a/translations/desktop_files/tdeioslave-desktops/rw.po
+++ b/translations/desktop_files/tdeioslave-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Gusohora"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Gushyiramo"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Gukuramo Neza"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Gukuramo"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/se.po b/translations/desktop_files/tdeioslave-desktops/se.po
index 82172bc4a..6ea520722 100644
--- a/translations/desktop_files/tdeioslave-desktops/se.po
+++ b/translations/desktop_files/tdeioslave-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Bálkes olggos"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "ÄŒana"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Dorvvošlaš eretváldin"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Gálgga"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/sk.po b/translations/desktop_files/tdeioslave-desktops/sk.po
index eb5309dd7..d37f59760 100644
--- a/translations/desktop_files/tdeioslave-desktops/sk.po
+++ b/translations/desktop_files/tdeioslave-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgstr ""
 "Modul Konqueror dialógu vlastností pre konfiguráciu správania pripojenia"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Vysunúť"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Pripojiť"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Otvoriť systémový prie�inok médií"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Bezpe�ne odpojiť"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Odpojiť"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/sl.po b/translations/desktop_files/tdeioslave-desktops/sl.po
index f7e1ddab8..f2af9175a 100644
--- a/translations/desktop_files/tdeioslave-desktops/sl.po
+++ b/translations/desktop_files/tdeioslave-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Vstavek za Konqueror s katerim se nastavlja obnašanje priklopa medijev"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Izvrzi"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Priklopi"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Odpri sistemsko mapo z nosilci"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Varno odstrani"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Odklopi"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/sr.po b/translations/desktop_files/tdeioslave-desktops/sr.po
index cec04e30c..f6646977b 100644
--- a/translations/desktop_files/tdeioslave-desktops/sr.po
+++ b/translations/desktop_files/tdeioslave-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgstr ""
 "Прикључак �а �вој�твима Konqueror-а за подешавање понашања при монтирању"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Избаци"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Монтирај"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Демонтирај"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/sr@Latn.po b/translations/desktop_files/tdeioslave-desktops/sr@Latn.po
index 65ac1acbf..c8278f427 100644
--- a/translations/desktop_files/tdeioslave-desktops/sr@Latn.po
+++ b/translations/desktop_files/tdeioslave-desktops/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-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgstr ""
 "Priklju�ak sa svojstvima Konqueror-a za podešavanje ponašanja pri montiranju"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Izbaci"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montiraj"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Otvori sistemsku fasciklu medijuma"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Bezbedno ukloni"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Demontiraj"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/sr@ijekavian.po b/translations/desktop_files/tdeioslave-desktops/sr@ijekavian.po
index 32a71dc35..99e0be9a5 100644
--- a/translations/desktop_files/tdeioslave-desktops/sr@ijekavian.po
+++ b/translations/desktop_files/tdeioslave-desktops/sr@ijekavian.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.po b/translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.po
index 35683f003..61f6f21cc 100644
--- a/translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.po
+++ b/translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/sr@latin.po b/translations/desktop_files/tdeioslave-desktops/sr@latin.po
index 818814f89..a6b2ab800 100644
--- a/translations/desktop_files/tdeioslave-desktops/sr@latin.po
+++ b/translations/desktop_files/tdeioslave-desktops/sr@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -360,27 +360,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ss.po b/translations/desktop_files/tdeioslave-desktops/ss.po
index a5aaf704d..098b3b40c 100644
--- a/translations/desktop_files/tdeioslave-desktops/ss.po
+++ b/translations/desktop_files/tdeioslave-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -359,27 +359,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Khafuna"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/sv.po b/translations/desktop_files/tdeioslave-desktops/sv.po
index 77a72bd08..d2a3f61aa 100644
--- a/translations/desktop_files/tdeioslave-desktops/sv.po
+++ b/translations/desktop_files/tdeioslave-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgstr ""
 "monteringsbeteende"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Mata ut"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Montera"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Öppna mediumsystemkatalog"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Säker urkoppling"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Avmontera"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ta.po b/translations/desktop_files/tdeioslave-desktops/ta.po
index 4675c5668..4c0fdeedc 100644
--- a/translations/desktop_files/tdeioslave-desktops/ta.po
+++ b/translations/desktop_files/tdeioslave-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "வெளித�தள�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "�ற�ற�"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "வெளியேற�ற�"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/tdeioslave-desktops.pot b/translations/desktop_files/tdeioslave-desktops/tdeioslave-desktops.pot
index 453406e88..3f7143f0a 100644
--- a/translations/desktop_files/tdeioslave-desktops/tdeioslave-desktops.pot
+++ b/translations/desktop_files/tdeioslave-desktops/tdeioslave-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -323,8 +323,8 @@ msgstr ""
 
 #. Comment
 #. Name
-#: media/mimetypes/trash.desktop:7
-#: system/entries/trash.desktop:7 trash/kcmtrash.desktop:11
+#: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7
+#: trash/kcmtrash.desktop:11
 msgid "Trash"
 msgstr ""
 
@@ -359,33 +359,42 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_eject.desktop:10
+msgid "Eject"
 msgstr ""
 
 #. Name
-#: media/services/media_eject.desktop:8
-msgid "Eject"
+#: media/services/media_lock.desktop:10
+msgid "Lock"
 msgstr ""
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: 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
+#: media/tdecmodule/media.desktop:10 system/entries/media.desktop:6
 msgid "Storage Media"
 msgstr ""
 
@@ -503,8 +512,7 @@ msgstr ""
 
 #. Comment
 #. Name
-#: trash/kcmtrash.desktop:13
-#: trash/ktrashpropsdlgplugin.desktop:7
+#: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7
 msgid "Trash Properties"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/te.po b/translations/desktop_files/tdeioslave-desktops/te.po
index 9c0c1d3e2..f1d71705b 100644
--- a/translations/desktop_files/tdeioslave-desktops/te.po
+++ b/translations/desktop_files/tdeioslave-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -363,27 +363,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "ఎజెక�ట�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr ""
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeioslave-desktops/tg.po b/translations/desktop_files/tdeioslave-desktops/tg.po
index 23c3edb25..7de26f5c1 100644
--- a/translations/desktop_files/tdeioslave-desktops/tg.po
+++ b/translations/desktop_files/tdeioslave-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Ихроҷ"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Ва�л кунӣ"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Ҷудо кунӣ"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/th.po b/translations/desktop_files/tdeioslave-desktops/th.po
index 4b9076a05..b5d48244f 100644
--- a/translations/desktop_files/tdeioslave-desktops/th.po
+++ b/translations/desktop_files/tdeioslave-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "ปลั๊�อิน�ล่องตอบโต้ของ Konqueror ใช้เพื่อปรับ�ต่งพฤติ�รรม�ารเมานท์สื่อ"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "เอา�ผ่นออ�"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "เม้านท์"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "เลิ�เม้านท์"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/tr.po b/translations/desktop_files/tdeioslave-desktops/tr.po
index b885fb599..bcc2217c4 100644
--- a/translations/desktop_files/tdeioslave-desktops/tr.po
+++ b/translations/desktop_files/tdeioslave-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Çıkart"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "BaÄŸla"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Aygıtın Sistem Dizinini Aç"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Güvenli Kaldır"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Ayır"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/tt.po b/translations/desktop_files/tdeioslave-desktops/tt.po
index 73a57db7d..8d586dc10 100644
--- a/translations/desktop_files/tdeioslave-desktops/tt.po
+++ b/translations/desktop_files/tdeioslave-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Çığar"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Bäyläp quy"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "İmin Çığaru"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Bäyläwne çiş"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/uk.po b/translations/desktop_files/tdeioslave-desktops/uk.po
index 1293c8b56..f9d4b9004 100644
--- a/translations/desktop_files/tdeioslave-desktops/uk.po
+++ b/translations/desktop_files/tdeioslave-desktops/uk.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2020-10-25 06:14+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"
@@ -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.1.1\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Name
 #: cgi/kcmcgi/kcmcgi.desktop:9
@@ -364,27 +364,37 @@ msgstr ""
 "Втулок вікна вла�тиво�тей Konqueror дл� налаштуванн� поведінки монтуванн�"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr "Деблокувати"
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Виштовхнути"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr "Замкнути"
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Змонтувати"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr "Деблокувати"
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Демонтувати"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/uz.po b/translations/desktop_files/tdeioslave-desktops/uz.po
index 252f5deda..c27f54399 100644
--- a/translations/desktop_files/tdeioslave-desktops/uz.po
+++ b/translations/desktop_files/tdeioslave-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Chiqarish"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Ulash"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Ehtiyotlik bilan uzish"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Uzish"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/uz@cyrillic.po b/translations/desktop_files/tdeioslave-desktops/uz@cyrillic.po
index 1903ef6b3..ef2f6b104 100644
--- a/translations/desktop_files/tdeioslave-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/tdeioslave-desktops/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-25 18:45+0200\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"
@@ -365,27 +365,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Чиқариш"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Улаш"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Узиш"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/ven.po b/translations/desktop_files/tdeioslave-desktops/ven.po
index 78287b9ea..3ff7b07d6 100644
--- a/translations/desktop_files/tdeioslave-desktops/ven.po
+++ b/translations/desktop_files/tdeioslave-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Bvisa"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Gonya"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Usa gonya"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/vi.po b/translations/desktop_files/tdeioslave-desktops/vi.po
index 555b5bcd0..54bd32268 100644
--- a/translations/desktop_files/tdeioslave-desktops/vi.po
+++ b/translations/desktop_files/tdeioslave-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -367,27 +367,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "�ẩy đĩa ra"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Kết nối"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr "Mở thư mục hệ thống vừa"
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Gỡ ra An toàn"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Gỡ ra"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/wa.po b/translations/desktop_files/tdeioslave-desktops/wa.po
index a9e6e8537..211ef1017 100644
--- a/translations/desktop_files/tdeioslave-desktops/wa.po
+++ b/translations/desktop_files/tdeioslave-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -369,27 +369,37 @@ msgstr ""
 "montaedje"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Fé rexhe"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Monter"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: media/services/media_realfolder.desktop:10
+msgid "Open Medium System Folder"
+msgstr ""
+
+#. Name
+#: media/services/media_safelyremove.desktop:10
 msgid "Safely Remove"
 msgstr "Ositer e såvrité"
 
 #. Name
-#: media/services/media_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Dismonter"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/xh.po b/translations/desktop_files/tdeioslave-desktops/xh.po
index ec158b851..d51dc0567 100644
--- a/translations/desktop_files/tdeioslave-desktops/xh.po
+++ b/translations/desktop_files/tdeioslave-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Khuphela ngaphandle"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Layisha"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Sukuyilayisha"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/zh_CN.po b/translations/desktop_files/tdeioslave-desktops/zh_CN.po
index a8ee3b38d..839d405a3 100644
--- a/translations/desktop_files/tdeioslave-desktops/zh_CN.po
+++ b/translations/desktop_files/tdeioslave-desktops/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-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "�置挂载行为的 Konqueror 属性对�框�件"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "弹出"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "挂载"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "�载"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/zh_TW.po b/translations/desktop_files/tdeioslave-desktops/zh_TW.po
index b446ebcc2..153e22c3c 100644
--- a/translations/desktop_files/tdeioslave-desktops/zh_TW.po
+++ b/translations/desktop_files/tdeioslave-desktops/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-25 18:45+0200\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"
@@ -366,27 +366,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Konqueror 內容�話框外掛程�，用於設定掛載的行為"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "退出"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "掛載"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "�載"
 
diff --git a/translations/desktop_files/tdeioslave-desktops/zu.po b/translations/desktop_files/tdeioslave-desktops/zu.po
index a151d1b9b..4d286c436 100644
--- a/translations/desktop_files/tdeioslave-desktops/zu.po
+++ b/translations/desktop_files/tdeioslave-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\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"
@@ -368,27 +368,37 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
-msgstr ""
-
-#. Name
-#: media/services/media_eject.desktop:8
+#: media/services/media_eject.desktop:10
 msgid "Eject"
 msgstr "Khipha"
 
 #. Name
-#: media/services/media_mount.desktop:8
+#: media/services/media_lock.desktop:10
+msgid "Lock"
+msgstr ""
+
+#. Name
+#: media/services/media_mount.desktop:10
 msgid "Mount"
 msgstr "Yenyusa"
 
 #. Name
-#: media/services/media_safelyremove.desktop:8
+#: 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_unmount.desktop:8
+#: media/services/media_unlock.desktop:10
+msgid "Unlock"
+msgstr ""
+
+#. Name
+#: media/services/media_unmount.desktop:10
 msgid "Unmount"
 msgstr "Yehlisa"
 
diff --git a/translations/desktop_files/tdeprint-desktops/af.po b/translations/desktop_files/tdeprint-desktops/af.po
index 7bee312cb..df3c2789c 100644
--- a/translations/desktop_files/tdeprint-desktops/af.po
+++ b/translations/desktop_files/tdeprint-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ar.po b/translations/desktop_files/tdeprint-desktops/ar.po
index 6bdd9e8ea..908a9cbe0 100644
--- a/translations/desktop_files/tdeprint-desktops/ar.po
+++ b/translations/desktop_files/tdeprint-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/az.po b/translations/desktop_files/tdeprint-desktops/az.po
index f8583ef73..7d8f0610c 100644
--- a/translations/desktop_files/tdeprint-desktops/az.po
+++ b/translations/desktop_files/tdeprint-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/be.po b/translations/desktop_files/tdeprint-desktops/be.po
index bfef88eb1..8f455fa7f 100644
--- a/translations/desktop_files/tdeprint-desktops/be.po
+++ b/translations/desktop_files/tdeprint-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/bg.po b/translations/desktop_files/tdeprint-desktops/bg.po
index 46451b7c2..3545dfcd2 100644
--- a/translations/desktop_files/tdeprint-desktops/bg.po
+++ b/translations/desktop_files/tdeprint-desktops/bg.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+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/"
diff --git a/translations/desktop_files/tdeprint-desktops/bn.po b/translations/desktop_files/tdeprint-desktops/bn.po
index 9aaacbff0..6543140d8 100644
--- a/translations/desktop_files/tdeprint-desktops/bn.po
+++ b/translations/desktop_files/tdeprint-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/br.po b/translations/desktop_files/tdeprint-desktops/br.po
index 3e4c2e2b9..1f62260ba 100644
--- a/translations/desktop_files/tdeprint-desktops/br.po
+++ b/translations/desktop_files/tdeprint-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/bs.po b/translations/desktop_files/tdeprint-desktops/bs.po
index 6e8191e0b..f933cd9e8 100644
--- a/translations/desktop_files/tdeprint-desktops/bs.po
+++ b/translations/desktop_files/tdeprint-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ca.po b/translations/desktop_files/tdeprint-desktops/ca.po
index 7421bc141..b17e13c4a 100644
--- a/translations/desktop_files/tdeprint-desktops/ca.po
+++ b/translations/desktop_files/tdeprint-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/cs.po b/translations/desktop_files/tdeprint-desktops/cs.po
index f1ffaf2d5..f5e827823 100644
--- a/translations/desktop_files/tdeprint-desktops/cs.po
+++ b/translations/desktop_files/tdeprint-desktops/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdeprint-desktop-files/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.2.2\n"
 
 #. Name
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
 msgid "KJobViewer"
-msgstr ""
+msgstr "KJobViewer"
 
 #. GenericName
 #. Comment
@@ -30,9 +31,8 @@ msgstr "Tiskové úlohy"
 
 #. Name
 #: kprinter/kprinter.desktop:9
-#, fuzzy
 msgid "KPrinter"
-msgstr "Tiskárna"
+msgstr "KPrinter"
 
 #. GenericName
 #: kprinter/kprinter.desktop:11
@@ -47,7 +47,7 @@ msgstr "Tiskárny"
 #. Comment
 #: printmgr/printers.desktop:14
 msgid "Printing system configuration (printers, jobs, classes, ...)"
-msgstr "Nastavení tiskového systému (tiskárny, úlohy, třídy, ...)"
+msgstr "Nastavení tiskového systému (tiskárny, úlohy, třídy,…)"
 
 #. Keywords
 #: printmgr/printers.desktop:16
@@ -88,7 +88,7 @@ msgstr "Model tiskárny"
 #. Name
 #: tdeprintfax/tdeprintfax.desktop:2
 msgid "TDEPrintFax"
-msgstr ""
+msgstr "TDEPrintFax"
 
 #. GenericName
 #: tdeprintfax/tdeprintfax.desktop:4
diff --git a/translations/desktop_files/tdeprint-desktops/csb.po b/translations/desktop_files/tdeprint-desktops/csb.po
index 21ca63968..f617ab76d 100644
--- a/translations/desktop_files/tdeprint-desktops/csb.po
+++ b/translations/desktop_files/tdeprint-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/cy.po b/translations/desktop_files/tdeprint-desktops/cy.po
index 2ef70aefd..c474b2b52 100644
--- a/translations/desktop_files/tdeprint-desktops/cy.po
+++ b/translations/desktop_files/tdeprint-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/da.po b/translations/desktop_files/tdeprint-desktops/da.po
index 6edc7f6f1..a68b62c18 100644
--- a/translations/desktop_files/tdeprint-desktops/da.po
+++ b/translations/desktop_files/tdeprint-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/de.po b/translations/desktop_files/tdeprint-desktops/de.po
index bf86de211..74543a771 100644
--- a/translations/desktop_files/tdeprint-desktops/de.po
+++ b/translations/desktop_files/tdeprint-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/el.po b/translations/desktop_files/tdeprint-desktops/el.po
index 235bdf060..f97173900 100644
--- a/translations/desktop_files/tdeprint-desktops/el.po
+++ b/translations/desktop_files/tdeprint-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/eo.po b/translations/desktop_files/tdeprint-desktops/eo.po
index c0f40a3db..3add6d73c 100644
--- a/translations/desktop_files/tdeprint-desktops/eo.po
+++ b/translations/desktop_files/tdeprint-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/es.po b/translations/desktop_files/tdeprint-desktops/es.po
index ca5a5d1e4..e595af326 100644
--- a/translations/desktop_files/tdeprint-desktops/es.po
+++ b/translations/desktop_files/tdeprint-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/et.po b/translations/desktop_files/tdeprint-desktops/et.po
index c28c7e225..393f30e32 100644
--- a/translations/desktop_files/tdeprint-desktops/et.po
+++ b/translations/desktop_files/tdeprint-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/eu.po b/translations/desktop_files/tdeprint-desktops/eu.po
index ddea5f17e..ec5d9d44b 100644
--- a/translations/desktop_files/tdeprint-desktops/eu.po
+++ b/translations/desktop_files/tdeprint-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/fa.po b/translations/desktop_files/tdeprint-desktops/fa.po
index 3948a9fb3..778ac3608 100644
--- a/translations/desktop_files/tdeprint-desktops/fa.po
+++ b/translations/desktop_files/tdeprint-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/fi.po b/translations/desktop_files/tdeprint-desktops/fi.po
index f361394dc..8cd42fd21 100644
--- a/translations/desktop_files/tdeprint-desktops/fi.po
+++ b/translations/desktop_files/tdeprint-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/fr.po b/translations/desktop_files/tdeprint-desktops/fr.po
index edf4ffaa6..79d17cf87 100644
--- a/translations/desktop_files/tdeprint-desktops/fr.po
+++ b/translations/desktop_files/tdeprint-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/fy.po b/translations/desktop_files/tdeprint-desktops/fy.po
index 942c286a6..22bd13107 100644
--- a/translations/desktop_files/tdeprint-desktops/fy.po
+++ b/translations/desktop_files/tdeprint-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ga.po b/translations/desktop_files/tdeprint-desktops/ga.po
index 24ed6fe20..5af81dde7 100644
--- a/translations/desktop_files/tdeprint-desktops/ga.po
+++ b/translations/desktop_files/tdeprint-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/gl.po b/translations/desktop_files/tdeprint-desktops/gl.po
index 79f9d4de0..dfc00a5bf 100644
--- a/translations/desktop_files/tdeprint-desktops/gl.po
+++ b/translations/desktop_files/tdeprint-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/he.po b/translations/desktop_files/tdeprint-desktops/he.po
index 389e9c44a..7e198b429 100644
--- a/translations/desktop_files/tdeprint-desktops/he.po
+++ b/translations/desktop_files/tdeprint-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/hi.po b/translations/desktop_files/tdeprint-desktops/hi.po
index b21f03a04..4e161956c 100644
--- a/translations/desktop_files/tdeprint-desktops/hi.po
+++ b/translations/desktop_files/tdeprint-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/hr.po b/translations/desktop_files/tdeprint-desktops/hr.po
index 2cf01e4e5..7b4986573 100644
--- a/translations/desktop_files/tdeprint-desktops/hr.po
+++ b/translations/desktop_files/tdeprint-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/hu.po b/translations/desktop_files/tdeprint-desktops/hu.po
index ad753fcf4..9c0a40cd4 100644
--- a/translations/desktop_files/tdeprint-desktops/hu.po
+++ b/translations/desktop_files/tdeprint-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/is.po b/translations/desktop_files/tdeprint-desktops/is.po
index c63613177..ba529a26c 100644
--- a/translations/desktop_files/tdeprint-desktops/is.po
+++ b/translations/desktop_files/tdeprint-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/it.po b/translations/desktop_files/tdeprint-desktops/it.po
index 3fe63ba07..9c6c41aee 100644
--- a/translations/desktop_files/tdeprint-desktops/it.po
+++ b/translations/desktop_files/tdeprint-desktops/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-03-01 07:11+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeprint-desktop-files/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.11\n"
 
 #. Name
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
 msgid "KJobViewer"
-msgstr ""
+msgstr "KJobViewer"
 
 #. GenericName
 #. Comment
@@ -30,9 +31,8 @@ msgstr "Lavori di stampa"
 
 #. Name
 #: kprinter/kprinter.desktop:9
-#, fuzzy
 msgid "KPrinter"
-msgstr "Stampante"
+msgstr "KPrinter"
 
 #. GenericName
 #: kprinter/kprinter.desktop:11
@@ -88,7 +88,7 @@ msgstr "Modello stampante"
 #. Name
 #: tdeprintfax/tdeprintfax.desktop:2
 msgid "TDEPrintFax"
-msgstr ""
+msgstr "TDEPrintFax"
 
 #. GenericName
 #: tdeprintfax/tdeprintfax.desktop:4
diff --git a/translations/desktop_files/tdeprint-desktops/ja.po b/translations/desktop_files/tdeprint-desktops/ja.po
index 9a51b1bc3..96ee30273 100644
--- a/translations/desktop_files/tdeprint-desktops/ja.po
+++ b/translations/desktop_files/tdeprint-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ka.po b/translations/desktop_files/tdeprint-desktops/ka.po
index adbdbd6f5..a44986c75 100644
--- a/translations/desktop_files/tdeprint-desktops/ka.po
+++ b/translations/desktop_files/tdeprint-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/kk.po b/translations/desktop_files/tdeprint-desktops/kk.po
index b8239337f..651daea0e 100644
--- a/translations/desktop_files/tdeprint-desktops/kk.po
+++ b/translations/desktop_files/tdeprint-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/km.po b/translations/desktop_files/tdeprint-desktops/km.po
index 9e5bf1a69..bf09609ab 100644
--- a/translations/desktop_files/tdeprint-desktops/km.po
+++ b/translations/desktop_files/tdeprint-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ko.po b/translations/desktop_files/tdeprint-desktops/ko.po
index e77255013..67f1ddc06 100644
--- a/translations/desktop_files/tdeprint-desktops/ko.po
+++ b/translations/desktop_files/tdeprint-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/lo.po b/translations/desktop_files/tdeprint-desktops/lo.po
index ad6a94418..25bd47247 100644
--- a/translations/desktop_files/tdeprint-desktops/lo.po
+++ b/translations/desktop_files/tdeprint-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/lt.po b/translations/desktop_files/tdeprint-desktops/lt.po
index acf67028c..dd39f1b59 100644
--- a/translations/desktop_files/tdeprint-desktops/lt.po
+++ b/translations/desktop_files/tdeprint-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/lv.po b/translations/desktop_files/tdeprint-desktops/lv.po
index aa728c701..9a3c48dd0 100644
--- a/translations/desktop_files/tdeprint-desktops/lv.po
+++ b/translations/desktop_files/tdeprint-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/mk.po b/translations/desktop_files/tdeprint-desktops/mk.po
index 92851ca7d..c1017a18c 100644
--- a/translations/desktop_files/tdeprint-desktops/mk.po
+++ b/translations/desktop_files/tdeprint-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/mn.po b/translations/desktop_files/tdeprint-desktops/mn.po
index b3ac01927..9225d49c7 100644
--- a/translations/desktop_files/tdeprint-desktops/mn.po
+++ b/translations/desktop_files/tdeprint-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ms.po b/translations/desktop_files/tdeprint-desktops/ms.po
index 79e4c87bb..b921a263b 100644
--- a/translations/desktop_files/tdeprint-desktops/ms.po
+++ b/translations/desktop_files/tdeprint-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/mt.po b/translations/desktop_files/tdeprint-desktops/mt.po
index ffcf0eab0..2b0bc506a 100644
--- a/translations/desktop_files/tdeprint-desktops/mt.po
+++ b/translations/desktop_files/tdeprint-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/nb.po b/translations/desktop_files/tdeprint-desktops/nb.po
index 0c50f10eb..84c6d8e55 100644
--- a/translations/desktop_files/tdeprint-desktops/nb.po
+++ b/translations/desktop_files/tdeprint-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/nds.po b/translations/desktop_files/tdeprint-desktops/nds.po
index 4f8bd2ac2..926fa1bd0 100644
--- a/translations/desktop_files/tdeprint-desktops/nds.po
+++ b/translations/desktop_files/tdeprint-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ne.po b/translations/desktop_files/tdeprint-desktops/ne.po
index a7f662653..893f0fc52 100644
--- a/translations/desktop_files/tdeprint-desktops/ne.po
+++ b/translations/desktop_files/tdeprint-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/nl.po b/translations/desktop_files/tdeprint-desktops/nl.po
index 8d595fc81..2249c4c3a 100644
--- a/translations/desktop_files/tdeprint-desktops/nl.po
+++ b/translations/desktop_files/tdeprint-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/nn.po b/translations/desktop_files/tdeprint-desktops/nn.po
index 04a8cf863..e763cbc2b 100644
--- a/translations/desktop_files/tdeprint-desktops/nn.po
+++ b/translations/desktop_files/tdeprint-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/nso.po b/translations/desktop_files/tdeprint-desktops/nso.po
index 7fb97f1bb..b8ae84241 100644
--- a/translations/desktop_files/tdeprint-desktops/nso.po
+++ b/translations/desktop_files/tdeprint-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/pa.po b/translations/desktop_files/tdeprint-desktops/pa.po
index ccd8b6130..6b52c20d6 100644
--- a/translations/desktop_files/tdeprint-desktops/pa.po
+++ b/translations/desktop_files/tdeprint-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/pl.po b/translations/desktop_files/tdeprint-desktops/pl.po
index d8493589a..0b45d7cf6 100644
--- a/translations/desktop_files/tdeprint-desktops/pl.po
+++ b/translations/desktop_files/tdeprint-desktops/pl.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+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: 2021-07-07 18:17+0000\n"
+"PO-Revision-Date: 2022-10-24 17:57+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdeprint-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.13.1\n"
 
 #. Name
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
@@ -30,9 +33,8 @@ msgstr "Zadania drukowania"
 
 #. Name
 #: kprinter/kprinter.desktop:9
-#, fuzzy
 msgid "KPrinter"
-msgstr "Drukarka"
+msgstr "KPrinter"
 
 #. GenericName
 #: kprinter/kprinter.desktop:11
@@ -88,7 +90,7 @@ msgstr "Model drukarki"
 #. Name
 #: tdeprintfax/tdeprintfax.desktop:2
 msgid "TDEPrintFax"
-msgstr ""
+msgstr "TDEPrintFax"
 
 #. GenericName
 #: tdeprintfax/tdeprintfax.desktop:4
diff --git a/translations/desktop_files/tdeprint-desktops/pt.po b/translations/desktop_files/tdeprint-desktops/pt.po
index ef64e63bb..b723d6865 100644
--- a/translations/desktop_files/tdeprint-desktops/pt.po
+++ b/translations/desktop_files/tdeprint-desktops/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/pt_BR.po b/translations/desktop_files/tdeprint-desktops/pt_BR.po
index ffa153342..23fffbef3 100644
--- a/translations/desktop_files/tdeprint-desktops/pt_BR.po
+++ b/translations/desktop_files/tdeprint-desktops/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-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ro.po b/translations/desktop_files/tdeprint-desktops/ro.po
index 88dc2cc2c..055a41a02 100644
--- a/translations/desktop_files/tdeprint-desktops/ro.po
+++ b/translations/desktop_files/tdeprint-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ru.po b/translations/desktop_files/tdeprint-desktops/ru.po
index ab9363078..9817e3394 100644
--- a/translations/desktop_files/tdeprint-desktops/ru.po
+++ b/translations/desktop_files/tdeprint-desktops/ru.po
@@ -1,25 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 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 19:39+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: 2021-07-07 18:17+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"
 "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
 #: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
 msgid "KJobViewer"
-msgstr ""
+msgstr "Про�мотрщик заданий печати TDE"
 
 #. GenericName
 #. Comment
@@ -51,7 +53,7 @@ msgstr "�а�тройки �и�темы печати (принтеры, зад
 #. Keywords
 #: printmgr/printers.desktop:16
 msgid "print;printer;printing management;"
-msgstr ""
+msgstr "печать;принтер;управление печатью;"
 
 #. Comment
 #: slave/mimetypes/class.desktop:2
@@ -87,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/tdeprint-desktops/rw.po b/translations/desktop_files/tdeprint-desktops/rw.po
index 9fcce6512..dcda5d492 100644
--- a/translations/desktop_files/tdeprint-desktops/rw.po
+++ b/translations/desktop_files/tdeprint-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/se.po b/translations/desktop_files/tdeprint-desktops/se.po
index 096cf77a4..0cc5f5a31 100644
--- a/translations/desktop_files/tdeprint-desktops/se.po
+++ b/translations/desktop_files/tdeprint-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/sk.po b/translations/desktop_files/tdeprint-desktops/sk.po
index e76154cd4..1485f5ceb 100644
--- a/translations/desktop_files/tdeprint-desktops/sk.po
+++ b/translations/desktop_files/tdeprint-desktops/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/sl.po b/translations/desktop_files/tdeprint-desktops/sl.po
index 91d05968c..4066e8b44 100644
--- a/translations/desktop_files/tdeprint-desktops/sl.po
+++ b/translations/desktop_files/tdeprint-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/sr.po b/translations/desktop_files/tdeprint-desktops/sr.po
index 8e4e4e824..0db4214e4 100644
--- a/translations/desktop_files/tdeprint-desktops/sr.po
+++ b/translations/desktop_files/tdeprint-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/sr@Latn.po b/translations/desktop_files/tdeprint-desktops/sr@Latn.po
index 949749c4c..8497dd95e 100644
--- a/translations/desktop_files/tdeprint-desktops/sr@Latn.po
+++ b/translations/desktop_files/tdeprint-desktops/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-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ss.po b/translations/desktop_files/tdeprint-desktops/ss.po
index a962879a8..53ab609b1 100644
--- a/translations/desktop_files/tdeprint-desktops/ss.po
+++ b/translations/desktop_files/tdeprint-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/sv.po b/translations/desktop_files/tdeprint-desktops/sv.po
index e2da9fb12..0bc928c22 100644
--- a/translations/desktop_files/tdeprint-desktops/sv.po
+++ b/translations/desktop_files/tdeprint-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ta.po b/translations/desktop_files/tdeprint-desktops/ta.po
index 215f73ece..5312589db 100644
--- a/translations/desktop_files/tdeprint-desktops/ta.po
+++ b/translations/desktop_files/tdeprint-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/tdeprint-desktops.pot b/translations/desktop_files/tdeprint-desktops/tdeprint-desktops.pot
index 4ec7c1aa9..ca18a7a34 100644
--- a/translations/desktop_files/tdeprint-desktops/tdeprint-desktops.pot
+++ b/translations/desktop_files/tdeprint-desktops/tdeprint-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
@@ -17,15 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: kjobviewer/kjobviewer-autostart.desktop:7
-#: kjobviewer/kjobviewer.desktop:8
+#: kjobviewer/kjobviewer-autostart.desktop:7 kjobviewer/kjobviewer.desktop:8
 msgid "KJobViewer"
 msgstr ""
 
 #. GenericName
 #. Comment
-#: kjobviewer/kjobviewer-autostart.desktop:9
-#: kjobviewer/kjobviewer.desktop:10
+#: kjobviewer/kjobviewer-autostart.desktop:9 kjobviewer/kjobviewer.desktop:10
 #: slave/mimetypes/jobs.desktop:2
 msgid "Print Jobs"
 msgstr ""
@@ -72,8 +70,7 @@ msgstr ""
 
 #. Comment
 #. Name
-#: slave/mimetypes/manager.desktop:2
-#: tdeprint_part/tdeprint_part.desktop:4
+#: slave/mimetypes/manager.desktop:2 tdeprint_part/tdeprint_part.desktop:4
 msgid "Print Management Tool"
 msgstr ""
 
diff --git a/translations/desktop_files/tdeprint-desktops/te.po b/translations/desktop_files/tdeprint-desktops/te.po
index 8c0323d26..b847ee20c 100644
--- a/translations/desktop_files/tdeprint-desktops/te.po
+++ b/translations/desktop_files/tdeprint-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/tg.po b/translations/desktop_files/tdeprint-desktops/tg.po
index ff067b93c..749c5c599 100644
--- a/translations/desktop_files/tdeprint-desktops/tg.po
+++ b/translations/desktop_files/tdeprint-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/th.po b/translations/desktop_files/tdeprint-desktops/th.po
index e4381f28c..c38a2763c 100644
--- a/translations/desktop_files/tdeprint-desktops/th.po
+++ b/translations/desktop_files/tdeprint-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/tr.po b/translations/desktop_files/tdeprint-desktops/tr.po
index f6ad3efc6..a1c1ac088 100644
--- a/translations/desktop_files/tdeprint-desktops/tr.po
+++ b/translations/desktop_files/tdeprint-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/tt.po b/translations/desktop_files/tdeprint-desktops/tt.po
index 082a8a93b..36c21f582 100644
--- a/translations/desktop_files/tdeprint-desktops/tt.po
+++ b/translations/desktop_files/tdeprint-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/uk.po b/translations/desktop_files/tdeprint-desktops/uk.po
index 482faeaf1..a2f58dc30 100644
--- a/translations/desktop_files/tdeprint-desktops/uk.po
+++ b/translations/desktop_files/tdeprint-desktops/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\n"
+"POT-Creation-Date: 2021-07-07 18:17+0000\n"
 "PO-Revision-Date: 2020-07-21 05:23+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/translations/desktop_files/tdeprint-desktops/uz.po b/translations/desktop_files/tdeprint-desktops/uz.po
index 9a31a6644..9932fb289 100644
--- a/translations/desktop_files/tdeprint-desktops/uz.po
+++ b/translations/desktop_files/tdeprint-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/uz@cyrillic.po b/translations/desktop_files/tdeprint-desktops/uz@cyrillic.po
index d320d145d..0eb0a295b 100644
--- a/translations/desktop_files/tdeprint-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/tdeprint-desktops/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-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/ven.po b/translations/desktop_files/tdeprint-desktops/ven.po
index 70193d1f7..8a1fbddab 100644
--- a/translations/desktop_files/tdeprint-desktops/ven.po
+++ b/translations/desktop_files/tdeprint-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/vi.po b/translations/desktop_files/tdeprint-desktops/vi.po
index cfe16bfa5..61e831dde 100644
--- a/translations/desktop_files/tdeprint-desktops/vi.po
+++ b/translations/desktop_files/tdeprint-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/wa.po b/translations/desktop_files/tdeprint-desktops/wa.po
index 834e71c38..98494c832 100644
--- a/translations/desktop_files/tdeprint-desktops/wa.po
+++ b/translations/desktop_files/tdeprint-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/xh.po b/translations/desktop_files/tdeprint-desktops/xh.po
index 6cbf2ff66..6667459c6 100644
--- a/translations/desktop_files/tdeprint-desktops/xh.po
+++ b/translations/desktop_files/tdeprint-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/zh_CN.po b/translations/desktop_files/tdeprint-desktops/zh_CN.po
index 437159588..abc19ef4b 100644
--- a/translations/desktop_files/tdeprint-desktops/zh_CN.po
+++ b/translations/desktop_files/tdeprint-desktops/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-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/zh_TW.po b/translations/desktop_files/tdeprint-desktops/zh_TW.po
index 2f0cf3fb6..911dcdfb1 100644
--- a/translations/desktop_files/tdeprint-desktops/zh_TW.po
+++ b/translations/desktop_files/tdeprint-desktops/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-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdeprint-desktops/zu.po b/translations/desktop_files/tdeprint-desktops/zu.po
index 3b1220a63..b10164b9c 100644
--- a/translations/desktop_files/tdeprint-desktops/zu.po
+++ b/translations/desktop_files/tdeprint-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 19:39+0200\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"
diff --git a/translations/desktop_files/tdescreensaver-desktops/cs.po b/translations/desktop_files/tdescreensaver-desktops/cs.po
index 61961b208..6c95af523 100644
--- a/translations/desktop_files/tdescreensaver-desktops/cs.po
+++ b/translations/desktop_files/tdescreensaver-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2021.
 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: 2021-09-07 01:16+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdescreensaver-desktop-files/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.8\n"
 
 #. Name
 #: KBlankscreen.desktop:8
@@ -24,12 +25,12 @@ msgstr "Prázdná obrazovka"
 #. Name
 #: KBlankscreen.desktop:12 KRandom.desktop:12
 msgid "Setup..."
-msgstr "Nastavení..."
+msgstr "Nastavení…"
 
 #. Name
 #: KBlankscreen.desktop:17 KRandom.desktop:17
 msgid "Display in Specified Window"
-msgstr "Zobrazit v ur�eném okně"
+msgstr "Zobrazit v ur�eném okně"
 
 #. Name
 #: KBlankscreen.desktop:22 KRandom.desktop:22
diff --git a/translations/desktop_files/tdm-sessions/cs.po b/translations/desktop_files/tdm-sessions/cs.po
index 2165b51dc..bb808ef22 100644
--- a/translations/desktop_files/tdm-sessions/cs.po
+++ b/translations/desktop_files/tdm-sessions/cs.po
@@ -1,40 +1,40 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
 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: 2021-09-07 01:16+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdm-sessions/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.8\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 ""
-"GNOME, GNU Network Object Model Environment. Kompletní, svobodné a "
-"uživatelsky přívětivé garfické prostředí."
+"Trinity Desktop Environment. Výkonné open source grafické prostředí pro "
+"pracovní plochu"
 
 #. Name
 #: 9wm.desktop:6
 msgid "9WM"
-msgstr ""
+msgstr "9WM"
 
 #. Comment
 #: 9wm.desktop:8
@@ -44,17 +44,17 @@ msgstr "Emulace Plane 9 správce oken 8-1/2"
 #. Name
 #: admin.desktop:7
 msgid "admin"
-msgstr ""
+msgstr "admin"
 
 #. Comment
 #: admin.desktop:9
 msgid "Yast Admin Session"
-msgstr ""
+msgstr "Sezení správy Yast"
 
 #. Name
 #: aewm++.desktop:6
 msgid "AEWM++"
-msgstr ""
+msgstr "AEWM++"
 
 #. Comment
 #: aewm++.desktop:8
@@ -68,7 +68,7 @@ msgstr ""
 #. Name
 #: aewm.desktop:6
 msgid "AEWM"
-msgstr ""
+msgstr "AEWM"
 
 #. Comment
 #: aewm.desktop:8
@@ -78,7 +78,7 @@ msgstr "Minimalistický správce oken"
 #. Name
 #: afterstep.desktop:6
 msgid "AfterStep"
-msgstr ""
+msgstr "AfterStep"
 
 #. Comment
 #: afterstep.desktop:8
@@ -88,17 +88,17 @@ msgstr "Správce oken podobný NeXTStepu založený na FVWM"
 #. Name
 #: amaterus.desktop:6
 msgid "AMATERUS"
-msgstr ""
+msgstr "AMATERUS"
 
 #. Comment
 #: amaterus.desktop:8
 msgid "A GTK+ based window manager with a window grouping feature"
-msgstr "Správce oken založený na GTK+ s funkcí seskupování okne"
+msgstr "Správce oken založený na GTK+ s funkcí seskupování oken"
 
 #. Name
 #: amiwm.desktop:6
 msgid "AmiWM"
-msgstr ""
+msgstr "AmiWM"
 
 #. Comment
 #: amiwm.desktop:8
@@ -108,7 +108,7 @@ msgstr "Správce oken podobný Amize"
 #. Name
 #: asclassic.desktop:6
 msgid "ASClassic"
-msgstr ""
+msgstr "ASClassic"
 
 #. Comment
 #: asclassic.desktop:8
@@ -118,7 +118,7 @@ msgstr "AfterStep Classic, správce oken založený na AfterStepu v1.1"
 #. Name
 #: blackbox.desktop:6
 msgid "Blackbox"
-msgstr ""
+msgstr "Blackbox"
 
 #. Comment
 #: blackbox.desktop:8
@@ -128,34 +128,31 @@ msgstr "Rychlý a malý správce oken"
 #. Name
 #: cde.desktop:6
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Comment
 #: cde.desktop:8
-#, fuzzy
 msgid ""
 "The Common Desktop Environment, a proprietary industry standard desktop "
 "environment"
 msgstr ""
-"Svobodné grafické prostředí neobsahující cholesterol verze 4. Prostředí "
-"připomínající CDE"
+"Common Desktop Environment, proprietární průmyslový standard prostředí pro "
+"pracovní plochu"
 
 #. Name
 #: ctwm.desktop:6
 msgid "CTWM"
-msgstr ""
+msgstr "CTWM"
 
 #. Comment
 #: ctwm.desktop:8
-#, fuzzy
 msgid "Claude's Tab Window Manager, TWM enhanced by virtual screens, etc."
-msgstr ""
-"The Virtual Tab Window Manager. TWM vylepšené o virtuální obrazovky aj."
+msgstr "Správce oken Claude's Tab, TWM vylepšené o virtuální obrazovky aj."
 
 #. Name
 #: cwwm.desktop:6
 msgid "CWWM"
-msgstr ""
+msgstr "CWWM"
 
 #. Comment
 #: cwwm.desktop:8
@@ -165,17 +162,17 @@ msgstr "ChezWam, minimalistický správce oken založený na EvilWM"
 #. Name
 #: enlightenment.desktop:6
 msgid "Enlightenment"
-msgstr ""
+msgstr "Enlightenment"
 
 #. Comment
 #: enlightenment.desktop:8
 msgid "An extremely themable very feature-rich window manager"
-msgstr "Na funkce bohatý správce oken s širokou škálou témat"
+msgstr "Na funkce bohatý správce oken s širokou škálou motivů"
 
 #. Name
 #: evilwm.desktop:6
 msgid "EvilWM"
-msgstr ""
+msgstr "EvilWM"
 
 #. Comment
 #: evilwm.desktop:8
@@ -185,43 +182,45 @@ msgstr "Minimalistický správce oken založený na 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 ""
-"Vysoce přizpůsobitelný a nízkoúrovňový správce oken založený na Blackboxu"
+"Vysoce přizpůsobitelný a málo náro�ný na zdroje správce oken založený na "
+"Blackboxu"
 
 #. Name
 #: flwm.desktop:6
 msgid "FLWM"
-msgstr ""
+msgstr "FLWM"
 
 #. Comment
 #: flwm.desktop:8
 msgid "The Fast Light Window Manager, based primarily on WM2"
-msgstr "Fast Light Window Manager založený původně na WM2"
+msgstr "Správce oken Fast Light založený především na 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 ""
+"Výkonný správce oken kompatibilní s ICCCM s podporou více virtuálních ploch"
 
 #. Name
 #: fvwm2.desktop:6
 msgid "FVWM2"
-msgstr ""
+msgstr "FVWM2"
 
 #. Name
 #: fvwm95.desktop:6
 msgid "FVWM95"
-msgstr ""
+msgstr "FVWM95"
 
 #. Comment
 #: fvwm95.desktop:8
@@ -231,7 +230,7 @@ msgstr "Správce oken se vzhledem Windows 95 odvozený od FVWM"
 #. Name
 #: gnome.desktop:6
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
 #. Comment
 #: gnome.desktop:8
@@ -240,12 +239,12 @@ msgid ""
 "desktop environment"
 msgstr ""
 "GNOME, GNU Network Object Model Environment. Kompletní, svobodné a "
-"uživatelsky přívětivé garfické prostředí."
+"uživatelsky přívětivé grafické prostředí"
 
 #. Name
 #: golem.desktop:6
 msgid "Golem"
-msgstr ""
+msgstr "Golem"
 
 #. Comment
 #: golem.desktop:8
@@ -255,7 +254,7 @@ msgstr "Malý správce oken"
 #. Name
 #: icewm.desktop:6
 msgid "IceWM"
-msgstr ""
+msgstr "IceWM"
 
 #. Comment
 #: icewm.desktop:8
@@ -265,49 +264,48 @@ msgstr "Správce oken podobný Windows 95-OS/2-Motif"
 #. Name
 #: ion.desktop:6
 msgid "Ion"
-msgstr ""
+msgstr "Ion"
 
 #. Comment
 #: ion.desktop:8
-#, fuzzy
 msgid "A keyboard-friendly window manager with tiled windows, based on PWM"
-msgstr "Správce oken podobný NeXTStepu založený na FVWM"
+msgstr ""
+"Dlaždicový správce oken přívětivý pro ovládání z klávesnice, založený na PWM"
 
 #. Name
 #: kde-plasma-safe.desktop:7
 msgid "KDE Plasma Workspace (failsafe session)"
-msgstr "Pracovní plocha plasma (bezpe�ná relace)"
+msgstr "Pracovní prostředí KDE plasma (nouzové sezení)"
 
 #. Comment
 #: kde-plasma-safe.desktop:9
 msgid "The desktop made by KDE (failsafe session)"
-msgstr "Prostředí od KDE (bezpe�ná relace)"
+msgstr "Prostředí pracovní plochy od KDE (nouzové sezení)"
 
 #. Name
 #: kde-plasma.desktop:7
 msgid "KDE Plasma Workspace"
-msgstr "Pracovní plocha Plasma"
+msgstr "Pracovní prostředí KDE Plasma"
 
 #. Comment
 #: kde-plasma.desktop:9
 msgid "The desktop made by KDE"
-msgstr "Prostředí od KDE"
+msgstr "Prostředí pracovní plochy od 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 "Fast Light Window Manager založený původně na WM2"
+msgstr "Správce oken Lars, založený na 9WM, podporující dlaždice"
 
 #. Name
 #: lwm.desktop:6
 msgid "LWM"
-msgstr ""
+msgstr "LWM"
 
 #. Comment
 #: lwm.desktop:8
@@ -318,7 +316,7 @@ msgstr ""
 #. Name
 #: matchbox.desktop:6
 msgid "Matchbox"
-msgstr ""
+msgstr "Matchbox"
 
 #. Comment
 #: matchbox.desktop:8
@@ -328,7 +326,7 @@ msgstr "Správce oken pro PDA"
 #. Name
 #: metacity.desktop:6
 msgid "Metacity"
-msgstr ""
+msgstr "Metacity"
 
 #. Comment
 #: metacity.desktop:8
@@ -338,41 +336,40 @@ msgstr "Malý správce oken založený na GTK2"
 #. Name
 #: mwm.desktop:6
 msgid "MWM"
-msgstr ""
+msgstr "MWM"
 
 #. Comment
 #: mwm.desktop:8
 msgid "The Motif Window Manager"
-msgstr "Motif Window Manager"
+msgstr "Správce oken Motif"
 
 #. Name
 #: olvwm.desktop:6
 msgid "OLVWM"
-msgstr ""
+msgstr "OLVWM"
 
 #. Comment
 #: olvwm.desktop:8
-#, fuzzy
 msgid ""
 "The OpenLook Virtual Window Manager. OLWM enhanced for handling of virtual "
 "desktops"
 msgstr ""
-"The Virtual Tab Window Manager. TWM vylepšené o virtuální obrazovky aj."
+"Správce oken OpenLook Virtual. OLWM rozšířený o podporu virtuálních ploch"
 
 #. Name
 #: olwm.desktop:6
 msgid "OLWM"
-msgstr ""
+msgstr "OLWM"
 
 #. Comment
 #: olwm.desktop:8
 msgid "The traditional Open Look Window Manager"
-msgstr "Tradi�ní Open Look Window Manager"
+msgstr "Tradi�ní správce oken Open Look"
 
 #. Name
 #: openbox.desktop:6
 msgid "Openbox"
-msgstr ""
+msgstr "Openbox"
 
 #. Comment
 #: openbox.desktop:8
@@ -382,17 +379,17 @@ msgstr "Malý správce oken založený na Blackboxu"
 #. Name
 #: oroborus.desktop:6
 msgid "Oroborus"
-msgstr ""
+msgstr "Oroborus"
 
 #. Comment
 #: oroborus.desktop:8
 msgid "A lightweight themeable window manager"
-msgstr "Malý správce oken s tématy"
+msgstr "Malý správce oken s motivy"
 
 #. Name
 #: phluid.desktop:6
 msgid "Phluid"
-msgstr ""
+msgstr "Phluid"
 
 #. Comment
 #: phluid.desktop:8
@@ -402,19 +399,18 @@ msgstr "Správce oken založený na Imlib2"
 #. Name
 #: pwm.desktop:6
 msgid "PWM"
-msgstr ""
+msgstr "PWM"
 
 #. Comment
 #: pwm.desktop:8
-#, fuzzy
 msgid ""
 "A lightweight window manager able to attach multiple windows to one frame"
-msgstr "Malý správce oken založený na Blackboxu"
+msgstr "Malý správce oken schopný připojit více oken do jednoho rámu"
 
 #. Name
 #: qvwm.desktop:6
 msgid "QVWM"
-msgstr ""
+msgstr "QVWM"
 
 #. Comment
 #: qvwm.desktop:8
@@ -424,17 +420,19 @@ msgstr "Správce oken se vzhledem 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 ""
+"Jednoduchý správce oken s ovládáním výhradně klávesnicí navrženým podle "
+"Screen"
 
 #. Name
 #: sapphire.desktop:6
 msgid "Sapphire"
-msgstr ""
+msgstr "Sapphire"
 
 #. Comment
 #: sapphire.desktop:8
@@ -444,51 +442,49 @@ msgstr "Minimalistický, ale přizpůsobitelný správce oken"
 #. 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 ""
-"Rožšiřitelný správce oken skriptovatelný jazykem podobným jazyku Emacs Lisp"
+"Rozšiřitelný správce oken skriptovatelný jazykem podobným jazyku Emacs Lisp"
 
 #. Name
 #: twm.desktop:6
 msgid "TWM"
-msgstr ""
+msgstr "TWM"
 
 #. Comment
 #: twm.desktop:8
-#, fuzzy
 msgid "The Tab Window Manager"
-msgstr "Motif Window Manager"
+msgstr "Tab Window Manager"
 
 #. Name
 #: ude.desktop:6
 msgid "UDE"
-msgstr ""
+msgstr "UDE"
 
 #. Comment
 #: ude.desktop:8
 msgid "The UNIX Desktop Environment"
-msgstr ""
+msgstr "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 ""
-"The Virtual Tab Window Manager. TWM vylepšené o virtuální obrazovky aj."
+msgstr "Virtual Tab Window Manager. TWM vylepšené o virtuální obrazovky aj."
 
 #. Name
 #: w9wm.desktop:6
 msgid "W9WM"
-msgstr ""
+msgstr "W9WM"
 
 #. Comment
 #: w9wm.desktop:8
@@ -501,7 +497,7 @@ msgstr ""
 #. Name
 #: waimea.desktop:6
 msgid "Waimea"
-msgstr ""
+msgstr "Waimea"
 
 #. Comment
 #: waimea.desktop:8
@@ -511,7 +507,7 @@ msgstr "Vysoce přizpůsobitelný správce oken založený na Blackboxu"
 #. Name
 #: wm2.desktop:6
 msgid "WM2"
-msgstr ""
+msgstr "WM2"
 
 #. Comment
 #: wm2.desktop:8
@@ -521,17 +517,17 @@ msgstr "Malý nepřizpůsobitelný správce oken"
 #. Name
 #: wmaker.desktop:6
 msgid "WindowMaker"
-msgstr ""
+msgstr "WindowMaker"
 
 #. Comment
 #: wmaker.desktop:8
 msgid "A simple window manager that resembles the NeXTStep look very closely"
-msgstr "Jendoduchý správce oken, který se velmi podobá NeXTStep"
+msgstr "Jednoduchý správce oken, který se velmi podobá NeXTStep"
 
 #. Name
 #: xfce.desktop:6
 msgid "XFce"
-msgstr ""
+msgstr "XFce"
 
 #. Comment
 #: xfce.desktop:8
@@ -545,7 +541,7 @@ msgstr ""
 #. Name
 #: xfce4.desktop:6
 msgid "XFce 4"
-msgstr ""
+msgstr "XFce 4"
 
 #. Comment
 #: xfce4.desktop:8
diff --git a/translations/desktop_files/tdm-sessions/it.po b/translations/desktop_files/tdm-sessions/it.po
index 9b8f23a71..3eabe0868 100644
--- a/translations/desktop_files/tdm-sessions/it.po
+++ b/translations/desktop_files/tdm-sessions/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-03-08 02:11+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-sessions/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.11.2\n"
 
 #. Name
 #: tde.desktop.cmake:7
 msgid "TDE"
-msgstr ""
+msgstr "TDE"
 
 #. Comment
 #: tde.desktop.cmake:8
@@ -32,7 +33,7 @@ msgstr ""
 #. Name
 #: 9wm.desktop:6
 msgid "9WM"
-msgstr ""
+msgstr "9WM"
 
 #. Comment
 #: 9wm.desktop:8
@@ -42,17 +43,17 @@ msgstr "Un emulatore del window manager 8-1/2 Plan 9"
 #. Name
 #: admin.desktop:7
 msgid "admin"
-msgstr ""
+msgstr "Amministratore"
 
 #. Comment
 #: admin.desktop:9
 msgid "Yast Admin Session"
-msgstr ""
+msgstr "Sessione amministrativa Yast"
 
 #. Name
 #: aewm++.desktop:6
 msgid "AEWM++"
-msgstr ""
+msgstr "AEWM++"
 
 #. Comment
 #: aewm++.desktop:8
@@ -66,7 +67,7 @@ msgstr ""
 #. Name
 #: aewm.desktop:6
 msgid "AEWM"
-msgstr ""
+msgstr "AEWM"
 
 #. Comment
 #: aewm.desktop:8
@@ -76,7 +77,7 @@ msgstr "Un window manager minimalista"
 #. Name
 #: afterstep.desktop:6
 msgid "AfterStep"
-msgstr ""
+msgstr "AfterStep"
 
 #. Comment
 #: afterstep.desktop:8
@@ -86,7 +87,7 @@ msgstr "Un window manager con lo stile NeXTStep, basato su FVWM"
 #. Name
 #: amaterus.desktop:6
 msgid "AMATERUS"
-msgstr ""
+msgstr "AMATERUS"
 
 #. Comment
 #: amaterus.desktop:8
@@ -98,7 +99,7 @@ msgstr ""
 #. Name
 #: amiwm.desktop:6
 msgid "AmiWM"
-msgstr ""
+msgstr "AmiWM"
 
 #. Comment
 #: amiwm.desktop:8
@@ -108,7 +109,7 @@ msgstr "Un window manager in stile Amiga"
 #. Name
 #: asclassic.desktop:6
 msgid "ASClassic"
-msgstr ""
+msgstr "ASClassic"
 
 #. Comment
 #: asclassic.desktop:8
@@ -118,7 +119,7 @@ msgstr "AfterStep Classico, un window manager basato su AfterStep v1.1"
 #. Name
 #: blackbox.desktop:6
 msgid "Blackbox"
-msgstr ""
+msgstr "Blackbox"
 
 #. Comment
 #: blackbox.desktop:8
@@ -128,7 +129,7 @@ msgstr "Un window manager veloce e leggero"
 #. Name
 #: cde.desktop:6
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Comment
 #: cde.desktop:8
@@ -136,12 +137,12 @@ msgid ""
 "The Common Desktop Environment, a proprietary industry standard desktop "
 "environment"
 msgstr ""
-"Il Common Desktop Environment, un desktop environment proprietario standard."
+"Il Common Desktop Environment, un desktop environment proprietario standard"
 
 #. Name
 #: ctwm.desktop:6
 msgid "CTWM"
-msgstr ""
+msgstr "CTWM"
 
 #. Comment
 #: ctwm.desktop:8
@@ -153,7 +154,7 @@ msgstr ""
 #. Name
 #: cwwm.desktop:6
 msgid "CWWM"
-msgstr ""
+msgstr "CWWM"
 
 #. Comment
 #: cwwm.desktop:8
@@ -164,7 +165,7 @@ msgstr ""
 #. Name
 #: enlightenment.desktop:6
 msgid "Enlightenment"
-msgstr ""
+msgstr "Enlightenment"
 
 #. Comment
 #: enlightenment.desktop:8
@@ -174,7 +175,7 @@ msgstr "Un window manager estremamente temabile con molte funzionalità"
 #. Name
 #: evilwm.desktop:6
 msgid "EvilWM"
-msgstr ""
+msgstr "EvilWM"
 
 #. Comment
 #: evilwm.desktop:8
@@ -184,7 +185,7 @@ msgstr "Un window manager minimalista basato su AEWM"
 #. Name
 #: fluxbox.desktop:6
 msgid "Fluxbox"
-msgstr ""
+msgstr "Fluxbox"
 
 #. Comment
 #: fluxbox.desktop:8
@@ -196,7 +197,7 @@ msgstr ""
 #. Name
 #: flwm.desktop:6
 msgid "FLWM"
-msgstr ""
+msgstr "FLWM"
 
 #. Comment
 #: flwm.desktop:8
@@ -206,7 +207,7 @@ msgstr "Il Fast Light Window Manager, basato principalmente su WM2"
 #. Name
 #: fvwm.desktop:6
 msgid "FVWM"
-msgstr ""
+msgstr "FVWM"
 
 #. Comment
 #: fvwm.desktop:8 fvwm2.desktop:8
@@ -218,12 +219,12 @@ msgstr ""
 #. Name
 #: fvwm2.desktop:6
 msgid "FVWM2"
-msgstr ""
+msgstr "FVWM2"
 
 #. Name
 #: fvwm95.desktop:6
 msgid "FVWM95"
-msgstr ""
+msgstr "FVWM95"
 
 #. Comment
 #: fvwm95.desktop:8
@@ -233,7 +234,7 @@ msgstr "Una variante di FVWM che assomiglia a Windows 95"
 #. Name
 #: gnome.desktop:6
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
 #. Comment
 #: gnome.desktop:8
@@ -247,7 +248,7 @@ msgstr ""
 #. Name
 #: golem.desktop:6
 msgid "Golem"
-msgstr ""
+msgstr "Golem"
 
 #. Comment
 #: golem.desktop:8
@@ -257,7 +258,7 @@ msgstr "Un window manager leggero"
 #. Name
 #: icewm.desktop:6
 msgid "IceWM"
-msgstr ""
+msgstr "IceWM"
 
 #. Comment
 #: icewm.desktop:8
@@ -267,14 +268,14 @@ msgstr "Un window manager in stile Windows 95-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 ""
 "Un window manager \"amico della tastiera\" con finestre affiancate, basato "
-"su PWM "
+"su PWM"
 
 #. Name
 #: kde-plasma-safe.desktop:7
@@ -299,7 +300,7 @@ msgstr "Il desktop fatto da KDE"
 #. Name
 #: larswm.desktop:6
 msgid "LarsWM"
-msgstr ""
+msgstr "LarsWM"
 
 #. Comment
 #: larswm.desktop:8
@@ -310,7 +311,7 @@ msgstr ""
 #. Name
 #: lwm.desktop:6
 msgid "LWM"
-msgstr ""
+msgstr "LWM"
 
 #. Comment
 #: lwm.desktop:8
@@ -321,7 +322,7 @@ msgstr ""
 #. Name
 #: matchbox.desktop:6
 msgid "Matchbox"
-msgstr ""
+msgstr "Matchbox"
 
 #. Comment
 #: matchbox.desktop:8
@@ -331,7 +332,7 @@ msgstr "Un window manager per palmari"
 #. Name
 #: metacity.desktop:6
 msgid "Metacity"
-msgstr ""
+msgstr "Metacity"
 
 #. Comment
 #: metacity.desktop:8
@@ -341,7 +342,7 @@ msgstr "Un window manager leggero basato su GTK2"
 #. Name
 #: mwm.desktop:6
 msgid "MWM"
-msgstr ""
+msgstr "MWM"
 
 #. Comment
 #: mwm.desktop:8
@@ -351,7 +352,7 @@ msgstr "Il window manager di Motif"
 #. Name
 #: olvwm.desktop:6
 msgid "OLVWM"
-msgstr ""
+msgstr "OLVWM"
 
 #. Comment
 #: olvwm.desktop:8
@@ -365,7 +366,7 @@ msgstr ""
 #. Name
 #: olwm.desktop:6
 msgid "OLWM"
-msgstr ""
+msgstr "OLWM"
 
 #. Comment
 #: olwm.desktop:8
@@ -375,7 +376,7 @@ msgstr "L'Open Look Window Manager tradizionale"
 #. Name
 #: openbox.desktop:6
 msgid "Openbox"
-msgstr ""
+msgstr "Openbox"
 
 #. Comment
 #: openbox.desktop:8
@@ -385,7 +386,7 @@ msgstr "Un window manager leggero basato su BlackBox"
 #. Name
 #: oroborus.desktop:6
 msgid "Oroborus"
-msgstr ""
+msgstr "Oroborus"
 
 #. Comment
 #: oroborus.desktop:8
@@ -395,7 +396,7 @@ msgstr "Un window manager leggero che supporta i temi"
 #. Name
 #: phluid.desktop:6
 msgid "Phluid"
-msgstr ""
+msgstr "Phluid"
 
 #. Comment
 #: phluid.desktop:8
@@ -405,7 +406,7 @@ msgstr "Un window manager basato su Imlib2"
 #. Name
 #: pwm.desktop:6
 msgid "PWM"
-msgstr ""
+msgstr "PWM"
 
 #. Comment
 #: pwm.desktop:8
@@ -417,7 +418,7 @@ msgstr ""
 #. Name
 #: qvwm.desktop:6
 msgid "QVWM"
-msgstr ""
+msgstr "QVWM"
 
 #. Comment
 #: qvwm.desktop:8
@@ -427,7 +428,7 @@ msgstr "Un window manager in stile Windows 95"
 #. Name
 #: ratpoison.desktop:6
 msgid "Ratpoison"
-msgstr ""
+msgstr "Ratpoison"
 
 #. Comment
 #: ratpoison.desktop:8
@@ -437,7 +438,7 @@ msgstr "Un window manager semplice solo-tastiera pensato come Screen"
 #. Name
 #: sapphire.desktop:6
 msgid "Sapphire"
-msgstr ""
+msgstr "Sapphire"
 
 #. Comment
 #: sapphire.desktop:8
@@ -447,7 +448,7 @@ msgstr "Un window manager minimale ma configurabile"
 #. Name
 #: sawfish.desktop:6
 msgid "Sawfish"
-msgstr ""
+msgstr "Sawfish"
 
 #. Comment
 #: sawfish.desktop:8
@@ -460,7 +461,7 @@ msgstr ""
 #. Name
 #: twm.desktop:6
 msgid "TWM"
-msgstr ""
+msgstr "TWM"
 
 #. Comment
 #: twm.desktop:8
@@ -470,7 +471,7 @@ msgstr "Il Tab Window Manager"
 #. Name
 #: ude.desktop:6
 msgid "UDE"
-msgstr ""
+msgstr "UDE"
 
 #. Comment
 #: ude.desktop:8
@@ -480,7 +481,7 @@ msgstr "Lo Unix Desktop Environment"
 #. Name
 #: vtwm.desktop:6
 msgid "VTWM"
-msgstr ""
+msgstr "VTWM"
 
 #. Comment
 #: vtwm.desktop:8
@@ -491,7 +492,7 @@ msgstr ""
 #. Name
 #: w9wm.desktop:6
 msgid "W9WM"
-msgstr ""
+msgstr "W9WM"
 
 #. Comment
 #: w9wm.desktop:8
@@ -500,12 +501,12 @@ msgid ""
 "bindings"
 msgstr ""
 "Un window manager basato su 9WM, migliorato con schermi virtuali e "
-"scorciatoie per la tastiera."
+"scorciatoie per la tastiera"
 
 #. Name
 #: waimea.desktop:6
 msgid "Waimea"
-msgstr ""
+msgstr "Waimea"
 
 #. Comment
 #: waimea.desktop:8
@@ -515,7 +516,7 @@ msgstr "Un window manager molto personalizzabile basato su BlackBox"
 #. Name
 #: wm2.desktop:6
 msgid "WM2"
-msgstr ""
+msgstr "WM2"
 
 #. Comment
 #: wm2.desktop:8
@@ -524,19 +525,18 @@ msgstr "Un window manager piccolo e non configurabile"
 
 #. Name
 #: wmaker.desktop:6
-#, fuzzy
 msgid "WindowMaker"
-msgstr "Il Tab Window Manager"
+msgstr "WindowMaker"
 
 #. Comment
 #: wmaker.desktop:8
 msgid "A simple window manager that resembles the NeXTStep look very closely"
-msgstr "Un semplice window manager che assomiglia molto a NeXTStep."
+msgstr "Un semplice window manager che assomiglia molto a NeXTStep"
 
 #. Name
 #: xfce.desktop:6
 msgid "XFce"
-msgstr ""
+msgstr "XFce"
 
 #. Comment
 #: xfce.desktop:8
@@ -550,7 +550,7 @@ msgstr ""
 #. 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 21f023504..450b78291 100644
--- a/translations/desktop_files/tdm-sessions/nl.po
+++ b/translations/desktop_files/tdm-sessions/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@outlook.com>, 2022.
 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: 2022-05-03 17:20+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
+"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdm-sessions/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.12.1\n"
 
 #. Name
 #: tde.desktop.cmake:7
 msgid "TDE"
-msgstr ""
+msgstr "TDE"
 
 #. Comment
 #: tde.desktop.cmake:8
@@ -33,7 +34,7 @@ msgstr ""
 #. Name
 #: 9wm.desktop:6
 msgid "9WM"
-msgstr ""
+msgstr "9WM"
 
 #. Comment
 #: 9wm.desktop:8
@@ -43,17 +44,17 @@ msgstr "Een emulator voor de Plan9 windowmanager 8-1/2"
 #. Name
 #: admin.desktop:7
 msgid "admin"
-msgstr ""
+msgstr "beheerder"
 
 #. Comment
 #: admin.desktop:9
 msgid "Yast Admin Session"
-msgstr ""
+msgstr "YAST-beheerderssessie"
 
 #. Name
 #: aewm++.desktop:6
 msgid "AEWM++"
-msgstr ""
+msgstr "AEWM++"
 
 #. Comment
 #: aewm++.desktop:8
@@ -67,7 +68,7 @@ msgstr ""
 #. Name
 #: aewm.desktop:6
 msgid "AEWM"
-msgstr ""
+msgstr "AEWM"
 
 #. Comment
 #: aewm.desktop:8
@@ -77,7 +78,7 @@ msgstr "Een minimalistische windowmanager"
 #. Name
 #: afterstep.desktop:6
 msgid "AfterStep"
-msgstr ""
+msgstr "AfterStep"
 
 #. Comment
 #: afterstep.desktop:8
@@ -88,7 +89,7 @@ msgstr ""
 #. Name
 #: amaterus.desktop:6
 msgid "AMATERUS"
-msgstr ""
+msgstr "AMATERUS"
 
 #. Comment
 #: amaterus.desktop:8
@@ -523,9 +524,8 @@ msgstr "Een kleine, niet-instelbare windowmanager"
 
 #. Name
 #: wmaker.desktop:6
-#, fuzzy
 msgid "WindowMaker"
-msgstr "De Tab Window Manager"
+msgstr "WindowMaker"
 
 #. Comment
 #: wmaker.desktop:8
diff --git a/translations/desktop_files/tdm-sessions/pl.po b/translations/desktop_files/tdm-sessions/pl.po
index 24b1c672b..3dd34dd52 100644
--- a/translations/desktop_files/tdm-sessions/pl.po
+++ b/translations/desktop_files/tdm-sessions/pl.po
@@ -1,37 +1,40 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2021.
 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: 2021-10-18 20:31+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-sessions/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.8.1\n"
 
 #. Name
 #: tde.desktop.cmake:7
 msgid "TDE"
-msgstr ""
+msgstr "TDE"
 
 #. Comment
 #: tde.desktop.cmake:8
 msgid ""
 "The Trinity Desktop Environment. A powerful Open Source graphical desktop "
 "environment"
-msgstr "Środowisko TDE. Potężne środowisko graficzne Wolnego Oprogramowania."
+msgstr "Środowisko TDE. Potężne środowisko graficzne Wolnego Oprogramowania"
 
 #. Name
 #: 9wm.desktop:6
 msgid "9WM"
-msgstr ""
+msgstr "9WM"
 
 #. Comment
 #: 9wm.desktop:8
@@ -41,17 +44,17 @@ msgstr "Emulacja menedżera okien Plan 9 - 8-1/2"
 #. Name
 #: admin.desktop:7
 msgid "admin"
-msgstr ""
+msgstr "admin"
 
 #. Comment
 #: admin.desktop:9
 msgid "Yast Admin Session"
-msgstr ""
+msgstr "Sesja administracyjna Yast"
 
 #. Name
 #: aewm++.desktop:6
 msgid "AEWM++"
-msgstr ""
+msgstr "AEWM++"
 
 #. Comment
 #: aewm++.desktop:8
@@ -65,7 +68,7 @@ msgstr ""
 #. Name
 #: aewm.desktop:6
 msgid "AEWM"
-msgstr ""
+msgstr "AEWM"
 
 #. Comment
 #: aewm.desktop:8
@@ -75,7 +78,7 @@ msgstr "Prosty menedżer okien"
 #. Name
 #: afterstep.desktop:6
 msgid "AfterStep"
-msgstr ""
+msgstr "AfterStep"
 
 #. Comment
 #: afterstep.desktop:8
@@ -85,7 +88,7 @@ msgstr "Menedżer okien naśladujący NeXTStep, stworzony na podstawie FVWM"
 #. Name
 #: amaterus.desktop:6
 msgid "AMATERUS"
-msgstr ""
+msgstr "AMATERUS"
 
 #. Comment
 #: amaterus.desktop:8
@@ -95,7 +98,7 @@ msgstr "Menedżer okien korzystający z GTK+, z opcją grupowania okien"
 #. Name
 #: amiwm.desktop:6
 msgid "AmiWM"
-msgstr ""
+msgstr "AmiWM"
 
 #. Comment
 #: amiwm.desktop:8
@@ -105,7 +108,7 @@ msgstr "Menedżer okien naśladujący Amigę"
 #. Name
 #: asclassic.desktop:6
 msgid "ASClassic"
-msgstr ""
+msgstr "ASClassic"
 
 #. Comment
 #: asclassic.desktop:8
@@ -116,7 +119,7 @@ msgstr ""
 #. Name
 #: blackbox.desktop:6
 msgid "Blackbox"
-msgstr ""
+msgstr "Blackbox"
 
 #. Comment
 #: blackbox.desktop:8
@@ -126,7 +129,7 @@ msgstr "Szybki menedżer okien o małych wymaganiach"
 #. Name
 #: cde.desktop:6
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Comment
 #: cde.desktop:8
@@ -138,7 +141,7 @@ msgstr "Common Desktop Environment, standardowe przemysłowe środowisko pulpitu
 #. Name
 #: ctwm.desktop:6
 msgid "CTWM"
-msgstr ""
+msgstr "CTWM"
 
 #. Comment
 #: ctwm.desktop:8
@@ -148,7 +151,7 @@ msgstr "Menedżer okien Claude, TWM wzbogacony o wirtualne pulpity, itp."
 #. Name
 #: cwwm.desktop:6
 msgid "CWWM"
-msgstr ""
+msgstr "CWWM"
 
 #. Comment
 #: cwwm.desktop:8
@@ -159,7 +162,7 @@ msgstr ""
 #. Name
 #: enlightenment.desktop:6
 msgid "Enlightenment"
-msgstr ""
+msgstr "Enlightenment"
 
 #. Comment
 #: enlightenment.desktop:8
@@ -169,7 +172,7 @@ msgstr "Bogaty w funkcje menedżer okien o dużych możliwościach zmiany wyglą
 #. Name
 #: evilwm.desktop:6
 msgid "EvilWM"
-msgstr ""
+msgstr "EvilWM"
 
 #. Comment
 #: evilwm.desktop:8
@@ -179,7 +182,7 @@ msgstr "Prosty menedżer okien stworzony na podstawie AEWM"
 #. Name
 #: fluxbox.desktop:6
 msgid "Fluxbox"
-msgstr ""
+msgstr "Fluxbox"
 
 #. Comment
 #: fluxbox.desktop:8
@@ -191,7 +194,7 @@ msgstr ""
 #. Name
 #: flwm.desktop:6
 msgid "FLWM"
-msgstr ""
+msgstr "FLWM"
 
 #. Comment
 #: flwm.desktop:8
@@ -202,7 +205,7 @@ msgstr ""
 #. Name
 #: fvwm.desktop:6
 msgid "FVWM"
-msgstr ""
+msgstr "FVWM"
 
 #. Comment
 #: fvwm.desktop:8 fvwm2.desktop:8
@@ -212,12 +215,12 @@ msgstr "Potężny menedżer okien zgodny z ICCCM obsługujący wirtualne pulpity
 #. 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 "Wywodzący się z FVWM menedżer okien o wyglądzie podobnym do Windows
 #. Name
 #: gnome.desktop:6
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
 #. Comment
 #: gnome.desktop:8
@@ -241,7 +244,7 @@ msgstr ""
 #. Name
 #: golem.desktop:6
 msgid "Golem"
-msgstr ""
+msgstr "Golem"
 
 #. Comment
 #: golem.desktop:8
@@ -251,7 +254,7 @@ msgstr "Menedżer okien o małych wymaganiach"
 #. Name
 #: icewm.desktop:6
 msgid "IceWM"
-msgstr ""
+msgstr "IceWM"
 
 #. Comment
 #: icewm.desktop:8
@@ -261,7 +264,7 @@ msgstr "Menedżer okien podobny do Windows 95-OS/2-Motif"
 #. Name
 #: ion.desktop:6
 msgid "Ion"
-msgstr ""
+msgstr "Ion"
 
 #. Comment
 #: ion.desktop:8
@@ -293,7 +296,7 @@ msgstr "Pulpit stworzony przez KDE"
 #. Name
 #: larswm.desktop:6
 msgid "LarsWM"
-msgstr ""
+msgstr "LarsWM"
 
 #. Comment
 #: larswm.desktop:8
@@ -305,7 +308,7 @@ msgstr ""
 #. Name
 #: lwm.desktop:6
 msgid "LWM"
-msgstr ""
+msgstr "LWM"
 
 #. Comment
 #: lwm.desktop:8
@@ -317,7 +320,7 @@ msgstr ""
 #. Name
 #: matchbox.desktop:6
 msgid "Matchbox"
-msgstr ""
+msgstr "Matchbox"
 
 #. Comment
 #: matchbox.desktop:8
@@ -327,7 +330,7 @@ msgstr "Menedżer okien dla palmtopów"
 #. Name
 #: metacity.desktop:6
 msgid "Metacity"
-msgstr ""
+msgstr "Metacity"
 
 #. Comment
 #: metacity.desktop:8
@@ -337,7 +340,7 @@ msgstr "Menedżer okien o małych wymaganiach, oparty na GTK2"
 #. Name
 #: mwm.desktop:6
 msgid "MWM"
-msgstr ""
+msgstr "MWM"
 
 #. Comment
 #: mwm.desktop:8
@@ -347,7 +350,7 @@ msgstr "Menedżer okien Motif"
 #. Name
 #: olvwm.desktop:6
 msgid "OLVWM"
-msgstr ""
+msgstr "OLVWM"
 
 #. Comment
 #: olvwm.desktop:8
@@ -361,7 +364,7 @@ msgstr ""
 #. Name
 #: olwm.desktop:6
 msgid "OLWM"
-msgstr ""
+msgstr "OLWM"
 
 #. Comment
 #: olwm.desktop:8
@@ -371,7 +374,7 @@ msgstr "Tradycyjny menedżer okien Open Look"
 #. Name
 #: openbox.desktop:6
 msgid "Openbox"
-msgstr ""
+msgstr "Openbox"
 
 #. Comment
 #: openbox.desktop:8
@@ -381,7 +384,7 @@ msgstr "Menedżer okien o małych wymaganiach, oparty na Blackbox"
 #. Name
 #: oroborus.desktop:6
 msgid "Oroborus"
-msgstr ""
+msgstr "Oroborus"
 
 #. Comment
 #: oroborus.desktop:8
@@ -391,7 +394,7 @@ msgstr "Menedżer okien o małych wymaganiach, z możliwością zmiany wyglądu"
 #. Name
 #: phluid.desktop:6
 msgid "Phluid"
-msgstr ""
+msgstr "Phluid"
 
 #. Comment
 #: phluid.desktop:8
@@ -401,7 +404,7 @@ msgstr "Menedżer okien oparty na Imlib2"
 #. Name
 #: pwm.desktop:6
 msgid "PWM"
-msgstr ""
+msgstr "PWM"
 
 #. Comment
 #: pwm.desktop:8
@@ -414,7 +417,7 @@ msgstr ""
 #. Name
 #: qvwm.desktop:6
 msgid "QVWM"
-msgstr ""
+msgstr "PVWM"
 
 #. Comment
 #: qvwm.desktop:8
@@ -424,7 +427,7 @@ msgstr "Menedżer okien o wyglądzie podobnym do Windows 95"
 #. Name
 #: ratpoison.desktop:6
 msgid "Ratpoison"
-msgstr ""
+msgstr "Ratpoison"
 
 #. Comment
 #: ratpoison.desktop:8
@@ -436,7 +439,7 @@ msgstr ""
 #. Name
 #: sapphire.desktop:6
 msgid "Sapphire"
-msgstr ""
+msgstr "Sapphire"
 
 #. Comment
 #: sapphire.desktop:8
@@ -446,7 +449,7 @@ msgstr "Prosty menedżer okien, ale z możliwością konfiguracji"
 #. Name
 #: sawfish.desktop:6
 msgid "Sawfish"
-msgstr ""
+msgstr "Sawfish"
 
 #. Comment
 #: sawfish.desktop:8
@@ -459,7 +462,7 @@ msgstr ""
 #. Name
 #: twm.desktop:6
 msgid "TWM"
-msgstr ""
+msgstr "TWM"
 
 #. Comment
 #: twm.desktop:8
@@ -469,7 +472,7 @@ msgstr "Tab Window Manager"
 #. Name
 #: ude.desktop:6
 msgid "UDE"
-msgstr ""
+msgstr "UDE"
 
 #. Comment
 #: ude.desktop:8
@@ -479,7 +482,7 @@ msgstr "Åšrodowisko pulpitu Uniksa"
 #. Name
 #: vtwm.desktop:6
 msgid "VTWM"
-msgstr ""
+msgstr "VTWM"
 
 #. Comment
 #: vtwm.desktop:8
@@ -489,7 +492,7 @@ msgstr "Virtual Tab Window Manager. TWM wzbogacony o wirtualne pulpity itp."
 #. Name
 #: w9wm.desktop:6
 msgid "W9WM"
-msgstr ""
+msgstr "W9WM"
 
 #. Comment
 #: w9wm.desktop:8
@@ -503,7 +506,7 @@ msgstr ""
 #. Name
 #: waimea.desktop:6
 msgid "Waimea"
-msgstr ""
+msgstr "Waimea"
 
 #. Comment
 #: waimea.desktop:8
@@ -513,7 +516,7 @@ msgstr "Menedżer okien oparty na Blackbox z dużymi możliwościami dostosowani
 #. Name
 #: wm2.desktop:6
 msgid "WM2"
-msgstr ""
+msgstr "WM2"
 
 #. Comment
 #: wm2.desktop:8
@@ -522,9 +525,8 @@ msgstr "Mały menedżer okien nie podlegający konfiguracji"
 
 #. Name
 #: wmaker.desktop:6
-#, fuzzy
 msgid "WindowMaker"
-msgstr "Tab Window Manager"
+msgstr "WindowMaker"
 
 #. Comment
 #: wmaker.desktop:8
@@ -534,7 +536,7 @@ msgstr "Prosty menedżer okien przypominający bardzo wyglądem NeXTStep"
 #. Name
 #: xfce.desktop:6
 msgid "XFce"
-msgstr ""
+msgstr "Xfce"
 
 #. Comment
 #: xfce.desktop:8
@@ -546,7 +548,7 @@ msgstr "Åšrodowisko pulpitu przypominajÄ…ce CDE"
 #. Name
 #: xfce4.desktop:6
 msgid "XFce 4"
-msgstr ""
+msgstr "Xfce 4"
 
 #. Comment
 #: xfce4.desktop:8
@@ -555,4 +557,4 @@ msgid ""
 "reminiscent of CDE"
 msgstr ""
 "Cholesterol Free Desktop Environment, wersja 4 - środowisko graficzne "
-"podobne do CDE."
+"podobne do CDE"
diff --git a/translations/desktop_files/tdm-sessions/pt.po b/translations/desktop_files/tdm-sessions/pt.po
index 40c7491b2..6c937e881 100644
--- a/translations/desktop_files/tdm-sessions/pt.po
+++ b/translations/desktop_files/tdm-sessions/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>, 2021.
 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: 2021-03-08 19:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-sessions/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.5.1\n"
 
 #. Name
 #: tde.desktop.cmake:7
 msgid "TDE"
-msgstr ""
+msgstr "TDE"
 
 #. Comment
 #: tde.desktop.cmake:8
@@ -32,7 +33,7 @@ msgstr ""
 #. Name
 #: 9wm.desktop:6
 msgid "9WM"
-msgstr ""
+msgstr "9WM"
 
 #. Comment
 #: 9wm.desktop:8
@@ -42,17 +43,17 @@ msgstr "Uma emulação do gestor de janelas do Plan 9 8-1/2"
 #. Name
 #: admin.desktop:7
 msgid "admin"
-msgstr ""
+msgstr "admin"
 
 #. Comment
 #: admin.desktop:9
 msgid "Yast Admin Session"
-msgstr ""
+msgstr "Sessão de Admin Yast"
 
 #. Name
 #: aewm++.desktop:6
 msgid "AEWM++"
-msgstr ""
+msgstr "AEWM++"
 
 #. Comment
 #: aewm++.desktop:8
@@ -66,7 +67,7 @@ msgstr ""
 #. Name
 #: aewm.desktop:6
 msgid "AEWM"
-msgstr ""
+msgstr "AEWM"
 
 #. Comment
 #: aewm.desktop:8
@@ -76,19 +77,19 @@ msgstr "Um gestor de janelas minimalista"
 #. 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 ""
 "Um gestor de janelas com a aparência e comportamento do NeXTStep. Baseado no "
-"FVWM."
+"FVWM"
 
 #. Name
 #: amaterus.desktop:6
 msgid "AMATERUS"
-msgstr ""
+msgstr "AMATERUS"
 
 #. Comment
 #: amaterus.desktop:8
@@ -100,7 +101,7 @@ msgstr ""
 #. Name
 #: amiwm.desktop:6
 msgid "AmiWM"
-msgstr ""
+msgstr "AmiWM"
 
 #. Comment
 #: amiwm.desktop:8
@@ -110,7 +111,7 @@ msgstr "O gestor de janelas com o visual do Amiga"
 #. Name
 #: asclassic.desktop:6
 msgid "ASClassic"
-msgstr ""
+msgstr "ASClassic"
 
 #. Comment
 #: asclassic.desktop:8
@@ -120,7 +121,7 @@ msgstr "AfterStep Classic, um gestor de janelas baseado no AfterStep v1.1"
 #. Name
 #: blackbox.desktop:6
 msgid "Blackbox"
-msgstr ""
+msgstr "Blackbox"
 
 #. Comment
 #: blackbox.desktop:8
@@ -130,7 +131,7 @@ msgstr "Um gestor de janelas rápido e leve"
 #. Name
 #: cde.desktop:6
 msgid "CDE"
-msgstr ""
+msgstr "CDE"
 
 #. Comment
 #: cde.desktop:8
@@ -144,7 +145,7 @@ msgstr ""
 #. Name
 #: ctwm.desktop:6
 msgid "CTWM"
-msgstr ""
+msgstr "CTWM"
 
 #. Comment
 #: ctwm.desktop:8
@@ -155,7 +156,7 @@ msgstr ""
 #. Name
 #: cwwm.desktop:6
 msgid "CWWM"
-msgstr ""
+msgstr "CWWM"
 
 #. Comment
 #: cwwm.desktop:8
@@ -166,7 +167,7 @@ msgstr ""
 #. Name
 #: enlightenment.desktop:6
 msgid "Enlightenment"
-msgstr ""
+msgstr "Enlightenment"
 
 #. Comment
 #: enlightenment.desktop:8
@@ -178,7 +179,7 @@ msgstr ""
 #. Name
 #: evilwm.desktop:6
 msgid "EvilWM"
-msgstr ""
+msgstr "EvilWM"
 
 #. Comment
 #: evilwm.desktop:8
@@ -188,7 +189,7 @@ msgstr "Um gestor de janelas minimalista baseado no AEWM"
 #. Name
 #: fluxbox.desktop:6
 msgid "Fluxbox"
-msgstr ""
+msgstr "Fluxbox"
 
 #. Comment
 #: fluxbox.desktop:8
@@ -200,7 +201,7 @@ msgstr ""
 #. Name
 #: flwm.desktop:6
 msgid "FLWM"
-msgstr ""
+msgstr "FLWM"
 
 #. Comment
 #: flwm.desktop:8
@@ -210,7 +211,7 @@ msgstr "O Fast Light Window Manager, baseado em primeiro lugar no WM2"
 #. Name
 #: fvwm.desktop:6
 msgid "FVWM"
-msgstr ""
+msgstr "FVWM"
 
 #. Comment
 #: fvwm.desktop:8 fvwm2.desktop:8
@@ -222,12 +223,12 @@ msgstr ""
 #. Name
 #: fvwm2.desktop:6
 msgid "FVWM2"
-msgstr ""
+msgstr "FVWM2"
 
 #. Name
 #: fvwm95.desktop:6
 msgid "FVWM95"
-msgstr ""
+msgstr "FVWM95"
 
 #. Comment
 #: fvwm95.desktop:8
@@ -237,7 +238,7 @@ msgstr "Uma derivação do FVWM parecida com o Windows 95"
 #. Name
 #: gnome.desktop:6
 msgid "GNOME"
-msgstr ""
+msgstr "GNOME"
 
 #. Comment
 #: gnome.desktop:8
@@ -251,7 +252,7 @@ msgstr ""
 #. Name
 #: golem.desktop:6
 msgid "Golem"
-msgstr ""
+msgstr "Golem"
 
 #. Comment
 #: golem.desktop:8
@@ -261,7 +262,7 @@ msgstr "Um gestor de janelas leve"
 #. Name
 #: icewm.desktop:6
 msgid "IceWM"
-msgstr ""
+msgstr "IceWM"
 
 #. Comment
 #: icewm.desktop:8
@@ -271,7 +272,7 @@ msgstr "Um gestor de janelas parecido com o Windows 95, o OS/2 e o Motif"
 #. Name
 #: ion.desktop:6
 msgid "Ion"
-msgstr ""
+msgstr "Ion"
 
 #. Comment
 #: ion.desktop:8
@@ -303,7 +304,7 @@ msgstr "O ambiente de trabalho feito pelo KDE"
 #. Name
 #: larswm.desktop:6
 msgid "LarsWM"
-msgstr ""
+msgstr "LarsWM"
 
 #. Comment
 #: larswm.desktop:8
@@ -314,7 +315,7 @@ msgstr ""
 #. Name
 #: lwm.desktop:6
 msgid "LWM"
-msgstr ""
+msgstr "LWM"
 
 #. Comment
 #: lwm.desktop:8
@@ -325,7 +326,7 @@ msgstr ""
 #. Name
 #: matchbox.desktop:6
 msgid "Matchbox"
-msgstr ""
+msgstr "Matchbox"
 
 #. Comment
 #: matchbox.desktop:8
@@ -335,7 +336,7 @@ msgstr "Um gestor de janelas para dispositivos móveis"
 #. Name
 #: metacity.desktop:6
 msgid "Metacity"
-msgstr ""
+msgstr "Metacity"
 
 #. Comment
 #: metacity.desktop:8
@@ -345,7 +346,7 @@ msgstr "Um gestor de janelas leve, baseado em GTK2"
 #. Name
 #: mwm.desktop:6
 msgid "MWM"
-msgstr ""
+msgstr "MWM"
 
 #. Comment
 #: mwm.desktop:8
@@ -355,7 +356,7 @@ msgstr "O gestor de janelas do Motif"
 #. Name
 #: olvwm.desktop:6
 msgid "OLVWM"
-msgstr ""
+msgstr "OLVWM"
 
 #. Comment
 #: olvwm.desktop:8
@@ -369,7 +370,7 @@ msgstr ""
 #. Name
 #: olwm.desktop:6
 msgid "OLWM"
-msgstr ""
+msgstr "OLWM"
 
 #. Comment
 #: olwm.desktop:8
@@ -379,7 +380,7 @@ msgstr "O gestor de janelas Open Look tradicional"
 #. Name
 #: openbox.desktop:6
 msgid "Openbox"
-msgstr ""
+msgstr "Openbox"
 
 #. Comment
 #: openbox.desktop:8
@@ -389,7 +390,7 @@ msgstr "Um gestor de janelas leve baseado no Blackbox"
 #. Name
 #: oroborus.desktop:6
 msgid "Oroborus"
-msgstr ""
+msgstr "Oroborus"
 
 #. Comment
 #: oroborus.desktop:8
@@ -399,7 +400,7 @@ msgstr "Um gestor de janelas leve e com suporte para temas"
 #. Name
 #: phluid.desktop:6
 msgid "Phluid"
-msgstr ""
+msgstr "Phluid"
 
 #. Comment
 #: phluid.desktop:8
@@ -409,7 +410,7 @@ msgstr "Um gestor de janelas baseado na Imlib2"
 #. Name
 #: pwm.desktop:6
 msgid "PWM"
-msgstr ""
+msgstr "PWM"
 
 #. Comment
 #: pwm.desktop:8
@@ -422,7 +423,7 @@ msgstr ""
 #. Name
 #: qvwm.desktop:6
 msgid "QVWM"
-msgstr ""
+msgstr "QVWM"
 
 #. Comment
 #: qvwm.desktop:8
@@ -432,7 +433,7 @@ msgstr "Um gestor de janelas com o visual do Windows 95"
 #. Name
 #: ratpoison.desktop:6
 msgid "Ratpoison"
-msgstr ""
+msgstr "Ratpoison"
 
 #. Comment
 #: ratpoison.desktop:8
@@ -443,17 +444,17 @@ msgstr ""
 #. Name
 #: sapphire.desktop:6
 msgid "Sapphire"
-msgstr ""
+msgstr "Sapphire"
 
 #. Comment
 #: sapphire.desktop:8
 msgid "A minimal but configurable window manager"
-msgstr "Um gestor de janelas configurável mas mínimo"
+msgstr "Um gestor de janelas mínimo mas configurável"
 
 #. Name
 #: sawfish.desktop:6
 msgid "Sawfish"
-msgstr ""
+msgstr "Sawfish"
 
 #. Comment
 #: sawfish.desktop:8
@@ -466,38 +467,39 @@ msgstr ""
 #. Name
 #: twm.desktop:6
 msgid "TWM"
-msgstr ""
+msgstr "TWM"
 
 #. Comment
 #: twm.desktop:8
 msgid "The Tab Window Manager"
-msgstr "O Tab Window Manager"
+msgstr "O gestor de janelas de separadores"
 
 #. Name
 #: ude.desktop:6
 msgid "UDE"
-msgstr ""
+msgstr "UDE"
 
 #. Comment
 #: ude.desktop:8
 msgid "The UNIX Desktop Environment"
-msgstr "O Unix Desktop Environment"
+msgstr "O ambiente de trabalho 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 ""
-"O Virtual Tab Window Manager. Um TWM melhorado com ecrãs virtuais, etc."
+"O gestor da janelas de separador virtual. TWM melhorado por ecrãs virtuais, "
+"etc."
 
 #. Name
 #: w9wm.desktop:6
 msgid "W9WM"
-msgstr ""
+msgstr "W9WM"
 
 #. Comment
 #: w9wm.desktop:8
@@ -511,7 +513,7 @@ msgstr ""
 #. Name
 #: waimea.desktop:6
 msgid "Waimea"
-msgstr ""
+msgstr "Waimea"
 
 #. Comment
 #: waimea.desktop:8
@@ -521,7 +523,7 @@ msgstr "Um gestor de janelas altamente configurável, baseado no Blackbox"
 #. Name
 #: wm2.desktop:6
 msgid "WM2"
-msgstr ""
+msgstr "WM2"
 
 #. Comment
 #: wm2.desktop:8
@@ -530,9 +532,8 @@ msgstr "Um gestor de janelas pequeno e não-configurável"
 
 #. Name
 #: wmaker.desktop:6
-#, fuzzy
 msgid "WindowMaker"
-msgstr "O Tab Window Manager"
+msgstr "WindowMaker"
 
 #. Comment
 #: wmaker.desktop:8
@@ -543,7 +544,7 @@ msgstr ""
 #. Name
 #: xfce.desktop:6
 msgid "XFce"
-msgstr ""
+msgstr "XFce"
 
 #. Comment
 #: xfce.desktop:8
@@ -551,13 +552,13 @@ msgid ""
 "The Cholesterol Free Desktop Environment. A desktop environment reminiscent "
 "of CDE"
 msgstr ""
-"O Cholesterol Free Desktop Environment. Um ambiente de trabalho com "
-"vestígios do CDE"
+"O ambiente de trabalho sem colesterol. Um ambiente de trabalho que faz "
+"lembrar o CDE"
 
 #. Name
 #: xfce4.desktop:6
 msgid "XFce 4"
-msgstr ""
+msgstr "XFce 4"
 
 #. Comment
 #: xfce4.desktop:8
@@ -565,5 +566,5 @@ msgid ""
 "The Cholesterol Free Desktop Environment, version 4. A desktop environment "
 "reminiscent of CDE"
 msgstr ""
-"O Cholesterol Free Desktop Environment, versão 4. Um ambiente de trabalho "
-"com vestígios do CDE"
+"O ambiente de trabalho sem colesterol, versão 4. Um ambiente de trabalho que "
+"faz lembrar o CDE"
diff --git a/translations/desktop_files/tdm-sessions/ru.po b/translations/desktop_files/tdm-sessions/ru.po
index d3bd0f3c8..1fa334753 100644
--- a/translations/desktop_files/tdm-sessions/ru.po
+++ b/translations/desktop_files/tdm-sessions/ru.po
@@ -1,33 +1,36 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2022.
 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: 2022-02-14 23:01+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-sessions/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.10.1\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"
+msgstr ""
+"Trinity Desktop Environment. Мощна� графиче�ка� �реда рабочего � открытым "
+"и�ходным кодом"
 
 #. Name
 #: 9wm.desktop:6
diff --git a/translations/desktop_files/tdm-themes/cs.po b/translations/desktop_files/tdm-themes/cs.po
index cca3906e9..7a5e59222 100644
--- a/translations/desktop_files/tdm-themes/cs.po
+++ b/translations/desktop_files/tdm-themes/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-10-07 19:02+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/tdm-themes/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.2.2\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -29,19 +30,19 @@ msgstr "Motiv s modrými kruhy"
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "Minimalistický"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "Minimalistický motiv TDM pro TDE, inspirovaný LightDM"
 
 #. Name
 #: o2_enterprise/GdmGreeterTheme.desktop:8
 msgid "O2 Enterprise"
-msgstr ""
+msgstr "O2 firemní"
 
 #. Description
 #: o2_enterprise/GdmGreeterTheme.desktop:10
 msgid "A sleek and professional looking TDM theme for Trinity"
-msgstr ""
+msgstr "Elegantní a profesionálně vypadající motiv TDM pro Trinity"
diff --git a/translations/desktop_files/tdm-themes/es.po b/translations/desktop_files/tdm-themes/es.po
index 32dc52186..6a46754c3 100644
--- a/translations/desktop_files/tdm-themes/es.po
+++ b/translations/desktop_files/tdm-themes/es.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Victor Galvez <cassdee_058@protonmail.com>, 2022.
 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: 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/"
+"projects/tdebase/tdm-themes/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.10.1\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -29,12 +30,12 @@ msgstr "Tema con círculos azules"
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "Minimalista"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "Un tema minimalista para TDM, inspirado por LightDM"
 
 #. Name
 #: o2_enterprise/GdmGreeterTheme.desktop:8
@@ -44,4 +45,4 @@ msgstr ""
 #. Description
 #: o2_enterprise/GdmGreeterTheme.desktop:10
 msgid "A sleek and professional looking TDM theme for Trinity"
-msgstr ""
+msgstr "Un tema de apariencia impecable y profesional para TDM"
diff --git a/translations/desktop_files/tdm-themes/it.po b/translations/desktop_files/tdm-themes/it.po
index 0a0da005b..034755e75 100644
--- a/translations/desktop_files/tdm-themes/it.po
+++ b/translations/desktop_files/tdm-themes/it.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-03-06 19:02+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-themes/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.11.2\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -29,19 +31,19 @@ msgstr "Tema con cerchi blu"
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "Minimalista"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "Un tema TDM minimalista per l'ambiente TDE, ispirato da LigthDM"
 
 #. 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 "Un tema TDM elegante e professionale per Trinity"
diff --git a/translations/desktop_files/tdm-themes/pl.po b/translations/desktop_files/tdm-themes/pl.po
index 68e6eb950..e096e8909 100644
--- a/translations/desktop_files/tdm-themes/pl.po
+++ b/translations/desktop_files/tdm-themes/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-04 13:06+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-themes/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.1.1\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -29,19 +31,19 @@ msgstr "Motyw z niebieskimi kółkami"
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "Minimalista"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "Minimalistyczny motyw TDM dla TDE, inspirowany 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 "Elegancki i wyglÄ…dajÄ…cy profesjonalnie motyw TDM dla TDE"
diff --git a/translations/desktop_files/tdm-themes/pt.po b/translations/desktop_files/tdm-themes/pt.po
index 09b192f25..64ec88732 100644
--- a/translations/desktop_files/tdm-themes/pt.po
+++ b/translations/desktop_files/tdm-themes/pt.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2021.
 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: 2021-12-02 19:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/tdm-themes/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.9.1\n"
 
 #. Name
 #: circles/GdmGreeterTheme.desktop:7
@@ -29,19 +30,19 @@ msgstr "Tema com círculos azuis"
 #. Name
 #: minimalist/GdmGreeterTheme.desktop:8
 msgid "Minimalist"
-msgstr ""
+msgstr "Minimalista"
 
 #. Description
 #: minimalist/GdmGreeterTheme.desktop:10
 msgid "A minimalist TDM theme for TDE, inspired by LightDM"
-msgstr ""
+msgstr "Um tema minimalista do TDM para TDE, inspirado no LightDM"
 
 #. Name
 #: o2_enterprise/GdmGreeterTheme.desktop:8
 msgid "O2 Enterprise"
-msgstr ""
+msgstr "O2 Empresarial"
 
 #. Description
 #: o2_enterprise/GdmGreeterTheme.desktop:10
 msgid "A sleek and professional looking TDM theme for Trinity"
-msgstr ""
+msgstr "Um tema elegante e de aspecto profissional do TDM para o 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/cs.po b/translations/desktop_files/twin-clients-desktops/cs.po
index 741be68ff..bac908921 100644
--- a/translations/desktop_files/twin-clients-desktops/cs.po
+++ b/translations/desktop_files/twin-clients-desktops/cs.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020.
 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: 2020-09-24 00:40+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/twin-clients-desktop-files/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.2.2\n"
 
 #. Name
 #: b2/b2.desktop:2
 msgid "B II"
-msgstr ""
+msgstr "B II"
 
 #. Name
 #: keramik/keramik.desktop:2
@@ -44,24 +45,24 @@ msgstr "Moderní systém"
 #. Name
 #: plastik/plastik.desktop:2
 msgid "Plastik"
-msgstr ""
+msgstr "Plastický"
 
 #. 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 "Test KWin"
 
 #. Name
 #: web/web.desktop:2
 msgid "Web"
-msgstr ""
+msgstr "Web"
diff --git a/translations/desktop_files/twin-clients-desktops/it.po b/translations/desktop_files/twin-clients-desktops/it.po
index 2ac0567cd..18c9892e8 100644
--- a/translations/desktop_files/twin-clients-desktops/it.po
+++ b/translations/desktop_files/twin-clients-desktops/it.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-03-13 09:11+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-clients-desktop-files/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.11.2\n"
 
 #. Name
 #: b2/b2.desktop:2
 msgid "B II"
-msgstr ""
+msgstr "B II"
 
 #. Name
 #: keramik/keramik.desktop:2
@@ -49,12 +50,12 @@ msgstr "Plastica"
 #. Name
 #: quartz/quartz.desktop:2
 msgid "Quartz"
-msgstr ""
+msgstr "Quarzo"
 
 #. Name
 #: redmond/redmond.desktop:2
 msgid "Redmond"
-msgstr ""
+msgstr "Redmond"
 
 #. Name
 #: test/test.desktop:2
@@ -64,4 +65,4 @@ msgstr "Prova KWin"
 #. Name
 #: web/web.desktop:2
 msgid "Web"
-msgstr ""
+msgstr "Web"
diff --git a/translations/desktop_files/twin-clients-desktops/pl.po b/translations/desktop_files/twin-clients-desktops/pl.po
index 2f271b0e7..476b0bd53 100644
--- a/translations/desktop_files/twin-clients-desktops/pl.po
+++ b/translations/desktop_files/twin-clients-desktops/pl.po
@@ -1,30 +1,32 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-clients-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.1.1\n"
 
 #. Name
 #: b2/b2.desktop:2
 msgid "B II"
-msgstr ""
+msgstr "B II"
 
 #. Name
 #: keramik/keramik.desktop:2
 msgid "Keramik"
-msgstr ""
+msgstr "Keramik"
 
 #. Name
 #: kwmtheme/kwmtheme.desktop:2
@@ -34,7 +36,7 @@ msgstr "Motyw KWM"
 #. Name
 #: laptop/laptop.desktop:2
 msgid "Laptop"
-msgstr ""
+msgstr "Laptop"
 
 #. Name
 #: modernsystem/modernsystem.desktop:2
@@ -44,7 +46,7 @@ msgstr "Nowoczesny system"
 #. Name
 #: plastik/plastik.desktop:2
 msgid "Plastik"
-msgstr ""
+msgstr "Plastik"
 
 #. Name
 #: quartz/quartz.desktop:2
@@ -54,7 +56,7 @@ msgstr "Kwarc"
 #. Name
 #: redmond/redmond.desktop:2
 msgid "Redmond"
-msgstr ""
+msgstr "Redmond"
 
 #. Name
 #: test/test.desktop:2
diff --git a/translations/desktop_files/twin-clients-desktops/ru.po b/translations/desktop_files/twin-clients-desktops/ru.po
index 9fa01043e..2bdb5df23 100644
--- a/translations/desktop_files/twin-clients-desktops/ru.po
+++ b/translations/desktop_files/twin-clients-desktops/ru.po
@@ -1,30 +1,32 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# 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: 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/twin-clients-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
 #: 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
@@ -54,7 +56,7 @@ msgstr "Кварц"
 #. Name
 #: redmond/redmond.desktop:2
 msgid "Redmond"
-msgstr ""
+msgstr "Редмонд"
 
 #. Name
 #: test/test.desktop:2
@@ -64,4 +66,4 @@ msgstr "Проверка KWin"
 #. Name
 #: web/web.desktop:2
 msgid "Web"
-msgstr ""
+msgstr "Web"
diff --git a/translations/desktop_files/twin-clients-desktops/sk.po b/translations/desktop_files/twin-clients-desktops/sk.po
index 21bfa65c1..8eb8cf34d 100644
--- a/translations/desktop_files/twin-clients-desktops/sk.po
+++ b/translations/desktop_files/twin-clients-desktops/sk.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 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: 2020-10-06 21:31+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-clients-desktop-files/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Name
 #: b2/b2.desktop:2
 msgid "B II"
-msgstr ""
+msgstr "B II"
 
 #. Name
 #: keramik/keramik.desktop:2
 msgid "Keramik"
-msgstr ""
+msgstr "Keramik"
 
 #. Name
 #: kwmtheme/kwmtheme.desktop:2
@@ -34,7 +35,7 @@ msgstr "Téma KWM"
 #. Name
 #: laptop/laptop.desktop:2
 msgid "Laptop"
-msgstr ""
+msgstr "Notebook"
 
 #. Name
 #: modernsystem/modernsystem.desktop:2
@@ -44,17 +45,17 @@ msgstr "Moderný systém"
 #. 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
@@ -64,4 +65,4 @@ msgstr "Test KWin"
 #. Name
 #: web/web.desktop:2
 msgid "Web"
-msgstr ""
+msgstr "Web"
diff --git a/translations/desktop_files/twin-desktops/af.po b/translations/desktop_files/twin-desktops/af.po
index 723f09b3f..2fd5fe083 100644
--- a/translations/desktop_files/twin-desktops/af.po
+++ b/translations/desktop_files/twin-desktops/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -62,6 +62,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Konfigureer gevorderde venster bestuuring funksies"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Gevorderde"
diff --git a/translations/desktop_files/twin-desktops/ar.po b/translations/desktop_files/twin-desktops/ar.po
index 07b2efa74..fc6eda809 100644
--- a/translations/desktop_files/twin-desktops/ar.po
+++ b/translations/desktop_files/twin-desktops/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -64,6 +64,25 @@ msgstr ""
 "الأس�ل;قائمة العمليات;شريط العنوان;تحجيم;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "تهيئة ميزات النوا�ذ المتقدمة"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "متقدم"
diff --git a/translations/desktop_files/twin-desktops/az.po b/translations/desktop_files/twin-desktops/az.po
index 72918b72b..f02a38c7a 100644
--- a/translations/desktop_files/twin-desktops/az.po
+++ b/translations/desktop_files/twin-desktops/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -64,6 +64,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/be.po b/translations/desktop_files/twin-desktops/be.po
index be3b5a332..2231c22bf 100644
--- a/translations/desktop_files/twin-desktops/be.po
+++ b/translations/desktop_files/twin-desktops/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -67,6 +67,25 @@ msgstr ""
 "titlebar;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "�а�таўленне адмы�ловых здольна�ц�ў кіраванн� вокнамі"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "�дмы�ловы�"
diff --git a/translations/desktop_files/twin-desktops/bg.po b/translations/desktop_files/twin-desktops/bg.po
index 1b6a0fff2..cc949bc4c 100644
--- a/translations/desktop_files/twin-desktops/bg.po
+++ b/translations/desktop_files/twin-desktops/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -66,6 +66,25 @@ msgstr ""
 "resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "�а�тройване допълнителните параметри на прозорците"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Допълнителни"
diff --git a/translations/desktop_files/twin-desktops/bn.po b/translations/desktop_files/twin-desktops/bn.po
index 9c588911e..10e87b9b5 100644
--- a/translations/desktop_files/twin-desktops/bn.po
+++ b/translations/desktop_files/twin-desktops/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "উইণ�ডো ম�যানেজমেন�টের ক�ষ�দ�রাতিক�ষ�দ�র বৈশিষ�ট�য কনফিগার কর�ন"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "অগ�রসর"
diff --git a/translations/desktop_files/twin-desktops/br.po b/translations/desktop_files/twin-desktops/br.po
index a5265ff86..5657ba81f 100644
--- a/translations/desktop_files/twin-desktops/br.po
+++ b/translations/desktop_files/twin-desktops/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Barek"
diff --git a/translations/desktop_files/twin-desktops/bs.po b/translations/desktop_files/twin-desktops/bs.po
index 636c204c5..9ef000e5a 100644
--- a/translations/desktop_files/twin-desktops/bs.po
+++ b/translations/desktop_files/twin-desktops/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Podesite napredne mogućnosti upravljanja prozorima"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Napredno"
diff --git a/translations/desktop_files/twin-desktops/ca.po b/translations/desktop_files/twin-desktops/ca.po
index 809b3bd71..2d93482ee 100644
--- a/translations/desktop_files/twin-desktops/ca.po
+++ b/translations/desktop_files/twin-desktops/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,27 @@ msgstr ""
 "del títol;redimensionar;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr ""
+"Aquí podeu configurar les característiques avançades de la gestió de "
+"finestres"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avançat"
diff --git a/translations/desktop_files/twin-desktops/cs.po b/translations/desktop_files/twin-desktops/cs.po
index 0c48c62b6..efbfbd404 100644
--- a/translations/desktop_files/twin-desktops/cs.po
+++ b/translations/desktop_files/twin-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21: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"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2023-09-19 19:39+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/twin-desktop-files/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
 #: kcmtwin/showdesktop.desktop:4
@@ -24,7 +25,7 @@ msgstr "Zobrazit plochu"
 #. Comment
 #: kcmtwin/showdesktop.desktop:6
 msgid "A button that gives quick access to the desktop when pressed"
-msgstr "Tla�ítko s rychlým přístupem k pracovní ploše"
+msgstr "Tla�ítko poskytující rychlý přístup k pracovní ploše"
 
 #. Name
 #: kcmtwin/twindecoration/twindecoration.desktop:11
@@ -65,6 +66,23 @@ msgstr ""
 "velikosti;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "Aktivní okraje"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "Nastavení vlastností aktivních okrajů/rohů"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr "chování oken;okna;rám;titulek;okraje;rohy;aktivní okraje;aerosnap;"
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Pokro�ilé"
@@ -128,17 +146,17 @@ msgid ""
 "focus;placement;window behavior;animation;raise;auto raise;windows;frame;"
 "titlebar;doubleclick;"
 msgstr ""
-"Zaměření;Umístění oken;Chování oken;Animace;Okna;Ráme�ek;Titulek;Dvojklik;"
+"zaměření;Umístění oken;chování oken;animace;okna;ráme�ek;titulek;dvojklik;"
 
 #. Name
 #: kcmtwin/twinoptions/twintranslucency.desktop:11
 msgid "Translucency"
-msgstr "Průhlednost"
+msgstr "Průsvitnost"
 
 #. Comment
 #: kcmtwin/twinoptions/twintranslucency.desktop:13
 msgid "Configure window translucency and shadow management"
-msgstr "Nastavení průhlednosti a stínování oken"
+msgstr "Nastavení průsvitnosti a stínování oken"
 
 #. Keywords
 #: kcmtwin/twinoptions/twintranslucency.desktop:15
@@ -165,24 +183,24 @@ msgstr "velikost;pozice;umístění;stav;chování oken;pravidla;"
 #. Description
 #: data/fsp_workarounds_1.twinrules:2
 msgid "(Default) Disable focus stealing prevention for XV"
-msgstr ""
+msgstr "(Výchozí) Zakázat prevenci krádeže zaměření pro XV"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr ""
+msgstr "(Výchozí) Povolit krádež zaměření zam�ením obrazovky"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
 msgid "(Default) Allow focus stealing by the kdesktop run dialog"
-msgstr ""
+msgstr "(Výchozí) Povolit krádež zaměření dialogovým oknem Spustit příkaz"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:32
 msgid "(Default) Allow focus stealing by the settings test dialog"
-msgstr ""
+msgstr "(Výchozí) Povolit krádež zaměření dialogovým oknem pro test nastavení"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:45
 msgid "(Default) Hide system modal dialog class from taskbar"
-msgstr ""
+msgstr "(Výchozí) Skrýt systémová modální dialogová okna z hlavního panelu"
diff --git a/translations/desktop_files/twin-desktops/csb.po b/translations/desktop_files/twin-desktops/csb.po
index 3e089d717..df660ae64 100644
--- a/translations/desktop_files/twin-desktops/csb.po
+++ b/translations/desktop_files/twin-desktops/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "zmiana miarë;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Kònfigùracëjô awansowónëch òptacëji sprôwianiô òknama"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Awansowóné"
diff --git a/translations/desktop_files/twin-desktops/cy.po b/translations/desktop_files/twin-desktops/cy.po
index 52368e722..3ca9b8aae 100644
--- a/translations/desktop_files/twin-desktops/cy.po
+++ b/translations/desktop_files/twin-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "feintio;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Ffurfweddu Nodweddion Uwch Trefnu Ffenestri"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Uwch"
diff --git a/translations/desktop_files/twin-desktops/da.po b/translations/desktop_files/twin-desktops/da.po
index b3c2e41c3..6f2e06b9c 100644
--- a/translations/desktop_files/twin-desktops/da.po
+++ b/translations/desktop_files/twin-desktops/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "skyg;maksimér;minimér;sænk;operationsmenu;titellinje;ændr størrelse;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Indstil avancerede vindueshåndteringsegenskaber"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avanceret"
diff --git a/translations/desktop_files/twin-desktops/de.po b/translations/desktop_files/twin-desktops/de.po
index 36118fe0b..6a1f1483d 100644
--- a/translations/desktop_files/twin-desktops/de.po
+++ b/translations/desktop_files/twin-desktops/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -64,6 +64,25 @@ msgstr ""
 "Fensterheber;Maximieren;Minimieren;Nach oben/unten;Titelleiste;Größe ändern;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Erweiterte Fensterverwaltung einrichten"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Erweitert"
diff --git a/translations/desktop_files/twin-desktops/el.po b/translations/desktop_files/twin-desktops/el.po
index 5ff48b348..d3f9af202 100644
--- a/translations/desktop_files/twin-desktops/el.po
+++ b/translations/desktop_files/twin-desktops/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -66,6 +66,25 @@ msgstr ""
 "μενο� χει�ισμών;μπά�α τίτλου;αλλαγή μεγέθους;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Ρυθμίστε π�οχω�ημένα χα�ακτη�ιστικά της διαχεί�ισης πα�αθ��ων"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Π�οχω�ημένα"
diff --git a/translations/desktop_files/twin-desktops/en_GB.po b/translations/desktop_files/twin-desktops/en_GB.po
index e44e50a5b..0cace0efc 100644
--- a/translations/desktop_files/twin-desktops/en_GB.po
+++ b/translations/desktop_files/twin-desktops/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -63,6 +63,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/eo.po b/translations/desktop_files/twin-desktops/eo.po
index f3d28d770..790ba6832 100644
--- a/translations/desktop_files/twin-desktops/eo.po
+++ b/translations/desktop_files/twin-desktops/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "maksimigi;minimumigi;menuo;titolo;grandec�an�i;grandigi;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Agordu la pli bonajn fenestroadministrilecojn"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Pliaj"
diff --git a/translations/desktop_files/twin-desktops/es.po b/translations/desktop_files/twin-desktops/es.po
index 6fe2bd478..bcdcb5d5e 100644
--- a/translations/desktop_files/twin-desktops/es.po
+++ b/translations/desktop_files/twin-desktops/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -66,6 +66,25 @@ msgstr ""
 "barra de título;redimensionarmenu;titlebar;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configuración de las propiedades avanzadas del gestor de ventanas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avanzado"
diff --git a/translations/desktop_files/twin-desktops/et.po b/translations/desktop_files/twin-desktops/et.po
index 2469e915e..b2a0ca877 100644
--- a/translations/desktop_files/twin-desktops/et.po
+++ b/translations/desktop_files/twin-desktops/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "tiitliriba;suuruse muutmine;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Aknahalduri seadistamine"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Muu"
diff --git a/translations/desktop_files/twin-desktops/eu.po b/translations/desktop_files/twin-desktops/eu.po
index 7bed4d8c5..1ef2ba593 100644
--- a/translations/desktop_files/twin-desktops/eu.po
+++ b/translations/desktop_files/twin-desktops/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "tamaina aldatu;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Konfiguratu leiho kudeaketaren ezaugarri aurreratuak"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Aurreratua"
diff --git a/translations/desktop_files/twin-desktops/fa.po b/translations/desktop_files/twin-desktops/fa.po
index 1ac26d725..1032a0591 100644
--- a/translations/desktop_files/twin-desktops/fa.po
+++ b/translations/desktop_files/twin-desktops/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "میله عنوان، تغییر اندازه;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "پیکربندی ویژگیهای مدیریت پنجرۀ پیشر�ته"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "پیشر�ته"
diff --git a/translations/desktop_files/twin-desktops/fi.po b/translations/desktop_files/twin-desktops/fi.po
index 9db3c47a5..61b932c5b 100644
--- a/translations/desktop_files/twin-desktops/fi.po
+++ b/translations/desktop_files/twin-desktops/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -64,6 +64,25 @@ msgstr ""
 "varjosta;suurenna;pienennä;laske;toimintovalikko;otsikkopalkki;vaihda kokoa;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Muokkaa ikkunoinnin ominaisuuksien lisäasetuksia"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Lisäasetukset"
diff --git a/translations/desktop_files/twin-desktops/fo.po b/translations/desktop_files/twin-desktops/fo.po
index e95f78b5c..41d272602 100644
--- a/translations/desktop_files/twin-desktops/fo.po
+++ b/translations/desktop_files/twin-desktops/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Tilkomið"
diff --git a/translations/desktop_files/twin-desktops/fr.po b/translations/desktop_files/twin-desktops/fr.po
index 478ec5adf..0b399600b 100644
--- a/translations/desktop_files/twin-desktops/fr.po
+++ b/translations/desktop_files/twin-desktops/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "titre;redimensionner;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configuration des fonctionnalités de gestion avancée des fenêtres"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avancé"
diff --git a/translations/desktop_files/twin-desktops/fy.po b/translations/desktop_files/twin-desktops/fy.po
index c0f5cfaf7..6b3148631 100644
--- a/translations/desktop_files/twin-desktops/fy.po
+++ b/translations/desktop_files/twin-desktops/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -67,6 +67,25 @@ msgstr ""
 "eftergrûn;grutte;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Hjir kinne jo de avansearre finsterbehearmooglikheden ynstelle"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avansearre"
diff --git a/translations/desktop_files/twin-desktops/ga.po b/translations/desktop_files/twin-desktops/ga.po
index c91acc1b8..84cf36639 100644
--- a/translations/desktop_files/twin-desktops/ga.po
+++ b/translations/desktop_files/twin-desktops/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -67,6 +67,25 @@ msgstr ""
 "oibríochta;barra teidil;athraigh méid;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Cumraigh ardghnéithe bhainisteoireacht na bhfuinneog"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Casta"
diff --git a/translations/desktop_files/twin-desktops/gl.po b/translations/desktop_files/twin-desktops/gl.po
index 74e393ba4..38f972ece 100644
--- a/translations/desktop_files/twin-desktops/gl.po
+++ b/translations/desktop_files/twin-desktops/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "título;redimensionar;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configurar as características avanzadas da xestión de fiestras"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avanzado"
diff --git a/translations/desktop_files/twin-desktops/he.po b/translations/desktop_files/twin-desktops/he.po
index 8eb6e2ef2..78a164273 100644
--- a/translations/desktop_files/twin-desktops/he.po
+++ b/translations/desktop_files/twin-desktops/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -66,6 +66,25 @@ msgstr ""
 "maximise;maximize;minimize;minimise;lower;operations menu;titlebar;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "שינוי הגדרות מתקדמות של ניהול חלונות"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "מתקד�"
diff --git a/translations/desktop_files/twin-desktops/hi.po b/translations/desktop_files/twin-desktops/hi.po
index 469957d88..56c8d5efc 100644
--- a/translations/desktop_files/twin-desktops/hi.po
+++ b/translations/desktop_files/twin-desktops/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -62,6 +62,25 @@ msgid ""
 msgstr "शेड;अधिकतम;बड़ा;न�यूनतम;छोटा;नीचे;ऑपरेशन�स मेन�यू;शीर�षक-पट�टी;नयाआकार;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "विस�तृत विंडो प�रबंधन विशेषता कॉन�फ़िगर करें"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "विस�तृत"
diff --git a/translations/desktop_files/twin-desktops/hr.po b/translations/desktop_files/twin-desktops/hr.po
index db643f324..2680cbf42 100644
--- a/translations/desktop_files/twin-desktops/hr.po
+++ b/translations/desktop_files/twin-desktops/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -67,6 +67,25 @@ msgstr ""
 "traka;promjena veli�ine;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Konfiguriranje naprednih svojstava upravitelja prozora"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Napredno"
diff --git a/translations/desktop_files/twin-desktops/hu.po b/translations/desktop_files/twin-desktops/hu.po
index a2fd70b98..ca6f86c17 100644
--- a/translations/desktop_files/twin-desktops/hu.po
+++ b/translations/desktop_files/twin-desktops/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "hátraengedés;műveletek menü;címsor;átméretezés;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Az ablakkezelés speciális beállításai"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Speciális"
diff --git a/translations/desktop_files/twin-desktops/id.po b/translations/desktop_files/twin-desktops/id.po
index 53b56f6af..0f05dd315 100644
--- a/translations/desktop_files/twin-desktops/id.po
+++ b/translations/desktop_files/twin-desktops/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/is.po b/translations/desktop_files/twin-desktops/is.po
index 4684d08e5..7cdac833a 100644
--- a/translations/desktop_files/twin-desktops/is.po
+++ b/translations/desktop_files/twin-desktops/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "stærð;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Stilla ítarlegri hegðan setustjóra"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "�tarlegt"
diff --git a/translations/desktop_files/twin-desktops/it.po b/translations/desktop_files/twin-desktops/it.po
index b669cbdbb..e900f4015 100644
--- a/translations/desktop_files/twin-desktops/it.po
+++ b/translations/desktop_files/twin-desktops/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21: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"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2023-08-23 07:29+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/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
 #: kcmtwin/showdesktop.desktop:4
@@ -65,6 +66,25 @@ msgstr ""
 "barra del titolo;titolo;ridimensiona;sposta;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "Bordi Attivi"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "Configura le funzioni dei bordi/angoli attivi"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+"comportamento delle finestre;finestre;cornice;barra del titolo;bordi;angoli;"
+"bordi attivi;aerosnap;"
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avanzate"
@@ -82,7 +102,7 @@ msgstr "arrotola;bordi;passaggio del mouse;bordi attivi;"
 #. Name
 #: kcmtwin/twinoptions/twinfocus.desktop:11
 msgid "Focus"
-msgstr ""
+msgstr "Focus"
 
 #. Comment
 #: kcmtwin/twinoptions/twinfocus.desktop:13
@@ -171,27 +191,31 @@ msgstr ""
 #. Description
 #: data/fsp_workarounds_1.twinrules:2
 msgid "(Default) Disable focus stealing prevention for XV"
-msgstr "(Predefinita) Disabilita la prevenzione della cattura del fuoco per XV"
+msgstr "(Predefinito) Disabilita la prevenzione della cattura del fuoco per XV"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Predefinita) Disabilita la prevenzione della cattura del fuoco per XV"
+msgstr ""
+"(Predefinito) Consenti la cattura del focus da parte del blocca schermo"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
-#, fuzzy
 msgid "(Default) Allow focus stealing by the kdesktop run dialog"
-msgstr "(Predefinita) Disabilita la prevenzione della cattura del fuoco per XV"
+msgstr ""
+"(Predefinito) Consenti la cattura del focus da parte della finestra di "
+"dialogo \"Esegui programma\" di kdesktop"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:32
-#, fuzzy
 msgid "(Default) Allow focus stealing by the settings test dialog"
-msgstr "(Predefinita) Disabilita la prevenzione della cattura del fuoco per XV"
+msgstr ""
+"(Predefinito) Consenti la cattura del focus da parte della finestra di "
+"dialogo usata per testare i settaggi"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:45
 msgid "(Default) Hide system modal dialog class from taskbar"
 msgstr ""
+"(Predefinito) Nascondi la finestra di dialogo modale di classe del sistema "
+"dalla barra delle applicazioni"
diff --git a/translations/desktop_files/twin-desktops/ja.po b/translations/desktop_files/twin-desktops/ja.po
index 32ce54bd4..ec6995f98 100644
--- a/translations/desktop_files/twin-desktops/ja.po
+++ b/translations/desktop_files/twin-desktops/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -64,6 +64,25 @@ msgstr ""
 "シェード;最大化;最�化;後��;�作メニュー;タイトル�ー;サイズ変更;リサイズ;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ウィンドウ管�機能�詳細設定"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "詳細"
diff --git a/translations/desktop_files/twin-desktops/ka.po b/translations/desktop_files/twin-desktops/ka.po
index ba03f46eb..0c33ab44d 100644
--- a/translations/desktop_files/twin-desktops/ka.po
+++ b/translations/desktop_files/twin-desktops/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ფ�ნჯრების მენეჯერის დ�მ�ტებითი ფუნქციების კ�ნფიგურ�ცი�"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "დ�მ�ტებით"
diff --git a/translations/desktop_files/twin-desktops/kk.po b/translations/desktop_files/twin-desktops/kk.po
index 86ff0f4bd..e48c36690 100644
--- a/translations/desktop_files/twin-desktops/kk.po
+++ b/translations/desktop_files/twin-desktops/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Терезе ба�қаруының қо�ымша параметрлерін баптау"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Қо�ымша"
diff --git a/translations/desktop_files/twin-desktops/km.po b/translations/desktop_files/twin-desktops/km.po
index a8e0a6a15..f85ce590f 100644
--- a/translations/desktop_files/twin-desktops/km.po
+++ b/translations/desktop_files/twin-desktops/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -63,6 +63,25 @@ msgstr ""
 "ស្រមោល;ពង្រីក​អ�ិបរមា;បង្រួម​អប្បបរមា;បន្ទាប់​ចុះ​ក្រោម;ម៉ឺនុយ​ប្រ�ិប�្�ិការ;របារ​ចំណងជើង;ប្ដូរ​ទំហំ;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "កំណ�់​រចនាសម្ព�ន្ធ​លក្�ណៈ​ពិស�ស​ការ​គ្រប់គ្រង​បង្អួច​កម្រិ�​�្ពស់"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "កម្រិ�​�្ពស់"
diff --git a/translations/desktop_files/twin-desktops/ko.po b/translations/desktop_files/twin-desktops/ko.po
index 1ad59b63c..555594f9a 100644
--- a/translations/desktop_files/twin-desktops/ko.po
+++ b/translations/desktop_files/twin-desktops/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "고급 창 관리� 기능 설정하기"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "고급"
diff --git a/translations/desktop_files/twin-desktops/lo.po b/translations/desktop_files/twin-desktops/lo.po
index 3e7982cfc..613ae1fa6 100644
--- a/translations/desktop_files/twin-desktops/lo.po
+++ b/translations/desktop_files/twin-desktops/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ທ່ານສາມາດປັບ�ຕ່ງ�ານທຳງານຂອງເຄື່ອງມືຈັດ�ານເຊສຊົນໄດ້ທີ່ນີ້"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "ັ�ຣັ່ງ"
diff --git a/translations/desktop_files/twin-desktops/lt.po b/translations/desktop_files/twin-desktops/lt.po
index 79c9f2e10..cabb3c95c 100644
--- a/translations/desktop_files/twin-desktops/lt.po
+++ b/translations/desktop_files/twin-desktops/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -67,6 +67,25 @@ msgstr ""
 "pakeisti dydį;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Konfigūruoti sudėtingesnes langų tvarkymo savybes"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "SudÄ—tingiau"
diff --git a/translations/desktop_files/twin-desktops/lv.po b/translations/desktop_files/twin-desktops/lv.po
index 981d98c39..c612c2e89 100644
--- a/translations/desktop_files/twin-desktops/lv.po
+++ b/translations/desktop_files/twin-desktops/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "virsraksta josla;mainīt izmēru;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Šeit Jūs varat konfigurēt logu p�rvaldīšanas iespējas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Paplašin�ts"
diff --git a/translations/desktop_files/twin-desktops/mk.po b/translations/desktop_files/twin-desktops/mk.po
index f2a506355..09d533c77 100644
--- a/translations/desktop_files/twin-desktops/mk.po
+++ b/translations/desktop_files/twin-desktops/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -66,6 +66,25 @@ msgstr ""
 "resize;за�ени;рашири;�пушти;мени �о операции;на�ловна лента;промени големина;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Конфигурирајте ги напредните можно�ти за менаџмент на прозорците"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "�апредни"
diff --git a/translations/desktop_files/twin-desktops/mn.po b/translations/desktop_files/twin-desktops/mn.po
index 93ed8823f..02cf96512 100644
--- a/translations/desktop_files/twin-desktops/mn.po
+++ b/translations/desktop_files/twin-desktops/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "өөрчилөх; Үйлд�л ц��;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Өргөтгө�өн цонхны удирдлага тохируулах"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Өргөтгө�өн"
diff --git a/translations/desktop_files/twin-desktops/ms.po b/translations/desktop_files/twin-desktops/ms.po
index a016405fd..31e52664b 100644
--- a/translations/desktop_files/twin-desktops/ms.po
+++ b/translations/desktop_files/twin-desktops/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Lanjutan"
diff --git a/translations/desktop_files/twin-desktops/mt.po b/translations/desktop_files/twin-desktops/mt.po
index d63411c23..dfae87bef 100644
--- a/translations/desktop_files/twin-desktops/mt.po
+++ b/translations/desktop_files/twin-desktops/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "resize;massimizza;minimma;baxxi;Ä‹ekken;kabbar;daqqas;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Setings avvanzati tal-immaniġġjar tal-windows"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avvanzat"
diff --git a/translations/desktop_files/twin-desktops/nb.po b/translations/desktop_files/twin-desktops/nb.po
index e18ba634c..e5cfecd1d 100644
--- a/translations/desktop_files/twin-desktops/nb.po
+++ b/translations/desktop_files/twin-desktops/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "vindu; tittellinje;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Tilpass avansert vindusbehandling"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avansert"
diff --git a/translations/desktop_files/twin-desktops/nds.po b/translations/desktop_files/twin-desktops/nds.po
index 0bdefc857..1e17c47e3 100644
--- a/translations/desktop_files/twin-desktops/nds.po
+++ b/translations/desktop_files/twin-desktops/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -64,6 +64,25 @@ msgstr ""
 "inrullen;maximeren;minimeren;utrullen;Akschonenmenü;Titelbalken;Grött ännern;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Verwiederte Finsterinstellen"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Verwiedert"
diff --git a/translations/desktop_files/twin-desktops/ne.po b/translations/desktop_files/twin-desktops/ne.po
index a7b71634b..47d0e5767 100644
--- a/translations/desktop_files/twin-desktops/ne.po
+++ b/translations/desktop_files/twin-desktops/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -64,6 +64,25 @@ msgstr ""
 "छाया�; बढाउन�; बढाउन�; घटाउन�; घटाउन�;भन�दा तल; सञ�चालन मेन�; शीर�षकपट�टी; रिसाइज;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "उन�नत सञ���याल व�यवस�थापन आकृति कन�फिगर गर�न�होस�"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "उन�नत"
diff --git a/translations/desktop_files/twin-desktops/nl.po b/translations/desktop_files/twin-desktops/nl.po
index be313c057..db608b9e1 100644
--- a/translations/desktop_files/twin-desktops/nl.po
+++ b/translations/desktop_files/twin-desktops/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -66,6 +66,25 @@ msgstr ""
 "tibelbalk;grootte wijzigen;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. 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"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Geavanceerd"
diff --git a/translations/desktop_files/twin-desktops/nn.po b/translations/desktop_files/twin-desktops/nn.po
index 125c5fde7..153f6f61a 100644
--- a/translations/desktop_files/twin-desktops/nn.po
+++ b/translations/desktop_files/twin-desktops/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "vindauge;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Set opp avanserte vindaugshandsamarfunksjonar"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avansert"
diff --git a/translations/desktop_files/twin-desktops/nso.po b/translations/desktop_files/twin-desktops/nso.po
index 823e2d0af..dfb851e27 100644
--- a/translations/desktop_files/twin-desktops/nso.po
+++ b/translations/desktop_files/twin-desktops/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "ya leina;popoleswa;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Beakanya dika tseo di beetswego pele tsa taolo ya window"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Beetswepele"
diff --git a/translations/desktop_files/twin-desktops/oc.po b/translations/desktop_files/twin-desktops/oc.po
index 05be5fedc..7414e2421 100644
--- a/translations/desktop_files/twin-desktops/oc.po
+++ b/translations/desktop_files/twin-desktops/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -62,6 +62,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/pa.po b/translations/desktop_files/twin-desktops/pa.po
index d2d7788c1..0a23807aa 100644
--- a/translations/desktop_files/twin-desktops/pa.po
+++ b/translations/desktop_files/twin-desktops/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "resize;ਨਿਊਨਤਮ;ਅਧਿਕਤਮ;ਕਾਰਵਾਈ ਮੇਨੂ;ਮ�ੜ-ਅਕਾਰ;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ਤਕਨੀਕੀ �ਰੋਖਾ ਪਰਬੰਧਨ ਫੀਚਰ ਸੰਰਚਨਾ"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "ਤਕਨੀਕੀ"
diff --git a/translations/desktop_files/twin-desktops/pl.po b/translations/desktop_files/twin-desktops/pl.po
index 675e9681f..f0828b01a 100644
--- a/translations/desktop_files/twin-desktops/pl.po
+++ b/translations/desktop_files/twin-desktops/pl.po
@@ -1,20 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
+# Marek W <coronzon88@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21: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"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2023-07-07 15:16+0000\n"
+"Last-Translator: Marek W <coronzon88@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-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
 #: kcmtwin/showdesktop.desktop:4
@@ -65,6 +68,23 @@ msgstr ""
 "rozmiaru;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "Aktywne krawędzie"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "Konfiguracja właściwości aktywnych krawędzi i narożników"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Zaawansowane"
@@ -170,27 +190,27 @@ msgstr ""
 #. Description
 #: data/fsp_workarounds_1.twinrules:2
 msgid "(Default) Disable focus stealing prevention for XV"
-msgstr "(Domyślne) wyłączenie przechwytywania aktywności dla XV"
+msgstr "(Domyślne) wyłącz przechwytywanie fokusu dla XV"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Domyślne) wyłączenie przechwytywania aktywności dla XV"
+msgstr ""
+"(Domyślne) Pozwól na przechwycenie fokusu przez program blokujący ekran"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
-#, fuzzy
 msgid "(Default) Allow focus stealing by the kdesktop run dialog"
-msgstr "(Domyślne) wyłączenie przechwytywania aktywności dla XV"
+msgstr ""
+"(Domyślne) Pozwól na przechwycenie fokusu przez okno uruchamiania programu"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:32
-#, fuzzy
 msgid "(Default) Allow focus stealing by the settings test dialog"
-msgstr "(Domyślne) wyłączenie przechwytywania aktywności dla XV"
+msgstr ""
+"(Domyślne) Pozwól na przychwytywanie fokusu przez okno testowe ustawień"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:45
 msgid "(Default) Hide system modal dialog class from taskbar"
-msgstr ""
+msgstr "(Domyślne) Nie pokazuj okien dialogowych na pasku zadań"
diff --git a/translations/desktop_files/twin-desktops/pt.po b/translations/desktop_files/twin-desktops/pt.po
index 4ebcc87f3..7f61b958e 100644
--- a/translations/desktop_files/twin-desktops/pt.po
+++ b/translations/desktop_files/twin-desktops/pt.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21: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"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2022-10-31 21:56+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/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.13.1\n"
 
 #. Name
 #: kcmtwin/showdesktop.desktop:4
@@ -65,6 +66,25 @@ msgstr ""
 "dimensionar;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configuração das funcionalidades de gestão de janelas avançadas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avançado"
@@ -174,9 +194,8 @@ msgstr "(Predefinido) Desactivar a prevenção de roubo do primeiro plano do XV"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Predefinido) Desactivar a prevenção de roubo do primeiro plano do XV"
+msgstr "(Predefinido) Permitir o roubo do foco pelo bloqueador de ecrã"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
diff --git a/translations/desktop_files/twin-desktops/pt_BR.po b/translations/desktop_files/twin-desktops/pt_BR.po
index 5d0c8352d..7ce641868 100644
--- a/translations/desktop_files/twin-desktops/pt_BR.po
+++ b/translations/desktop_files/twin-desktops/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-25 21:32+0200\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"
@@ -67,6 +67,25 @@ msgstr ""
 "redimensionar;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configura as características avançadas de gerenciamento de janela"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avançado"
diff --git a/translations/desktop_files/twin-desktops/ro.po b/translations/desktop_files/twin-desktops/ro.po
index 59e0413b6..b129fd758 100644
--- a/translations/desktop_files/twin-desktops/ro.po
+++ b/translations/desktop_files/twin-desktops/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "redimensionare;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Configurează caracteristicile de management al ferestrelor"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avansat"
diff --git a/translations/desktop_files/twin-desktops/ru.po b/translations/desktop_files/twin-desktops/ru.po
index 5037037fb..ec21e298c 100644
--- a/translations/desktop_files/twin-desktops/ru.po
+++ b/translations/desktop_files/twin-desktops/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "�а�тройка дополнительных функций менеджера окон"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Дополнительно"
diff --git a/translations/desktop_files/twin-desktops/rw.po b/translations/desktop_files/twin-desktops/rw.po
index d3ddc9922..9071ee197 100644
--- a/translations/desktop_files/twin-desktops/rw.po
+++ b/translations/desktop_files/twin-desktops/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "umwanyabikoresho;ihindurangero;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Kuboneza ibijyanye n'ubuyobozi buhanitse bw'idirishya "
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Bihanitse"
diff --git a/translations/desktop_files/twin-desktops/se.po b/translations/desktop_files/twin-desktops/se.po
index fe79a1bd9..e6fb12488 100644
--- a/translations/desktop_files/twin-desktops/se.po
+++ b/translations/desktop_files/twin-desktops/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "namahus;skálere;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Heivet viiddiduvvon lásegieđahanfunkšuvnnaid"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Viiddiduvvon"
diff --git a/translations/desktop_files/twin-desktops/sk.po b/translations/desktop_files/twin-desktops/sk.po
index ae721461f..bb64890cb 100644
--- a/translations/desktop_files/twin-desktops/sk.po
+++ b/translations/desktop_files/twin-desktops/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21: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"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2020-10-06 21:31+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-desktop-files/sk/>\n"
 "Language: sk\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.2.2\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 ""
-"twin;okno;správa;okraj;štýl;téma;vzhľad;rozloženie;tla�idlo;hrana;kwm;"
-"dekorácia;oblasť;"
+"twin;okno;správca;okraj;štýl;téma;vzhľad;rozloženie;tla�idlo;úchop;hrana;kwm;"
+"dekorácia;"
 
 #. Name
 #: kcmtwin/twinoptions/twinactions.desktop:11
@@ -62,7 +63,26 @@ msgid ""
 "resize;"
 msgstr ""
 "zabalenie;maximalizácia;minimalizácia;presun dozadu;presun dopredu;operácie "
-"menu;titulok;zmena veľkosti;"
+"ponuky;titulok;zmena veľkosti;"
+
+#. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Nastavenie pokro�ilých možností správy okien"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
 
 #. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
@@ -77,7 +97,7 @@ msgstr "Nastavenie pokro�ilých možností správy okien"
 #. Keywords
 #: kcmtwin/twinoptions/twinadvanced.desktop:15
 msgid "shading;border;hover;active borders;"
-msgstr "zabalenie;okraj;presun;aktívne okraje;"
+msgstr "zabalenie;okraj;prejazd myšou;aktívne okraje;"
 
 #. Name
 #: kcmtwin/twinoptions/twinfocus.desktop:11
@@ -95,8 +115,8 @@ msgid ""
 "focus;placement;auto raise;raise;click raise;keyboard;CDE;alt-tab;all "
 "desktop;"
 msgstr ""
-"fokus;umiestnenie;automatický presun;dopredu;dopredu na kliknutie;klávesnica;"
-"CDE;alt-tab;všetky plochy;"
+"fokus;umiestnenie;automatické zdvihnutie;zdvihnutie;zdvihnutie na kliknutie;"
+"klávesnica;CDE;alt-tab;všetky plochy;"
 
 #. Name
 #: kcmtwin/twinoptions/twinmoving.desktop:11
@@ -132,7 +152,7 @@ msgid ""
 "titlebar;doubleclick;"
 msgstr ""
 "fokus;umiestnenie;správanie okien;animácia;zdvihnutie;automatické zdvihnutie;"
-"titulok;dvojité kliknutie;rámec;okná;"
+"okná;rám;titulok;dvojité kliknutie;"
 
 #. Name
 #: kcmtwin/twinoptions/twintranslucency.desktop:11
@@ -147,7 +167,7 @@ msgstr "Nastavenie priesvitnosti okien a správcu tieňovania"
 #. Keywords
 #: kcmtwin/twinoptions/twintranslucency.desktop:15
 msgid "translucency;transparence;shadows;"
-msgstr ""
+msgstr "priesvitnosť;priehľadnosť;tiene;"
 
 #. Name
 #: kcmtwin/twinrules/twinrules.desktop:11
@@ -165,33 +185,32 @@ msgid ""
 "size;position;state;window behavior;windows;specific;workarounds;remember;"
 "rules;"
 msgstr ""
-"veľkosť;pozícia;stav;správanie okna;okná;špecifické;jedno okno;opravy;"
+"veľkosť;umiestnenie;stav;správanie okna;okná;špecifické;riešenia;zapamätať;"
 "pravidlá;"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:2
 msgid "(Default) Disable focus stealing prevention for XV"
-msgstr "(Štandard) Znemožniť kradnutie aktivity okna XV"
+msgstr "(Predvolené) Znemožniť kradnutie aktivity okna XV"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:10
-#, fuzzy
 msgid "(Default) Allow focus stealing by the screen locker"
-msgstr "(Štandard) Znemožniť kradnutie aktivity okna XV"
+msgstr "(Predvolené) Povoliť kradnutie aktivity okna zamknutím obrazovky"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:21
-#, fuzzy
 msgid "(Default) Allow focus stealing by the kdesktop run dialog"
-msgstr "(Štandard) Znemožniť kradnutie aktivity okna XV"
+msgstr ""
+"(Predvolené) Povoliť kradnutie aktivity okna dialógovým oknom Spustiť príkaz"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:32
-#, fuzzy
 msgid "(Default) Allow focus stealing by the settings test dialog"
-msgstr "(Štandard) Znemožniť kradnutie aktivity okna XV"
+msgstr ""
+"(Predvolené) Povoliť kradnutie aktivity okna dialógovým pre test nastavenia"
 
 #. Description
 #: data/fsp_workarounds_1.twinrules:45
 msgid "(Default) Hide system modal dialog class from taskbar"
-msgstr ""
+msgstr "(Predvolené) Schovať modálne dialógové okná z hlavného panelu"
diff --git a/translations/desktop_files/twin-desktops/sl.po b/translations/desktop_files/twin-desktops/sl.po
index f9ae6456e..0e1028f54 100644
--- a/translations/desktop_files/twin-desktops/sl.po
+++ b/translations/desktop_files/twin-desktops/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "velikost;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Nastavitve dodatnih možnosti upravljanja oken"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Napredno"
diff --git a/translations/desktop_files/twin-desktops/sr.po b/translations/desktop_files/twin-desktops/sr.po
index 1357d7399..060d8d6cf 100644
--- a/translations/desktop_files/twin-desktops/sr.po
+++ b/translations/desktop_files/twin-desktops/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -67,6 +67,25 @@ msgstr ""
 "промена величине;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Подешавање напредних могућно�ти управљања прозорима"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "�апредно"
diff --git a/translations/desktop_files/twin-desktops/sr@Latn.po b/translations/desktop_files/twin-desktops/sr@Latn.po
index 5083b062f..b10363684 100644
--- a/translations/desktop_files/twin-desktops/sr@Latn.po
+++ b/translations/desktop_files/twin-desktops/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-25 21:32+0200\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"
@@ -67,6 +67,25 @@ msgstr ""
 "promena veli�ine;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Podešavanje naprednih mogućnosti upravljanja prozorima"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Napredno"
diff --git a/translations/desktop_files/twin-desktops/ss.po b/translations/desktop_files/twin-desktops/ss.po
index 0fbf0f4ed..e151ad261 100644
--- a/translations/desktop_files/twin-desktops/ss.po
+++ b/translations/desktop_files/twin-desktops/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Sembili"
diff --git a/translations/desktop_files/twin-desktops/sv.po b/translations/desktop_files/twin-desktops/sv.po
index b88c892b9..8cc3b4b2d 100644
--- a/translations/desktop_files/twin-desktops/sv.po
+++ b/translations/desktop_files/twin-desktops/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "rulla upp;maximera;minimera;sänk;åtgärdsmeny;namnlist;ändra storlek;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Anpassa avancerade fönsterhanteringsfunktioner"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Avancerat"
diff --git a/translations/desktop_files/twin-desktops/ta.po b/translations/desktop_files/twin-desktops/ta.po
index 32b204125..b0b04894a 100644
--- a/translations/desktop_files/twin-desktops/ta.po
+++ b/translations/desktop_files/twin-desktops/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "பட�டி; அளவை மாற�ற�;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "மேம�பட�ட சாளர மேலாளரின� தன�மைகளை வடிவமை"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "உயர�நிலை "
diff --git a/translations/desktop_files/twin-desktops/te.po b/translations/desktop_files/twin-desktops/te.po
index 02a5b3e78..7a5d12a25 100644
--- a/translations/desktop_files/twin-desktops/te.po
+++ b/translations/desktop_files/twin-desktops/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "ఆధ�నిక"
diff --git a/translations/desktop_files/twin-desktops/tg.po b/translations/desktop_files/twin-desktops/tg.po
index a81532bc6..97c040007 100644
--- a/translations/desktop_files/twin-desktops/tg.po
+++ b/translations/desktop_files/twin-desktops/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Танзими мудири�ти пешрафтаи тирезаҳо"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Пешрафта"
diff --git a/translations/desktop_files/twin-desktops/th.po b/translations/desktop_files/twin-desktops/th.po
index 8ae31948a..e6cefc203 100644
--- a/translations/desktop_files/twin-desktops/th.po
+++ b/translations/desktop_files/twin-desktops/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "พับเ�็บ;ขยายเต็มจอ;ย่อเล็�สุด;อยู่ด้านล่าง;เมนูป�ิบัติ�าร;�ถบหัวเรื่อง;ปรับขนาด;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "ปรับ�ต่งคุณสมบัติเพิ่มเติมของ�ารจัด�ารหน้าต่าง"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "เพิ่มเติม"
diff --git a/translations/desktop_files/twin-desktops/tr.po b/translations/desktop_files/twin-desktops/tr.po
index 9cb480a2a..cecaf1b58 100644
--- a/translations/desktop_files/twin-desktops/tr.po
+++ b/translations/desktop_files/twin-desktops/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -63,6 +63,25 @@ msgid ""
 msgstr "topla;küçült;büyüt;indir;işlemler;araç çubuğu;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Gelişmiş pencere yönetim özelliklerini yapılandır"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "GeliÅŸmiÅŸ"
diff --git a/translations/desktop_files/twin-desktops/tt.po b/translations/desktop_files/twin-desktops/tt.po
index 60cd715bf..57d502cde 100644
--- a/translations/desktop_files/twin-desktops/tt.po
+++ b/translations/desktop_files/twin-desktops/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -63,6 +63,25 @@ msgstr ""
 "resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Täräzä idäräçeneñ östämä çaraların caylaw"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Kiñäytep"
diff --git a/translations/desktop_files/twin-desktops/twin-desktops.pot b/translations/desktop_files/twin-desktops/twin-desktops.pot
index 15badbe91..54653d622 100644
--- a/translations/desktop_files/twin-desktops/twin-desktops.pot
+++ b/translations/desktop_files/twin-desktops/twin-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,23 @@ msgid ""
 msgstr ""
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr ""
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr ""
diff --git a/translations/desktop_files/twin-desktops/uk.po b/translations/desktop_files/twin-desktops/uk.po
index e1473f38d..cc44f1f23 100644
--- a/translations/desktop_files/twin-desktops/uk.po
+++ b/translations/desktop_files/twin-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, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\n"
-"PO-Revision-Date: 2020-07-21 05:23+0000\n"
+"POT-Creation-Date: 2023-07-04 18:14+0000\n"
+"PO-Revision-Date: 2023-09-13 06:31+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/twin-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
 #: kcmtwin/showdesktop.desktop:4
@@ -67,6 +67,25 @@ msgstr ""
 "зміна розміру;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr "�ктивні Межі"
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+msgid "Configure active borders/corners feature"
+msgstr "�алаштувати вла�тиво�ті активних меж/кутів"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+"поведінка вікна;вікна;рамка;�мужка заголовку;межі;кути;активні межі;"
+"повітр�ний клік;"
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Додатково"
diff --git a/translations/desktop_files/twin-desktops/uz.po b/translations/desktop_files/twin-desktops/uz.po
index 3c507067d..e862471ff 100644
--- a/translations/desktop_files/twin-desktops/uz.po
+++ b/translations/desktop_files/twin-desktops/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr "soyalash;yoyish;yigʻish;orqaga;amallar menyusi;sarlavha;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Oyna boshqaruvning koʻshimcha imkoniyatlarini moslash"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Qoʻshimcha"
diff --git a/translations/desktop_files/twin-desktops/uz@cyrillic.po b/translations/desktop_files/twin-desktops/uz@cyrillic.po
index aa41c4a60..10055d6a1 100644
--- a/translations/desktop_files/twin-desktops/uz@cyrillic.po
+++ b/translations/desktop_files/twin-desktops/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-25 21:32+0200\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"
@@ -61,6 +61,25 @@ msgid ""
 msgstr "�о�лаш;ёйиш;йиғиш;орқага;амаллар меню�и;�арлавҳа;resize;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Ойна бошқарувнинг кўшимча имкони�тларини мо�лаш"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Қўшимча"
diff --git a/translations/desktop_files/twin-desktops/ven.po b/translations/desktop_files/twin-desktops/ven.po
index 79bf1afff..08102cf7f 100644
--- a/translations/desktop_files/twin-desktops/ven.po
+++ b/translations/desktop_files/twin-desktops/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -66,6 +66,25 @@ msgstr ""
 "ya thoho;uitulula saizi;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Dzudzanyani zwitenwa zwa vhulanguli ha khwinesa"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Zwa khwinesa"
diff --git a/translations/desktop_files/twin-desktops/vi.po b/translations/desktop_files/twin-desktops/vi.po
index ffce7f172..91d76445e 100644
--- a/translations/desktop_files/twin-desktops/vi.po
+++ b/translations/desktop_files/twin-desktops/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "tên thanh;thay đổi cỡ;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Cấu hình các tính năng quản lý cửa sổ nâng cao"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Nâng cao"
diff --git a/translations/desktop_files/twin-desktops/wa.po b/translations/desktop_files/twin-desktops/wa.po
index e45835657..e5193b5f7 100644
--- a/translations/desktop_files/twin-desktops/wa.po
+++ b/translations/desktop_files/twin-desktops/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "candjî li grandeu;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Apontiaedje des spepieusès fonccionålités do manaedjaedje des purneas"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Sipepieus"
diff --git a/translations/desktop_files/twin-desktops/xh.po b/translations/desktop_files/twin-desktops/xh.po
index 30b6486de..ab850aa68 100644
--- a/translations/desktop_files/twin-desktops/xh.po
+++ b/translations/desktop_files/twin-desktops/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "yewonga;yenza ubungakanani kwakhona;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Qwalasela imisebenzi esemqoka ebhekisa phambili yophatho lwe window"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Ebhekisa phambili"
diff --git a/translations/desktop_files/twin-desktops/zh_CN.po b/translations/desktop_files/twin-desktops/zh_CN.po
index c81caaa8c..239ae1ccd 100644
--- a/translations/desktop_files/twin-desktops/zh_CN.po
+++ b/translations/desktop_files/twin-desktops/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-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "resize;�起;最大化;最�化;�低;�作��;标题�;缩放;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "�置高级窗�管�特性"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "高级"
diff --git a/translations/desktop_files/twin-desktops/zh_TW.po b/translations/desktop_files/twin-desktops/zh_TW.po
index a00f36ad1..ebf2a177c 100644
--- a/translations/desktop_files/twin-desktops/zh_TW.po
+++ b/translations/desktop_files/twin-desktops/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-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "resize;收起;最大化;最�化;�下;�作�單;標題列;�設大�;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "設定進階視窗管�功能"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "進階"
diff --git a/translations/desktop_files/twin-desktops/zu.po b/translations/desktop_files/twin-desktops/zu.po
index ce8e9aff2..1cc7a8b43 100644
--- a/translations/desktop_files/twin-desktops/zu.po
+++ b/translations/desktop_files/twin-desktops/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 21:32+0200\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"
@@ -65,6 +65,25 @@ msgstr ""
 "ibha yesihloko;shintsha usayizi;"
 
 #. Name
+#: kcmtwin/twinoptions/twinactiveborders.desktop:11
+msgid "Active Borders"
+msgstr ""
+
+#. Comment
+#: kcmtwin/twinoptions/twinactiveborders.desktop:13
+#, fuzzy
+#| msgid "Configure advanced window management features"
+msgid "Configure active borders/corners feature"
+msgstr "Hlanganisela amalungu okuphathwa kwe-window yezinga eliphezulu"
+
+#. Keywords
+#: kcmtwin/twinoptions/twinactiveborders.desktop:15
+msgid ""
+"window behavior;windows;frame;titlebar;borders;corners;active borders;"
+"aerosnap;"
+msgstr ""
+
+#. Name
 #: kcmtwin/twinoptions/twinadvanced.desktop:11
 msgid "Advanced"
 msgstr "Okwezinga eliphezulu"
diff --git a/translations/desktop_files/twin-eventsrc/it.po b/translations/desktop_files/twin-eventsrc/it.po
index 6c03bdade..1e48fa9ca 100644
--- a/translations/desktop_files/twin-eventsrc/it.po
+++ b/translations/desktop_files/twin-eventsrc/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2022.
 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: 2022-03-16 06:11+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-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.11.2\n"
 
 #. Comment
 #: eventsrc:3
@@ -29,7 +30,7 @@ msgstr "Va al desktop 1"
 #. Comment
 #: eventsrc:7
 msgid "Virtual desktop one is selected"
-msgstr "Il desktop virtuale uno viene selezionato."
+msgstr "Il desktop virtuale uno viene selezionato"
 
 #. Name
 #: eventsrc:12
@@ -39,7 +40,7 @@ msgstr "Va al desktop 2"
 #. Comment
 #: eventsrc:13
 msgid "Virtual desktop two is selected"
-msgstr "Il desktop virtuale due viene selezionato."
+msgstr "Il desktop virtuale due viene selezionato"
 
 #. Name
 #: eventsrc:18
@@ -49,7 +50,7 @@ msgstr "Va al desktop 3"
 #. Comment
 #: eventsrc:19
 msgid "Virtual desktop three is selected"
-msgstr "Il desktop virtuale tre viene selezionato."
+msgstr "Il desktop virtuale tre viene selezionato"
 
 #. Name
 #: eventsrc:24
@@ -59,7 +60,7 @@ msgstr "Va al desktop 4"
 #. Comment
 #: eventsrc:25
 msgid "Virtual desktop four is selected"
-msgstr "Il desktop virtuale quattro viene selezionato."
+msgstr "Il desktop virtuale quattro viene selezionato"
 
 #. Name
 #: eventsrc:30
@@ -69,7 +70,7 @@ msgstr "Va al desktop 5"
 #. Comment
 #: eventsrc:31
 msgid "Virtual desktop five is selected"
-msgstr "Il desktop virtuale cinque viene selezionato."
+msgstr "Il desktop virtuale cinque viene selezionato"
 
 #. Name
 #: eventsrc:36
@@ -79,7 +80,7 @@ msgstr "Va al desktop 6"
 #. Comment
 #: eventsrc:37
 msgid "Virtual desktop six is selected"
-msgstr "Il desktop virtuale sei viene selezionato."
+msgstr "Il desktop virtuale sei viene selezionato"
 
 #. Name
 #: eventsrc:42
@@ -89,7 +90,7 @@ msgstr "Va al desktop 7"
 #. Comment
 #: eventsrc:43
 msgid "Virtual desktop seven is selected"
-msgstr "Il desktop virtuale sette viene selezionato."
+msgstr "Il desktop virtuale sette viene selezionato"
 
 #. Name
 #: eventsrc:48
@@ -99,7 +100,7 @@ msgstr "Va al desktop 8"
 #. Comment
 #: eventsrc:49
 msgid "Virtual desktop eight is selected"
-msgstr "Il desktop virtuale otto viene selezionato."
+msgstr "Il desktop virtuale otto viene selezionato"
 
 #. Name
 #: eventsrc:54
@@ -109,7 +110,7 @@ msgstr "Va al desktop 9"
 #. Comment
 #: eventsrc:55
 msgid "Virtual desktop nine is selected"
-msgstr "Il desktop virtuale nove viene selezionato."
+msgstr "Il desktop virtuale nove viene selezionato"
 
 #. Name
 #: eventsrc:59
@@ -119,7 +120,7 @@ msgstr "Va al desktop 10"
 #. Comment
 #: eventsrc:60
 msgid "Virtual desktop ten is selected"
-msgstr "Il desktop virtuale dieci viene selezionato."
+msgstr "Il desktop virtuale dieci viene selezionato"
 
 #. Name
 #: eventsrc:64
@@ -129,7 +130,7 @@ msgstr "Va al desktop 11"
 #. Comment
 #: eventsrc:65
 msgid "Virtual desktop eleven is selected"
-msgstr "Il desktop virtuale undici viene selezionato."
+msgstr "Il desktop virtuale undici viene selezionato"
 
 #. Name
 #: eventsrc:69
@@ -139,7 +140,7 @@ msgstr "Va al desktop 12"
 #. Comment
 #: eventsrc:70
 msgid "Virtual desktop twelve is selected"
-msgstr "Il desktop virtuale dodici viene selezionato."
+msgstr "Il desktop virtuale dodici viene selezionato"
 
 #. Name
 #: eventsrc:74
@@ -149,7 +150,7 @@ msgstr "Va al desktop 13"
 #. Comment
 #: eventsrc:75
 msgid "Virtual desktop thirteen is selected"
-msgstr "Il desktop virtuale tredici viene selezionato."
+msgstr "Il desktop virtuale tredici viene selezionato"
 
 #. Name
 #: eventsrc:79
@@ -159,7 +160,7 @@ msgstr "Va al desktop 14"
 #. Comment
 #: eventsrc:80
 msgid "Virtual desktop fourteen is selected"
-msgstr "Il desktop virtuale quattordici viene selezionato."
+msgstr "Il desktop virtuale quattordici viene selezionato"
 
 #. Name
 #: eventsrc:84
@@ -169,7 +170,7 @@ msgstr "Va al desktop 15"
 #. Comment
 #: eventsrc:85
 msgid "Virtual desktop fifteen is selected"
-msgstr "Il desktop virtuale quindici viene selezionato."
+msgstr "Il desktop virtuale quindici viene selezionato"
 
 #. Name
 #: eventsrc:89
@@ -179,7 +180,7 @@ msgstr "Va al desktop 16"
 #. Comment
 #: eventsrc:90
 msgid "Virtual desktop sixteen is selected"
-msgstr "Il desktop virtuale sedici viene selezionato."
+msgstr "Il desktop virtuale sedici viene selezionato"
 
 #. Name
 #: eventsrc:94
@@ -189,7 +190,7 @@ msgstr "Va al desktop 17"
 #. Comment
 #: eventsrc:95
 msgid "Virtual desktop seventeen is selected"
-msgstr "Il desktop virtuale diciassette viene selezionato."
+msgstr "Il desktop virtuale diciassette viene selezionato"
 
 #. Name
 #: eventsrc:99
@@ -199,7 +200,7 @@ msgstr "Va al desktop 18"
 #. Comment
 #: eventsrc:100
 msgid "Virtual desktop eighteen is selected"
-msgstr "Il desktop virtuale diciotto viene selezionato."
+msgstr "Il desktop virtuale diciotto viene selezionato"
 
 #. Name
 #: eventsrc:104
@@ -209,7 +210,7 @@ msgstr "Va al desktop 19"
 #. Comment
 #: eventsrc:105
 msgid "Virtual desktop nineteen is selected"
-msgstr "Il desktop virtuale diciannove viene selezionato."
+msgstr "Il desktop virtuale diciannove viene selezionato"
 
 #. Name
 #: eventsrc:109
@@ -219,7 +220,7 @@ msgstr "Va al desktop 20"
 #. Comment
 #: eventsrc:110
 msgid "Virtual desktop twenty is selected"
-msgstr "Il desktop virtuale venti viene selezionato."
+msgstr "Il desktop virtuale venti viene selezionato"
 
 #. Name
 #: eventsrc:114
diff --git a/translations/desktop_files/twin-eventsrc/sk.po b/translations/desktop_files/twin-eventsrc/sk.po
index b59efb2c9..126ea41a9 100644
--- a/translations/desktop_files/twin-eventsrc/sk.po
+++ b/translations/desktop_files/twin-eventsrc/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 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: 2020-10-06 21:31+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/twin-events/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Comment
 #: eventsrc:3
@@ -264,22 +265,22 @@ msgstr "Okno sa uzavrie"
 #. Name
 #: eventsrc:135
 msgid "Window Shade Up"
-msgstr "Zobraziť okno"
+msgstr "Rozbaliť okno"
 
 #. Comment
 #: eventsrc:136
 msgid "A window is shaded up"
-msgstr "Okno je zabalené"
+msgstr "Okno je rozbalené"
 
 #. Name
 #: eventsrc:141
 msgid "Window Shade Down"
-msgstr "Schovať okno"
+msgstr "Zbaliť okno"
 
 #. Comment
 #: eventsrc:142
 msgid "A window is shaded down"
-msgstr "Okno je rozbalené"
+msgstr "Okno je zabalené"
 
 #. Name
 #: eventsrc:147
@@ -314,7 +315,7 @@ msgstr "Okno je maximalizované"
 #. Name
 #: eventsrc:165
 msgid "Window Unmaximize"
-msgstr "Zmenšiť okno"
+msgstr "Zrušiť maximalizáciu okna"
 
 #. Comment
 #: eventsrc:166
@@ -404,19 +405,19 @@ msgstr "Zmena veľkosti okna je ukon�ená"
 #. Name
 #: eventsrc:215
 msgid "Window On Current Desktop Demands Attention"
-msgstr "Okno na aktuálnu pracovnú plochu"
+msgstr "Okno na aktuálnej ploche vyžaduje pozornosť"
 
 #. Comment
 #: eventsrc:216
 msgid "A window on the current virtual desktop demands attention"
-msgstr "Okno na aktuálnu pracovnú plochu"
+msgstr "Okno na aktuálnej ploche vyžaduje Vašu pozornosť"
 
 #. Name
 #: eventsrc:220
 msgid "Window On Other Desktop Demands Attention"
-msgstr "Okno na inú pracovnú plochu"
+msgstr "Okno na inej ploche vyžaduje Vašu pozornosť"
 
 #. Comment
 #: eventsrc:221
 msgid "A window on an inactive virtual desktop demands attention"
-msgstr "Okno na neaktívnu virtuálnu pracovnú plochu"
+msgstr "Okno na neaktívnej ploche vyžaduje Vašu pozornosť"
diff --git a/translations/desktop_files/wallpapers-desktops/cs.po b/translations/desktop_files/wallpapers-desktops/cs.po
index 35f481636..386a3682a 100644
--- a/translations/desktop_files/wallpapers-desktops/cs.po
+++ b/translations/desktop_files/wallpapers-desktops/cs.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Slávek Banko <slavek.banko@axis.cz>, 2021.
 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: 2021-09-07 01:16+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdebase/wallpapers-desktop-files/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.8\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -49,7 +50,7 @@ msgstr "Výchozí pro Trinity"
 #. Name
 #: Trinity4.png.desktop:3
 msgid "Trinity Default (old)"
-msgstr "Výchozí pro Trinity (old)"
+msgstr "Výchozí pro Trinity (staré)"
 
 #. Name
 #: Won-Ton-Soup-3.jpg.desktop:3
@@ -59,17 +60,17 @@ msgstr "Písmenková polívka"
 #. Name
 #: aghi.jpg.desktop:3
 msgid "Aghi"
-msgstr "Aghi"
+msgstr "Jehli�í"
 
 #. Name
 #: airplane.jpg.desktop:3
 msgid "Airplane"
-msgstr "Airplane"
+msgstr "Letadlo"
 
 #. Name
 #: alta-badia.jpg.desktop:3
 msgid "Alta Badia"
-msgstr ""
+msgstr "Alta Badia"
 
 #. Name
 #: andes-venezolanos.svgz.desktop:3
@@ -79,7 +80,7 @@ msgstr "Venezuelské Andy"
 #. Name
 #: another-view.jpg.desktop:3
 msgid "Another View"
-msgstr "Another View"
+msgstr "Další pohled"
 
 #. Name
 #: aurora.svgz.desktop:3
@@ -119,28 +120,27 @@ msgstr "Ozubený glóbus"
 #. Name
 #: green_curtain.jpg.desktop:3
 msgid "Green Curtain"
-msgstr ""
+msgstr "Zelený závěs"
 
 #. Name
 #: here-gear.svgz.desktop:3
-#, fuzzy
 msgid "We Are Gear"
-msgstr "Tři soukolí"
+msgstr "Jsme vybavení"
 
 #. Name
 #: horse-head-nebula.png.desktop:3
 msgid "Horse Head Nebula"
-msgstr ""
+msgstr "Mlhovina Koňská hlava"
 
 #. Name
 #: isadora.png.desktop:3
 msgid "Isadora"
-msgstr ""
+msgstr "Isadora"
 
 #. Name
 #: konqui.svgz.desktop:3
 msgid "Konqui"
-msgstr ""
+msgstr "Drá�ek Konqui"
 
 #. Name
 #: lineart.svgz.desktop:3
@@ -170,12 +170,12 @@ msgstr "Měkce zelená"
 #. Name
 #: stelvio.jpg.desktop:3
 msgid "Stelvio"
-msgstr ""
+msgstr "Průsmyk Stelvio"
 
 #. Name
 #: stripes.jpg.desktop:3
 msgid "Stripes"
-msgstr ""
+msgstr "Pruhy"
 
 #. Name
 #: sunshine-after-the-rain.jpg.desktop:3
@@ -190,4 +190,4 @@ msgstr "Tři soukolí"
 #. Name
 #: world-desktop.jpg.desktop:3
 msgid "World Desktop"
-msgstr ""
+msgstr "Plocha světa"
diff --git a/translations/desktop_files/wallpapers-desktops/it.po b/translations/desktop_files/wallpapers-desktops/it.po
index d6910da4d..9fb600516 100644
--- a/translations/desktop_files/wallpapers-desktops/it.po
+++ b/translations/desktop_files/wallpapers-desktops/it.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Fiflagar Lorizen <fiflagar.lorizen@posteo.net>, 2021.
 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: 2021-04-18 18:00+0000\n"
+"Last-Translator: Fiflagar Lorizen <fiflagar.lorizen@posteo.net>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/wallpapers-desktop-files/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.5.3\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -54,7 +55,7 @@ msgstr "Predefinito di Trinity (precedente)"
 #. Name
 #: Won-Ton-Soup-3.jpg.desktop:3
 msgid "Won Ton Soup"
-msgstr ""
+msgstr "Zuppa Won Ton"
 
 #. Name
 #: aghi.jpg.desktop:3
@@ -69,7 +70,7 @@ msgstr "Aereoplano"
 #. Name
 #: alta-badia.jpg.desktop:3
 msgid "Alta Badia"
-msgstr ""
+msgstr "Alta Badia"
 
 #. Name
 #: andes-venezolanos.svgz.desktop:3
@@ -84,7 +85,7 @@ msgstr "Un'altra vista"
 #. Name
 #: aurora.svgz.desktop:3
 msgid "Aurora"
-msgstr ""
+msgstr "Aurora"
 
 #. Name
 #: blue-bend.jpg.desktop:3
@@ -119,7 +120,7 @@ msgstr "Mondo a rotelle"
 #. Name
 #: green_curtain.jpg.desktop:3
 msgid "Green Curtain"
-msgstr ""
+msgstr "Tenda Verde"
 
 #. Name
 #: here-gear.svgz.desktop:3
@@ -129,17 +130,17 @@ msgstr "Siamo rotelle"
 #. Name
 #: horse-head-nebula.png.desktop:3
 msgid "Horse Head Nebula"
-msgstr ""
+msgstr "Nebulosa Testa di Cavallo"
 
 #. 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
@@ -169,12 +170,12 @@ msgstr "Verde morbido"
 #. Name
 #: stelvio.jpg.desktop:3
 msgid "Stelvio"
-msgstr ""
+msgstr "Stelvio"
 
 #. Name
 #: stripes.jpg.desktop:3
 msgid "Stripes"
-msgstr ""
+msgstr "Striscie"
 
 #. Name
 #: sunshine-after-the-rain.jpg.desktop:3
@@ -189,4 +190,4 @@ msgstr "Triple ruote"
 #. Name
 #: world-desktop.jpg.desktop:3
 msgid "World Desktop"
-msgstr ""
+msgstr "Desktop Mondiale"
diff --git a/translations/desktop_files/wallpapers-desktops/pl.po b/translations/desktop_files/wallpapers-desktops/pl.po
index dcbfaf331..6d0b04baa 100644
--- a/translations/desktop_files/wallpapers-desktops/pl.po
+++ b/translations/desktop_files/wallpapers-desktops/pl.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Jan Stolarek <jwstolarek@gmail.com>, 2020.
 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: 2020-08-12 23:04+0000\n"
+"Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
+"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/wallpapers-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.1.1\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -59,32 +61,32 @@ msgstr "Zupa Won Ton"
 #. Name
 #: aghi.jpg.desktop:3
 msgid "Aghi"
-msgstr "Aghi"
+msgstr "Igły"
 
 #. Name
 #: airplane.jpg.desktop:3
 msgid "Airplane"
-msgstr "Airplane"
+msgstr "Samolot"
 
 #. Name
 #: alta-badia.jpg.desktop:3
 msgid "Alta Badia"
-msgstr ""
+msgstr "Górska chata"
 
 #. Name
 #: andes-venezolanos.svgz.desktop:3
 msgid "Andes Venezolanos"
-msgstr ""
+msgstr "Błękitne koło zębate"
 
 #. Name
 #: another-view.jpg.desktop:3
 msgid "Another View"
-msgstr "Another View"
+msgstr "Kolejny krajobraz"
 
 #. Name
 #: aurora.svgz.desktop:3
 msgid "Aurora"
-msgstr ""
+msgstr "Zorza"
 
 #. Name
 #: blue-bend.jpg.desktop:3
@@ -119,7 +121,7 @@ msgstr "Kula ziemska z kołem"
 #. Name
 #: green_curtain.jpg.desktop:3
 msgid "Green Curtain"
-msgstr ""
+msgstr "Zielona kurtyna"
 
 #. Name
 #: here-gear.svgz.desktop:3
@@ -129,17 +131,17 @@ msgstr "To my"
 #. Name
 #: horse-head-nebula.png.desktop:3
 msgid "Horse Head Nebula"
-msgstr ""
+msgstr "Mgławica Koński �eb"
 
 #. Name
 #: isadora.png.desktop:3
 msgid "Isadora"
-msgstr ""
+msgstr "Rozbłysk na błękitnym tle"
 
 #. Name
 #: konqui.svgz.desktop:3
 msgid "Konqui"
-msgstr ""
+msgstr "Smok Konqui"
 
 #. Name
 #: lineart.svgz.desktop:3
@@ -169,12 +171,12 @@ msgstr "Miękka zieleń"
 #. Name
 #: stelvio.jpg.desktop:3
 msgid "Stelvio"
-msgstr ""
+msgstr "Wieża w jeziorze"
 
 #. Name
 #: stripes.jpg.desktop:3
 msgid "Stripes"
-msgstr ""
+msgstr "Paski"
 
 #. Name
 #: sunshine-after-the-rain.jpg.desktop:3
@@ -189,4 +191,4 @@ msgstr "Potrójne koła zębate"
 #. Name
 #: world-desktop.jpg.desktop:3
 msgid "World Desktop"
-msgstr ""
+msgstr "Mapa świata"
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/sk.po b/translations/desktop_files/wallpapers-desktops/sk.po
index b4d879e9c..4996e130d 100644
--- a/translations/desktop_files/wallpapers-desktops/sk.po
+++ b/translations/desktop_files/wallpapers-desktops/sk.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 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: 2020-10-06 21:31+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdebase/wallpapers-desktop-files/sk/>\n"
 "Language: sk\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.2.2\n"
 
 #. Name
 #: All-Good-People-1.jpg.desktop:3
@@ -24,7 +25,7 @@ msgstr "Všetci dobrí ľudia"
 #. Name
 #: Chicken-Songs-2.jpg.desktop:3
 msgid "Chicken Songs"
-msgstr "Kuracia pieseň"
+msgstr "Slepa�ie piesne"
 
 #. Name
 #: No-Ones-Laughing-3.jpg.desktop:3
@@ -44,12 +45,12 @@ msgstr "Úplne nový produkt"
 #. Name
 #: Trinity-lineart.svg.desktop:3
 msgid "Trinity Default"
-msgstr "Å tandard Trinity"
+msgstr "Trinity (predvolené)"
 
 #. Name
 #: Trinity4.png.desktop:3
 msgid "Trinity Default (old)"
-msgstr "Å tandard Trinity (old)"
+msgstr "Štandard Trinity (staré)"
 
 #. Name
 #: Won-Ton-Soup-3.jpg.desktop:3
@@ -59,12 +60,12 @@ msgstr "Polievka Won Ton"
 #. Name
 #: aghi.jpg.desktop:3
 msgid "Aghi"
-msgstr "Aghi"
+msgstr ""
 
 #. Name
 #: airplane.jpg.desktop:3
 msgid "Airplane"
-msgstr "Airplane"
+msgstr "Lietadlo"
 
 #. Name
 #: alta-badia.jpg.desktop:3
@@ -79,12 +80,12 @@ msgstr "Venezuelské Andy"
 #. Name
 #: another-view.jpg.desktop:3
 msgid "Another View"
-msgstr "Another View"
+msgstr "Iný pohľad"
 
 #. Name
 #: aurora.svgz.desktop:3
 msgid "Aurora"
-msgstr ""
+msgstr "Polárna žiara"
 
 #. Name
 #: blue-bend.jpg.desktop:3
@@ -104,12 +105,12 @@ msgstr "Štandardná modrá"
 #. Name
 #: default_gears.jpg.desktop:3
 msgid "Default Gears"
-msgstr "Štandardný výstroj"
+msgstr "Štandardné súkolia"
 
 #. Name
 #: floating-leaves.jpg.desktop:3
 msgid "Floating Leaves"
-msgstr "Lietajúce listy"
+msgstr "Poletujúce listy"
 
 #. Name
 #: globe.svgz.desktop:3
@@ -119,7 +120,7 @@ msgstr "Zemeguľa"
 #. Name
 #: green_curtain.jpg.desktop:3
 msgid "Green Curtain"
-msgstr ""
+msgstr "Zelený záves"
 
 #. Name
 #: here-gear.svgz.desktop:3
@@ -129,7 +130,7 @@ msgstr "Rýchlosť"
 #. Name
 #: horse-head-nebula.png.desktop:3
 msgid "Horse Head Nebula"
-msgstr ""
+msgstr "Hmlovina Konská hlava"
 
 #. Name
 #: isadora.png.desktop:3
@@ -144,7 +145,7 @@ msgstr ""
 #. Name
 #: lineart.svgz.desktop:3
 msgid "Lineart Logo"
-msgstr "Logo Lineart"
+msgstr "Logo �iarovej grafiky"
 
 #. Name
 #: moon.svgz.desktop:3
@@ -154,7 +155,7 @@ msgstr "Mesiac"
 #. Name
 #: mountain-lake.jpg.desktop:3
 msgid "Mountain Lake"
-msgstr "Mountain Lake"
+msgstr "Horské jazero"
 
 #. Name
 #: seaofconero.jpg.desktop:3
@@ -164,7 +165,7 @@ msgstr "More v Conero"
 #. Name
 #: soft-green.jpg.desktop:3
 msgid "Soft Green"
-msgstr "Jemná zelená"
+msgstr "Jemne zelená"
 
 #. Name
 #: stelvio.jpg.desktop:3
@@ -174,7 +175,7 @@ msgstr ""
 #. Name
 #: stripes.jpg.desktop:3
 msgid "Stripes"
-msgstr ""
+msgstr "Prúžky"
 
 #. Name
 #: sunshine-after-the-rain.jpg.desktop:3
@@ -184,9 +185,9 @@ msgstr "Slne�ný svit po daždi"
 #. Name
 #: triplegears.jpg.desktop:3
 msgid "Triple Gears"
-msgstr "Trojnásobná rýchlosť"
+msgstr "Tri súkolia"
 
 #. Name
 #: world-desktop.jpg.desktop:3
 msgid "World Desktop"
-msgstr ""
+msgstr "Svet"
diff --git a/twin/CMakeL10n.txt b/twin/CMakeL10n.txt
index 11540e442..07bc99559 100644
--- a/twin/CMakeL10n.txt
+++ b/twin/CMakeL10n.txt
@@ -5,6 +5,7 @@ tde_l10n_create_template(
     EXCLUDES
         "^clients/"
         "^kcmtwin/"
+        "^lib/"
 )
 
 tde_l10n_auto_add_subdirectories( )
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/README b/twin/README
index 8d61c7163..d2fb31c75 100644
--- a/twin/README
+++ b/twin/README
@@ -163,16 +163,16 @@ WM_TRANSIENT_FOR property is manually set using the XSetTransientForHint()
 call (see tdelibs/tdeioslave/http/kcookiejar/kcookiewin.cpp). The arguments
 to XSetTransientForHint() call are the X display (i.e. qt_xdisplay()),
 the window id on which the WM_TRANSIENT_FOR property is to be set
-(i.e. use QWidget::winId()), and the window id of the mainwindow.
+(i.e. use TQWidget::winId()), and the window id of the mainwindow.
 
 
   Simple short HOWTO:
   
  To put it simply: Let's say you have a daemon application that has
-DCOP call "showDialog( QString text )", and when this is called, it shows
+DCOP call "showDialog( TQString text )", and when this is called, it shows
 a dialog with the given text. This won't work properly with focus stealing
 prevention. The DCOP call should be changed to
-"showDialog( QString text, long id )". The caller should pass something like
+"showDialog( TQString text, long id )". The caller should pass something like
 myMainWindow->winId() as the second argument. In the daemon, before
 the dialog is shown, a call to XSetTransientHint() should be added:
 
diff --git a/twin/activation.cpp b/twin/activation.cpp
index 83ff24edb..47e0f9a34 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -674,7 +674,7 @@ void Workspace::unfakeActivity( Client* c )
 void Client::updateUserTime( Time time )
     { // copied in Group::updateUserTime
     if( time == CurrentTime )
-        time = GET_QT_X_TIME();
+        time = get_tqt_x_time();
     if( time != -1U
         && ( user_time == CurrentTime
             || timestampCompare( time, user_time ) > 0 )) // time > user_time
@@ -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 );
         }
@@ -1005,7 +1005,7 @@ void Group::startupIdChanged()
 void Group::updateUserTime( Time time )
     { // copy of Client::updateUserTime
     if( time == CurrentTime )
-        time = GET_QT_X_TIME();
+        time = get_tqt_x_time();
     if( time != -1U
         && ( user_time == CurrentTime
             || timestampCompare( time, user_time ) > 0 )) // time > user_time
diff --git a/twin/bridge.cpp b/twin/bridge.cpp
index f79382457..5a9365dbe 100644
--- a/twin/bridge.cpp
+++ b/twin/bridge.cpp
@@ -147,7 +147,7 @@ TQWidget* Bridge::initialParentWidget() const
     return NULL;
     }
 
-Qt::WFlags Bridge::initialWFlags() const
+TQt::WFlags Bridge::initialWFlags() const
     {
     return 0;
     }
diff --git a/twin/bridge.h b/twin/bridge.h
index 3208b3192..b7fb51c1a 100644
--- a/twin/bridge.h
+++ b/twin/bridge.h
@@ -65,7 +65,7 @@ class Bridge : public KDecorationBridge
         virtual void setKeepBelow( bool );
         virtual int currentDesktop() const;
         virtual TQWidget* initialParentWidget() const;
-        virtual Qt::WFlags initialWFlags() const;
+        virtual TQt::WFlags initialWFlags() const;
         virtual void helperShowHide( bool show );
         virtual void grabXServer( bool grab );
     private:
diff --git a/twin/client.cpp b/twin/client.cpp
index b57cab35f..b8f00746e 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -27,6 +27,11 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tdelocale.h>
 #include <stdlib.h>
 
+#ifdef Q_OS_SOLARIS
+#include <procfs.h>
+#include <libgen.h>
+#endif /* SunOS */
+
 #include "bridge.h"
 #include "group.h"
 #include "workspace.h"
@@ -94,6 +99,7 @@ Client::Client( Workspace *ws )
         decoration( NULL ),
         wspace( ws ),
         bridge( new Bridge( this )),
+        inhibitConfigureRequests(false),
         move_faked_activity( false ),
         move_resize_grab_window( None ),
         transient_for( NULL ),
@@ -115,18 +121,23 @@ Client::Client( Workspace *ws )
         border_top( 0 ),
         border_bottom( 0 ),
         opacity_( 0 ),
-        demandAttentionKNotifyTimer( NULL )
+        demandAttentionKNotifyTimer( NULL ),
+        activeMaximizing(false),
+        activeTiled(false)
 // SELI do all as initialization
     {
     autoRaiseTimer = 0;
     shadeHoverTimer = 0;
 
+    configureRequestTimer = new TQTimer(this);
+    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;
@@ -171,7 +182,7 @@ Client::Client( Workspace *ws )
 
     max_mode = MaximizeRestore;
     maxmode_restore = MaximizeRestore;
-    
+
     cmap = None;
 
     frame_geometry = TQRect( 0, 0, 100, 100 ); // so that decorations don't start with size being (0,0)
@@ -255,7 +266,7 @@ void Client::releaseWindow( bool on_shutdown )
         {
         // Make sure it's not mapped if the app unmapped it (#65279). The app
         // may do map+unmap before we initially map the window by calling rawShow() from manage().
-        XUnmapWindow( tqt_xdisplay(), client ); 
+        XUnmapWindow( tqt_xdisplay(), client );
         }
     client = None;
     XDestroyWindow( tqt_xdisplay(), wrapper );
@@ -519,7 +530,7 @@ bool Client::isModalSystemNotification() const
 void Client::updateShape()
     {
     // workaround for #19644 - shaped windows shouldn't have decoration
-    if( shape() && !noBorder()) 
+    if( shape() && !noBorder())
         {
         noborder = true;
         updateDecoration( true );
@@ -598,7 +609,7 @@ TQRegion Client::mask() const
         return TQRegion( 0, 0, width(), height());
     return _mask;
     }
-    
+
 void Client::setShapable(bool b)
     {
     long tmp = b?1:0;
@@ -740,12 +751,12 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
     TQPixmap pm = animationPixmap( minimize ? width() : icongeom.width() );
 
     TQRect before, after;
-    if ( minimize ) 
+    if ( minimize )
         {
         before = TQRect( x(), y(), width(), pm.height() );
         after = TQRect( icongeom.x(), icongeom.y(), icongeom.width(), pm.height() );
         }
-    else 
+    else
         {
         before = TQRect( icongeom.x(), icongeom.y(), icongeom.width(), pm.height() );
         after = TQRect( x(), y(), width(), pm.height() );
@@ -769,14 +780,14 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
     TQPainter p ( workspace()->desktopWidget() );
     bool need_to_clear = FALSE;
     TQPixmap pm3;
-    do 
+    do
         {
         if (area2 != area)
             {
             pm = animationPixmap( area.width() );
             pm2 = TQPixmap::grabWindow( tqt_xrootwin(), area.x(), area.y(), area.width(), area.height() );
             p.drawPixmap( area.x(), area.y(), pm );
-            if ( need_to_clear ) 
+            if ( need_to_clear )
                 {
                 p.drawPixmap( area2.x(), area2.y(), pm3 );
                 need_to_clear = FALSE;
@@ -792,11 +803,11 @@ void Client::animateMinimizeOrUnminimize( bool minimize )
         area.setRight(before.right() + int(diff*rf));
         area.setTop(before.top() + int(diff*tf));
         area.setBottom(before.bottom() + int(diff*bf));
-        if (area2 != area ) 
+        if (area2 != area )
             {
             if ( area2.intersects( area ) )
                 p.drawPixmap( area2.x(), area2.y(), pm2 );
-            else 
+            else
                 { // no overlap, we can clear later to avoid flicker
                 pm3 = pm2;
                 need_to_clear = TRUE;
@@ -870,7 +881,7 @@ void Client::setShade( ShadeMode mode )
 
     int as = options->animateShade? 10 : 1;
 // TODO all this unmapping, resizing etc. feels too much duplicated from elsewhere
-    if ( isShade()) 
+    if ( isShade())
         { // shade_mode == ShadeNormal
         // we're about to shade, texx xcompmgr to prepare
         long _shade = 1;
@@ -884,13 +895,13 @@ void Client::setShade( ShadeMode mode )
         XUnmapWindow( tqt_xdisplay(), wrapper );
         XUnmapWindow( tqt_xdisplay(), client );
         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        
+        //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 );
 //        bool wasStaticContents = testWFlags( WStaticContents );
 //        setWFlags( WStaticContents );
-        int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
-        do 
+        int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1;
+        do
             {
             h -= step;
             XResizeWindow( tqt_xdisplay(), frameId(), s.width(), h );
@@ -910,17 +921,17 @@ void Client::setShade( ShadeMode mode )
             }
         // tell xcompmgr shade's done
         _shade = 2;
-        XChangeProperty(tqt_xdisplay(), frameId(), atoms->net_wm_window_shade, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &_shade, 1L);    
+        XChangeProperty(tqt_xdisplay(), frameId(), atoms->net_wm_window_shade, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &_shade, 1L);
         }
-    else 
+    else
         {
         int h = height();
         shade_geometry_change = true;
         TQSize s( sizeForClientSize( clientSize()));
 // FRAME       bool wasStaticContents = testWFlags( WStaticContents );
 //        setWFlags( WStaticContents );
-        int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
-        do 
+        int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1;
+        do
             {
             h += step;
             XResizeWindow( tqt_xdisplay(), frameId(), s.width(), h );
@@ -962,6 +973,12 @@ void Client::setShade( ShadeMode mode )
     updateWindowRules();
     }
 
+void Client::configureRequestTimeout()
+    {
+    inhibitConfigureRequests = false;
+    sendSyntheticConfigureNotify();
+    }
+
 void Client::shadeHover()
     {
     setShade( ShadeHover );
@@ -1193,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()));
 }
 
 /*!
@@ -1207,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;
     }
 
@@ -1253,7 +1270,7 @@ void Client::drawShadow()
 
     removeShadow();
 
-    TQMemArray<QRgb> pixelData;
+    TQMemArray<TQRgb> pixelData;
     TQPixmap shadowPixmap;
     TQRect shadow;
     TQRegion exposedRegion;
@@ -1426,7 +1443,7 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w,
  */
 void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed)
 {
-    QRgb pixel;
+    TQRgb pixel;
     double opacity;
     int red, green, blue, pixelRed, pixelGreen, pixelBlue;
     int subW, subH, w, x, y, zeroX, zeroY;
@@ -1483,7 +1500,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
         TQRegion exposed, int thickness, double maxOpacity)
 {
     int distance, intersectCount, i, j, x, y;
-    QRgb pixel;
+    TQRgb pixel;
     double decay, factor, opacity;
     int red, green, blue, pixelRed, pixelGreen, pixelBlue;
     int lineIntersects, maxIntersects, maxY;
@@ -1697,7 +1714,7 @@ void Client::sendClientMessage(Window w, Atom a, Atom protocol, long data1, long
     ev.xclient.message_type = a;
     ev.xclient.format = 32;
     ev.xclient.data.l[0] = protocol;
-    ev.xclient.data.l[1] = GET_QT_X_TIME();
+    ev.xclient.data.l[1] = get_tqt_x_time();
     ev.xclient.data.l[2] = data1;
     ev.xclient.data.l[3] = data2;
     ev.xclient.data.l[4] = data3;
@@ -1726,14 +1743,14 @@ void Client::closeWindow()
     if( !isCloseable())
         return;
     // Update user time, because the window may create a confirming dialog.
-    updateUserTime(); 
+    updateUserTime();
     if ( Pdeletewindow )
         {
         Notify::raise( Notify::Close );
         sendClientMessage( window(), atoms->wm_protocols, atoms->wm_delete_window);
         pingWindow();
         }
-    else 
+    else
         {
         // client will not react on wm_delete_window. We have not choice
         // but destroy his connection to the XServer.
@@ -1774,9 +1791,9 @@ 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_QT_X_TIME();
+    ping_timestamp = get_tqt_x_time();
     workspace()->sendPingToWindow( window(), ping_timestamp );
     }
 
@@ -1833,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;
@@ -1860,15 +1877,30 @@ bool Client::isSuspendable() const
         }
     else
         {
+#ifdef Q_OS_SOLARIS
+        TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid));
+#else /* default */
         TQFile procStatFile(TQString("/proc/%1/stat").arg(pid));
+#endif
         if (procStatFile.open(IO_ReadOnly))
             {
             TQByteArray statRaw = procStatFile.readAll();
             procStatFile.close();
+#ifdef Q_OS_SOLARIS
+            lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data();
+            char tbuf[PATH_MAX];
+            TQString tcomm;
+            TQString state(TQChar(inf->pr_sname));
+
+            readlink(TQString("/proc/%1/path/a.out").arg(pid).latin1(),
+                tbuf, sizeof(tbuf));
+            tcomm = basename(tbuf);
+#else /* default */
             TQString statString(statRaw);
             TQStringList statFields = TQStringList::split(" ", statString, TRUE);
             TQString tcomm = statFields[1];
             TQString state = statFields[2];
+#endif /* default */
             if( state != "T" )
                 {
                 // Make sure no windows of this process are special
@@ -1921,15 +1953,24 @@ bool Client::isResumeable() const
         }
     else
         {
+#ifdef Q_OS_SOLARIS
+        TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid));
+#else /* default */
         TQFile procStatFile(TQString("/proc/%1/stat").arg(pid));
+#endif
         if (procStatFile.open(IO_ReadOnly))
             {
             TQByteArray statRaw = procStatFile.readAll();
             procStatFile.close();
+#ifdef Q_OS_SOLARIS
+            lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data();
+            TQString state(TQChar(inf->pr_sname));
+#else /* default */
             TQString statString(statRaw);
             TQStringList statFields = TQStringList::split(" ", statString, TRUE);
             TQString tcomm = statFields[1];
             TQString state = statFields[2];
+#endif /* default */
             if( state == "T" )
                 {
                 return true;
@@ -1961,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;
@@ -2172,15 +2213,15 @@ void Client::takeActivity( int flags, bool handled, allowed_t )
 #ifndef NDEBUG
     static Time previous_activity_timestamp;
     static Client* previous_client;
-    if( previous_activity_timestamp == GET_QT_X_TIME() && previous_client != this )
+    if( previous_activity_timestamp == get_tqt_x_time() && previous_client != this )
         {
         kdDebug( 1212 ) << "Repeated use of the same X timestamp for activity" << endl;
         kdDebug( 1212 ) << kdBacktrace() << endl;
         }
-    previous_activity_timestamp = GET_QT_X_TIME();
+    previous_activity_timestamp = get_tqt_x_time();
     previous_client = this;
 #endif
-    workspace()->sendTakeActivity( this, GET_QT_X_TIME(), flags );
+    workspace()->sendTakeActivity( this, get_tqt_x_time(), flags );
     }
 
 // performs the actual focusing of the window using XSetInputFocus and WM_TAKE_FOCUS
@@ -2189,17 +2230,17 @@ void Client::takeFocus( allowed_t )
 #ifndef NDEBUG
     static Time previous_focus_timestamp;
     static Client* previous_client;
-    if( previous_focus_timestamp == GET_QT_X_TIME() && previous_client != this )
+    if( previous_focus_timestamp == get_tqt_x_time() && previous_client != this )
         {
         kdDebug( 1212 ) << "Repeated use of the same X timestamp for focus" << endl;
         kdDebug( 1212 ) << kdBacktrace() << endl;
         }
-    previous_focus_timestamp = GET_QT_X_TIME();
+    previous_focus_timestamp = get_tqt_x_time();
     previous_client = this;
 #endif
     if ( rules()->checkAcceptFocus( input ))
         {
-        XSetInputFocus( tqt_xdisplay(), window(), RevertToPointerRoot, GET_QT_X_TIME() );
+        XSetInputFocus( tqt_xdisplay(), window(), RevertToPointerRoot, get_tqt_x_time() );
         // Work around opacity bug
         bool activePrev = active;
         active = true;
@@ -2236,7 +2277,7 @@ bool Client::providesContextHelp() const
  */
 void Client::showContextHelp()
     {
-    if ( Pcontexthelp ) 
+    if ( Pcontexthelp )
         {
         sendClientMessage(window(), atoms->wm_protocols, atoms->net_wm_context_help);
         TQWhatsThis::enterWhatsThisMode(); // SELI?
@@ -2255,17 +2296,17 @@ void Client::fetchName()
 
 TQString Client::readName() const
     {
-    if ( info->name() && info->name()[ 0 ] != '\0' ) 
+    if ( info->name() && info->name()[ 0 ] != '\0' )
         return TQString::fromUtf8( info->name() );
-    else 
+    else
         return KWin::readNameProperty( window(), XA_WM_NAME );
     }
-    
+
 KWIN_COMPARE_PREDICATE( FetchNameInternalPredicate, const Client*, (!cl->isSpecialWindow() || cl->isToolbar()) && cl != value && cl->caption() == value->caption());
 
 void Client::setCaption( const TQString& s, bool force )
     {
-    if ( s != cap_normal || force ) 
+    if ( s != cap_normal || force )
         {
         bool reset_name = force;
         for( unsigned int i = 0;
@@ -2280,10 +2321,10 @@ void Client::setCaption( const TQString& s, bool force )
             machine_suffix = " <@" + wmClientMachine( true ) + ">";
         TQString shortcut_suffix = !shortcut().isNull() ? ( " {" + shortcut().toString() + "}" ) : "";
         cap_suffix = machine_suffix + shortcut_suffix;
-        if ( ( !isSpecialWindow() || isToolbar()) && workspace()->findClient( FetchNameInternalPredicate( this ))) 
+        if ( ( !isSpecialWindow() || isToolbar()) && workspace()->findClient( FetchNameInternalPredicate( this )))
             {
             int i = 2;
-            do 
+            do
                 {
                 cap_suffix = machine_suffix + " <" + TQString::number(i) + ">" + shortcut_suffix;
                 i++;
@@ -2313,11 +2354,11 @@ void Client::updateCaption()
 void Client::fetchIconicName()
     {
     TQString s;
-    if ( info->iconName() && info->iconName()[ 0 ] != '\0' ) 
+    if ( info->iconName() && info->iconName()[ 0 ] != '\0' )
         s = TQString::fromUtf8( info->iconName() );
-    else 
+    else
         s = KWin::readNameProperty( window(), XA_WM_ICON_NAME );
-    if ( s != cap_iconic ) 
+    if ( s != cap_iconic )
         {
 	bool was_set = !cap_iconic.isEmpty();
         cap_iconic = s;
@@ -2378,7 +2419,7 @@ void Client::getMotifHints()
     }
 
 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 );
@@ -2494,7 +2535,7 @@ Window Client::staticWmClientLeader(WId w)
                                  FALSE, XA_WINDOW, &type, &format,
                                  &nitems, &extra, &data );
     XSetErrorHandler(oldHandler);
-    if (status  == Success ) 
+    if (status  == Success )
         {
         if (data && nitems > 0)
             result = *((Window*) data);
@@ -2672,29 +2713,29 @@ void Client::setCursor( Position m )
         {
         m = PositionCenter;
         }
-    switch ( m ) 
+    switch ( m )
         {
         case PositionTopLeft:
         case PositionBottomRight:
-            setCursor( tqsizeFDiagCursor );
+            setCursor( TQt::sizeFDiagCursor );
             break;
         case PositionBottomLeft:
         case PositionTopRight:
-            setCursor( tqsizeBDiagCursor );
+            setCursor( TQt::sizeBDiagCursor );
             break;
         case PositionTop:
         case PositionBottom:
-            setCursor( tqsizeVerCursor );
+            setCursor( TQt::sizeVerCursor );
             break;
         case PositionLeft:
         case PositionRight:
-            setCursor( tqsizeHorCursor );
+            setCursor( TQt::sizeHorCursor );
             break;
         default:
             if( buttonDown && isMovable())
-                setCursor( tqsizeAllCursor );
+                setCursor( TQt::sizeAllCursor );
             else
-                setCursor( tqarrowCursor );
+                setCursor( TQt::arrowCursor );
             break;
         }
     }
@@ -2946,7 +2987,7 @@ void Client::updateOpacity()
             }
         }
     }
-    
+
 void Client::updateShadowSize()
 // extra syncscreen flag allows to avoid double syncs when active state changes (as it will usually change for two windows)
     {
@@ -2967,7 +3008,7 @@ uint Client::ruleOpacityActive()
     {
     return rule_opacity_active;// != 0;
     }
-    
+
 bool Client::getWindowOpacity() //query translucency settings from X, returns true if window opacity is set
     {
     unsigned char *data = 0;
@@ -2985,12 +3026,12 @@ bool Client::getWindowOpacity() //query translucency settings from X, returns tr
         }
     return FALSE;
     }
-    
+
 void Client::setCustomOpacityFlag(bool custom)
     {
     custom_opacity = custom;
     }
-    
+
 uint Client::opacity()
     {
     return opacity_;
@@ -3000,7 +3041,7 @@ int Client::opacityPercentage()
     {
     return int(100*((double)opacity_/0xffffffff));
     }
-    
+
 bool Client::touches(const Client* c)
 // checks if this client borders c, needed to test beep media player window state
     {
@@ -3014,7 +3055,7 @@ bool Client::touches(const Client* c)
         return TRUE;
     return FALSE;
     }
-    
+
 void Client::setDecoHashProperty(uint topHeight, uint rightWidth, uint bottomHeight, uint leftWidth)
 {
    long data = (topHeight < 255 ? topHeight : 255) << 24 |
@@ -3028,7 +3069,7 @@ void Client::unsetDecoHashProperty()
 {
    XDeleteProperty( tqt_xdisplay(), frameId(), atoms->net_wm_window_decohash);
 }
-    
+
 #ifndef NDEBUG
 kdbgstream& operator<<( kdbgstream& stream, const Client* cl )
     {
diff --git a/twin/client.h b/twin/client.h
index d3c7e7b13..a59b20acd 100644
--- a/twin/client.h
+++ b/twin/client.h
@@ -45,7 +45,7 @@ class Bridge;
 
 class Client : public TQObject, public KDecorationDefines
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Client( Workspace *ws );
         Window window() const;
@@ -232,6 +232,15 @@ class Client : public TQObject, public KDecorationDefines
         void resizeWithChecks( int w, int h, ForceGeometry_t force = NormalGeometrySet );
         void resizeWithChecks( const TQSize& s, ForceGeometry_t force = NormalGeometrySet );
         void keepInArea( TQRect area, bool partial = false );
+        void setActiveBorderMode( ActiveMaximizingMode mode );
+        void setActiveBorder( ActiveBorder border);
+        ActiveMaximizingMode activeBorderMode() const;
+        ActiveBorder activeBorder() const;
+        void setActiveBorderMaximizing(bool maximizing);
+        void cancelActiveBorderMaximizing();
+        bool isActiveBorderMaximizing() const;
+        TQRect activeBorderMaximizeGeometry();
+        void tileToBorder(ActiveBorder border);
 
         void growHorizontal();
         void shrinkHorizontal();
@@ -331,6 +340,7 @@ class Client : public TQObject, public KDecorationDefines
     private slots:
         void autoRaise();
         void shadeHover();
+        void configureRequestTimeout();
         void shortcutActivated();
 	void updateOpacityCache();
 
@@ -448,7 +458,7 @@ class Client : public TQObject, public KDecorationDefines
         static void sendClientMessage( Window w, Atom a, Atom protocol,
             long data1 = 0, long data2 = 0, long data3 = 0 );
 
-        void embedClient( Window w, const XWindowAttributes &attr );    
+        void embedClient( Window w, const XWindowAttributes &attr );
         void detectNoBorder();
         void detectShapable();
         void destroyDecoration();
@@ -472,14 +482,15 @@ class Client : public TQObject, public KDecorationDefines
         int desk;
         bool buttonDown;
         bool moveResizeMode;
+        bool inhibitConfigureRequests;
         bool move_faked_activity;
         Window move_resize_grab_window;
         bool unrestrictedMoveResize;
-        bool isMove() const 
+        bool isMove() const
             {
             return moveResizeMode && mode == PositionCenter;
             }
-        bool isResize() const 
+        bool isResize() const
             {
             return moveResizeMode && mode != PositionCenter;
             }
@@ -550,6 +561,7 @@ class Client : public TQObject, public KDecorationDefines
         WinInfo* info;
         TQTimer* autoRaiseTimer;
         TQTimer* shadeHoverTimer;
+        TQTimer* configureRequestTimer;
         Colormap cmap;
         TQCString resource_name;
         TQCString resource_class;
@@ -600,6 +612,12 @@ class Client : public TQObject, public KDecorationDefines
         bool isBMP_;
         TQTimer* demandAttentionKNotifyTimer;
 
+        bool activeMaximizing;
+        bool activeTiled;
+        TQRect activeTiledOrigGeom;
+        ActiveMaximizingMode activeMode;
+        ActiveBorder currentActiveBorder;
+
         friend bool performTransiencyCheck();
         bool minimized_before_suspend;
     };
@@ -946,7 +964,7 @@ inline bool Client::hasUserTimeSupport() const
     {
     return info->userTime() != -1U;
     }
-    
+
 inline bool Client::ignoreFocusStealing() const
     {
     return ignore_focus_stealing;
diff --git a/twin/clients/PORTING b/twin/clients/PORTING
index 0c0c1a6ea..199ddb9de 100644
--- a/twin/clients/PORTING
+++ b/twin/clients/PORTING
@@ -2,18 +2,14 @@ It's suggested you check sources of some KDE CVS decoration if in doubts or in n
 Also, the API is documented in the .h header files.
 
 Makefile.am:
-- Change twin_ to twin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
 - Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
 - Add -ltdecorations to LIBADD.
 - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/twin/ ).
 
-.desktop file:
-- Change twin_ to twin3_ in X-TDE-Library.
-
 Sources:
 - There are no twin/something.h includes, and don't use the KWinInternal namespace.
 - Use QToolTip instead of KWinToolTip.
-- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget
+- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and TQWidget
   instead of KWinWidgetButton.
 - For tooltips, use simply QToolTip::add().
 - Change Client* to MyClient* (or whatever is your main client class) in your MyButton.
@@ -26,11 +22,11 @@ Sources:
 - As the first thing in init(), call createMainWidget(); if your client class took some
   flags such as WResizeNoErase, pass them to this function.
 - Then, do 'widget()->installEventFilter( this );'.
-- Implement MyClient::eventFilter() - as MyClient is now no longer QWidget, you need the event
+- Implement MyClient::eventFilter() - as MyClient is now no longer TQWidget, you need the event
   filter to call all the functions that used to be called directly. Usually, it's something
   like:
 =====
-bool MyClient::eventFilter( QObject* o, QEvent* e )
+bool MyClient::eventFilter( TQObject* o, QEvent* e )
 {
 	if ( o != widget() )
 		return false;
@@ -67,7 +63,7 @@ bool MyClient::eventFilter( QObject* o, QEvent* e )
 }
 =====
 - In MyClient, 'this' will have to be often replaced with 'widget()', pay special attention
-  to cases where this won't cause compile error (e.g. in connect() calls, which take QObject* ).
+  to cases where this won't cause compile error (e.g. in connect() calls, which take TQObject* ).
 - Also, many calls may need 'widget()->' prepended.
 - Layout is created in init(), so call createLayout() directly there (if it's implemented).
 - Remove calls to Client methods (Client::resizeEvent() and so on).
diff --git a/twin/clients/b2/CMakeLists.txt b/twin/clients/b2/CMakeLists.txt
index cd08f4d99..ba946ba75 100644
--- a/twin/clients/b2/CMakeLists.txt
+++ b/twin/clients/b2/CMakeLists.txt
@@ -32,9 +32,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_b2 (module) #########################
+##### twin_b2 (module) #########################
 
-tde_add_kpart( twin3_b2 AUTOMOC
+tde_add_kpart( twin_b2 AUTOMOC
   SOURCES b2client.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/b2/Makefile.am b/twin/clients/b2/Makefile.am
index ccd7f39fa..71bbbb556 100644
--- a/twin/clients/b2/Makefile.am
+++ b/twin/clients/b2/Makefile.am
@@ -3,12 +3,12 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = twin3_b2.la
+kde_module_LTLIBRARIES = twin_b2.la
 
-twin3_b2_la_SOURCES = b2client.cpp
-twin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_b2_la_SOURCES = b2client.cpp
+twin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 # twin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-twin3_b2_la_LIBADD  = ../../lib/libtdecorations.la
+twin_b2_la_LIBADD  = ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = b2client.h
diff --git a/twin/clients/b2/b2.desktop b/twin/clients/b2/b2.desktop
index b5eacefa9..767e9bfc4 100644
--- a/twin/clients/b2/b2.desktop
+++ b/twin/clients/b2/b2.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=B II
-X-TDE-Library=twin3_b2
+X-TDE-Library=twin_b2
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 6a7a8296e..16a451932 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -221,7 +221,7 @@ static void create_pixmaps()
     TQPainter mask;
     mask.begin(&normalizeMask);
 
-    TQBrush one(Qt::color1);
+    TQBrush one(TQt::color1);
     mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, 
 		  12, 12, one);
     mask.fillRect(0, 0, 10, 10, one);
@@ -461,11 +461,11 @@ void B2Client::addButtons(const TQString& s, const TQString tips[],
 	  if (!isModalSystemNotification()) {
 	    if (!button[BtnMenu]) {
 		button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu], 
-			Qt::LeftButton | Qt::RightButton);
+			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,19 +496,19 @@ 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;
 	case 'A':  // Maximize button
 	    if (isMaximizable() && (!button[BtnMax])) {
 		button[BtnMax] = new B2Button(this, tb, tips[BtnMax], 
-			Qt::LeftButton | Qt::MidButton | Qt::RightButton);
+			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;
@@ -676,7 +676,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
 
     // bottom handle rect
     if (mustDrawHandle()) {
-        p.setPen(Qt::black);
+        p.setPen(TQt::black);
 	int hx = width() - 40;
 	int hw = 40;
 
@@ -981,8 +981,8 @@ static void redraw_pixmaps()
 	KPixmap *pix = pixmap[P_SHADE * NumStates + i];
 	TQColor color = is_act ? aGrp.button() : iGrp.button();
 	drawB2Rect(&thinBox, color, is_down);
-	pix->fill(Qt::black);
-	bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox), 
+	pix->fill(TQt::black);
+	bitBlt(pix, 0, 0, &thinBox, 
 		0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true);
     }
 
@@ -1005,12 +1005,12 @@ static void redraw_pixmaps()
 	drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
 	drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down);
 	pix->fill(options()->color(KDecoration::ColorTitleBar, is_act));
-	bitBlt(TQT_TQPAINTDEVICE(pix), pix->width() - 12, pix->width() - 12, TQT_TQPAINTDEVICE(&largeBox),
+	bitBlt(pix, pix->width() - 12, pix->width() - 12, &largeBox,
 	       0, 0, 12, 12, TQt::CopyROP, true);
-	bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+	bitBlt(pix, 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
 
-	bitBlt(TQT_TQPAINTDEVICE(pixmap[P_ICONIFY * NumStates + i]), 0, 0,
-	       TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+	bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0,
+	       &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
     }
     
     // resize
@@ -1020,8 +1020,8 @@ static void redraw_pixmaps()
 	*pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i];
 	pixmap[P_RESIZE * NumStates + i]->detach();
 	drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down);
-	bitBlt(TQT_TQPAINTDEVICE(pixmap[P_RESIZE * NumStates + i]), 
-		0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true);
+	bitBlt(pixmap[P_RESIZE * NumStates + i], 
+		0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true);
     }
 
 
@@ -1166,7 +1166,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
 	*visible_bound = geom;
     }
     TQPainter p(workspaceWidget());
-    p.setPen(TQPen(Qt::white, 5));
+    p.setPen(TQPen(TQt::white, 5));
     p.setRasterOp(TQt::XorROP);
     p.drawPolygon(bound_shape);
 
@@ -1179,26 +1179,26 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
 
 bool B2Client::eventFilter(TQObject *o, TQEvent *e)
 {
-    if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()))
+    if (o != widget())
 	return false;
     switch (e->type()) {
     case TQEvent::Resize:
-	resizeEvent(TQT_TQRESIZEEVENT(e));
+	resizeEvent(static_cast<TQResizeEvent*>(e));
 	return true;
     case TQEvent::Paint:
-	paintEvent(TQT_TQPAINTEVENT(e));
+	paintEvent(static_cast<TQPaintEvent*>(e));
 	return true;
     case TQEvent::MouseButtonDblClick:
-	titlebar->mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+	titlebar->mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
 	return true;
     case TQEvent::Wheel:
-	titlebar->wheelEvent(TQT_TQWHEELEVENT(e));
+	titlebar->wheelEvent(static_cast<TQWheelEvent*>(e));
 	return true;
     case TQEvent::MouseButtonPress:
-	processMousePressEvent(TQT_TQMOUSEEVENT(e));
+	processMousePressEvent(static_cast<TQMouseEvent*>(e));
 	return true;
     case TQEvent::Show:
-	showEvent(TQT_TQSHOWEVENT(e));
+	showEvent(static_cast<TQShowEvent*>(e));
 	return true;
     default:
 	break;
@@ -1213,7 +1213,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent,
    : TQButton(parent, 0), hover(false)
 {
     setBackgroundMode(NoBackground);
-    setCursor(tqarrowCursor);
+    setCursor(TQt::arrowCursor);
     realizeButtons = realizeBtns;
     client = _client;
     useMiniIcon = false;
@@ -1280,7 +1280,7 @@ void B2Button::mousePressEvent(TQMouseEvent * e)
 {
     last_button = e->button();
     TQMouseEvent me(e->type(), e->pos(), e->globalPos(), 
-	    (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, 
+	    (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton, 
 	    e->state());
     TQButton::mousePressEvent(&me);
 }
@@ -1289,7 +1289,7 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e)
 {
     last_button = e->button();
     TQMouseEvent me(e->type(), e->pos(), e->globalPos(), 
-	    (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, 
+	    (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton, 
 	    e->state());
     TQButton::mouseReleaseEvent(&me);
 }
@@ -1356,7 +1356,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state)
 
     TQRect t = rect();
     // black titlebar frame
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
     p.drawLine(0, 0, 0, t.bottom());
     p.drawLine(0, 0, t.right(), 0);
     p.drawLine(t.right(), 0, t.right(), t.bottom());
@@ -1395,7 +1395,7 @@ void B2Titlebar::resizeEvent(TQResizeEvent *)
 void B2Titlebar::paintEvent(TQPaintEvent *)
 {
     if(client->isActive())
-        bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&titleBuffer), 0, 0, titleBuffer.width(),
+        bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(),
                titleBuffer.height(), TQt::CopyROP, true);
     else {
         TQPainter p(this);
@@ -1405,14 +1405,14 @@ void B2Titlebar::paintEvent(TQPaintEvent *)
 
 void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-    if (e->button() == Qt::LeftButton && e->y() < height()) {
+    if (e->button() == TQt::LeftButton && e->y() < height()) {
 	client->titlebarDblClickOperation();
     }
 }
 
 void B2Titlebar::wheelEvent(TQWheelEvent *e)
 {
-    if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).contains(e->pos())) 
+    if (client->isSetShade() || rect().contains(e->pos())) 
 	client->titlebarMouseWheelOperation( e->delta());
 }
 
@@ -1449,6 +1449,3 @@ void B2Titlebar::mouseMoveEvent(TQMouseEvent * e)
 } // namespace B2
 
 #include "b2client.moc"
-
-// vim: sw=4
-
diff --git a/twin/clients/b2/b2client.h b/twin/clients/b2/b2client.h
index 30220b175..c9748ccd6 100644
--- a/twin/clients/b2/b2client.h
+++ b/twin/clients/b2/b2client.h
@@ -28,7 +28,7 @@ class B2Client;
 class B2Button : public TQButton
 {
 public:
-    B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton);
+    B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton);
     ~B2Button() {};
 
     void setBg(const TQColor &c){bg = c;}
@@ -93,7 +93,7 @@ private:
 
 class B2Client : public KDecoration
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class B2Titlebar;
 public:
     B2Client(KDecorationBridge *b, KDecorationFactory *f);
diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp
index 77ca65338..b955254ec 100644
--- a/twin/clients/b2/config/config.cpp
+++ b/twin/clients/b2/config/config.cpp
@@ -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();
 }
@@ -162,4 +162,3 @@ void B2Config::defaults()
 }
 
 #include "config.moc"
-// vim: ts=4
diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h
index a1ca8ebdd..0a3e7c9ec 100644
--- a/twin/clients/b2/config/config.h
+++ b/twin/clients/b2/config/config.h
@@ -18,7 +18,7 @@
 
 class B2Config: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		B2Config( TDEConfig* conf, TQWidget* parent );
@@ -46,5 +46,3 @@ class B2Config: public TQObject
 };
 
 #endif
-
-// vim: ts=4
diff --git a/twin/clients/default/CMakeLists.txt b/twin/clients/default/CMakeLists.txt
index 142a9b783..56bae72f9 100644
--- a/twin/clients/default/CMakeLists.txt
+++ b/twin/clients/default/CMakeLists.txt
@@ -23,9 +23,9 @@ link_directories(
 )
 
 
-##### twin3_default (module) ####################
+##### twin_default (module) ####################
 
-tde_add_kpart( twin3_default AUTOMOC
+tde_add_kpart( twin_default AUTOMOC
   SOURCES kdedefault.cpp
   LINK tdecorations-shared tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/default/Makefile.am b/twin/clients/default/Makefile.am
index 3e687a2a6..2b609988b 100644
--- a/twin/clients/default/Makefile.am
+++ b/twin/clients/default/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = twin3_default.la
+kde_module_LTLIBRARIES = twin_default.la
 
-twin3_default_la_SOURCES = kdedefault.cpp
-twin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_default_la_LIBADD  = $(LIB_TDECORE) ../../lib/libtdecorations.la
+twin_default_la_SOURCES = kdedefault.cpp
+twin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_default_la_LIBADD  = $(LIB_TDECORE) ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = kdedefault.h
diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp
index f479c0c69..36ddb1402 100644
--- a/twin/clients/default/config/config.cpp
+++ b/twin/clients/default/config/config.cpp
@@ -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();
@@ -128,4 +128,3 @@ void KDEDefaultConfig::defaults()
 }
 
 #include "config.moc"
-// vim: ts=4
diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h
index a09ac1ab3..d01459a13 100644
--- a/twin/clients/default/config/config.h
+++ b/twin/clients/default/config/config.h
@@ -19,7 +19,7 @@
 
 class KDEDefaultConfig: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KDEDefaultConfig( TDEConfig* conf, TQWidget* parent );
@@ -46,4 +46,3 @@ class KDEDefaultConfig: public TQObject
 };
 
 #endif
-// vim: ts=4
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 7892c4adc..3513ca5df 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -267,11 +267,11 @@ void KDEDefaultHandler::createPixmaps()
 		int i, x, y;
 		titlePix = new TQPixmap(132, normalTitleHeight+2);
 		TQBitmap mask(132, normalTitleHeight+2);
-		mask.fill(Qt::color0);
+		mask.fill(TQt::color0);
 
 		p.begin(titlePix);
 		maskPainter.begin(&mask);
-		maskPainter.setPen(Qt::color1);
+		maskPainter.setPen(TQt::color1);
 		for(i=0, y=2; i < 9; ++i, y+=4)
 			for(x=1; x <= 132; x+=3)
 			{
@@ -681,9 +681,9 @@ void KDEDefaultButton::drawButton(TQPainter *p)
 				active).rgb() ) > 127;
 
 		if (isMouseOver)
-			p->setPen( darkDeco ? Qt::darkGray : Qt::lightGray );
+			p->setPen( darkDeco ? TQt::darkGray : TQt::lightGray );
 		else
-			p->setPen( darkDeco ? Qt::black : Qt::white );
+			p->setPen( darkDeco ? TQt::black : TQt::white );
 
 		int xOff = (width()-10)/2;
 		int yOff = (height()-10)/2;
@@ -905,7 +905,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
     titleBuffer->resize( rightOffset-3, titleHeight+1 );
 
 	// Draw an outer black frame
-	p.setPen(Qt::black);
+	p.setPen(TQt::black);
 	p.drawRect(x,y,w,h);
 
     // Draw part of the frame that is the titlebar color
@@ -923,7 +923,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
 	           options()->color(ColorTitleBar, isActive() ));
 
 	// Finish drawing the titlebar extension
-	p.setPen(Qt::black);
+	p.setPen(TQt::black);
 	p.drawLine(x+1, leftFrameStart+borderWidth-4, x+borderWidth-2, leftFrameStart-1);
 	p.setPen(g.mid());
 	p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2);
@@ -939,7 +939,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
 
 	p.setPen(options()->color(ColorFrame, isActive()));
 	TQPointArray a;
-	TQBrush brush( options()->color(ColorFrame, isActive()), Qt::SolidPattern );
+	TQBrush brush( options()->color(ColorFrame, isActive()), TQt::SolidPattern );
 	p.setBrush( brush );                       // use solid, yellow brush
     a.setPoints( 4, x+2,             leftFrameStart+borderWidth-4,
 	                x+borderWidth-2, leftFrameStart,
@@ -1064,6 +1064,3 @@ extern "C" KDE_EXPORT KDecorationFactory* create_factory()
 {
     return new Default::KDEDefaultHandler();
 }
-
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/clients/default/kdedefault.h b/twin/clients/default/kdedefault.h
index 70b8847fa..4c89132e2 100644
--- a/twin/clients/default/kdedefault.h
+++ b/twin/clients/default/kdedefault.h
@@ -99,5 +99,3 @@ class KDEDefaultClient : public KCommonDecoration
 }
 
 #endif
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/clients/keramik/CMakeLists.txt b/twin/clients/keramik/CMakeLists.txt
index 6eade7074..736d3dc3a 100644
--- a/twin/clients/keramik/CMakeLists.txt
+++ b/twin/clients/keramik/CMakeLists.txt
@@ -32,12 +32,12 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_keramik (module) ####################
+##### twin_keramik (module) ####################
 
 set_source_files_properties( keramik.cpp
   PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h )
 
-tde_add_kpart( twin3_keramik AUTOMOC
+tde_add_kpart( twin_keramik AUTOMOC
   SOURCES keramik.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am
index 2ed77cac7..3fe2162ed 100644
--- a/twin/clients/keramik/Makefile.am
+++ b/twin/clients/keramik/Makefile.am
@@ -10,13 +10,13 @@ embedtool_SOURCES         = embedtool.cpp
 embedtool_LDADD           = $(LIB_TQT)
 embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
-kde_module_LTLIBRARIES    = twin3_keramik.la
+kde_module_LTLIBRARIES    = twin_keramik.la
 
-twin3_keramik_la_SOURCES   = keramik.cpp
-twin3_keramik_la_COMPILE_FIRST = tiles.h
-twin3_keramik_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_keramik_la_LIBADD    = $(LIB_TDEUI) ../../lib/libtdecorations.la
-#twin3_keramik_la_LDFLAGS   = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+twin_keramik_la_SOURCES   = keramik.cpp
+twin_keramik_la_COMPILE_FIRST = tiles.h
+twin_keramik_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
+twin_keramik_la_LIBADD    = $(LIB_TDEUI) ../../lib/libtdecorations.la
+#twin_keramik_la_LDFLAGS   = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
 
 METASOURCES               = AUTO
 noinst_headers        	  = keramik.h tiles.h
diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp
index 0f3be48c7..98a46e308 100644
--- a/twin/clients/keramik/config/config.cpp
+++ b/twin/clients/keramik/config/config.cpp
@@ -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();
@@ -106,5 +106,3 @@ void KeramikConfig::defaults()
 	
 	emit changed();
 }
-
-// vim: set noet ts=4 sw=4:
diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h
index 886acb0f5..42f3a44e2 100644
--- a/twin/clients/keramik/config/config.h
+++ b/twin/clients/keramik/config/config.h
@@ -31,7 +31,7 @@
 
 class KeramikConfig: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
 	public:
@@ -54,5 +54,3 @@ class KeramikConfig: public TQObject
 
 
 #endif
-
-// vim: set noet ts=4 sw=4:
diff --git a/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp
index a635c4ee2..1cc56fe32 100644
--- a/twin/clients/keramik/embedtool.cpp
+++ b/twin/clients/keramik/embedtool.cpp
@@ -66,7 +66,7 @@ KeramikEmbedder::KeramikEmbedder()
 	file = new TQFile( "tiles.h" );
 	file->open( IO_WriteOnly | IO_Truncate );
 
-	stream.setDevice( TQT_TQIODEVICE(file) );
+	stream.setDevice( file );
 	
 	stream << "/*\n";
 	stream << " * Generated by embedtool 1.0 on " << datestring << endl;
@@ -86,7 +86,6 @@ KeramikEmbedder::~KeramikEmbedder()
 {	
 	stream << "} // namespace Keramik\n\n";
 	stream << "#endif // __TILES_H\n\n";
-	stream << "// vim: set noet ts=4 sw=4:\n";
 
 	file->close();
 	delete file;
@@ -102,7 +101,7 @@ void KeramikEmbedder::embed( const char *name )
 	
 	codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" );
 	
-	stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t";
+	stream << "\tstatic const TQRgb " << codename << "_data[] = {" << endl << "\t\t";
 	stream.setf( TQTextStream::hex | TQTextStream::right );
 	stream.fill( '0' );
 	
@@ -148,7 +147,7 @@ void KeramikEmbedder::writeIndex()
 	stream << "\t\tint width;\n";
 	stream << "\t\tint height;\n";
 	stream << "\t\tbool alpha;\n";
-	stream << "\t\tconst QRgb *data;\n";
+	stream << "\t\tconst TQRgb *data;\n";
 	stream << "\t};\n\n";
 
 	uint i = 0;
@@ -225,6 +224,3 @@ int main( int argv, char **argc )
 	
 	return 0;
 }
-
-// vim: set noet ts=4 sw=4:
-
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 7a5225cc7..942962693 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -411,18 +411,18 @@ void KeramikHandler::createPixmaps()
 	}
 
 	// Pretile the center & border tiles for optimal performance
-	pretile( activeTiles[ CaptionSmallCenter ], 64, Qt::Horizontal );
-	pretile( activeTiles[ CaptionLargeCenter ], 64, Qt::Horizontal );
-	pretile( activeTiles[ TitleCenter ], 64, Qt::Horizontal );
-	pretile( activeTiles[ GrabBarCenter ], 128, Qt::Horizontal );
-	pretile( activeTiles[ BorderLeft ], 128, Qt::Vertical );
-	pretile( activeTiles[ BorderRight ], 128, Qt::Vertical );
-
-	pretile( inactiveTiles[ CaptionSmallCenter ], 64, Qt::Horizontal );
-	pretile( inactiveTiles[ TitleCenter ], 64, Qt::Horizontal );
-	pretile( inactiveTiles[ GrabBarCenter ], 128, Qt::Horizontal );
-	pretile( inactiveTiles[ BorderLeft ], 128, Qt::Vertical );
-	pretile( inactiveTiles[ BorderRight ], 128, Qt::Vertical );
+	pretile( activeTiles[ CaptionSmallCenter ], 64, TQt::Horizontal );
+	pretile( activeTiles[ CaptionLargeCenter ], 64, TQt::Horizontal );
+	pretile( activeTiles[ TitleCenter ], 64, TQt::Horizontal );
+	pretile( activeTiles[ GrabBarCenter ], 128, TQt::Horizontal );
+	pretile( activeTiles[ BorderLeft ], 128, TQt::Vertical );
+	pretile( activeTiles[ BorderRight ], 128, TQt::Vertical );
+
+	pretile( inactiveTiles[ CaptionSmallCenter ], 64, TQt::Horizontal );
+	pretile( inactiveTiles[ TitleCenter ], 64, TQt::Horizontal );
+	pretile( inactiveTiles[ GrabBarCenter ], 128, TQt::Horizontal );
+	pretile( inactiveTiles[ BorderLeft ], 128, TQt::Vertical );
+	pretile( inactiveTiles[ BorderRight ], 128, TQt::Vertical );
 
 	if (heightOffset > 0) {
 		addHeight (heightOffset, activeTiles[TitleLeft]);
@@ -541,12 +541,12 @@ void KeramikHandler::flip( TQPixmap *&pix1, TQPixmap *&pix2 )
 }
 
 
-void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir )
+void KeramikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir )
 {
 	TQPixmap *newpix;
 	TQPainter p;
 
-	if ( dir == Qt::Horizontal )
+	if ( dir == TQt::Horizontal )
 		newpix = new TQPixmap( size, pix->height() );
 	else
 		newpix = new TQPixmap( pix->width(), size );
@@ -759,13 +759,13 @@ TQValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const
 
 KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const TQString &tip, const int realizeBtns )
 		: TQButton( c->widget(), name ),
-		client( c ), button( btn ), hover( false ), lastbutton( Qt::NoButton )
+		client( c ), button( btn ), hover( false ), lastbutton( TQt::NoButton )
 {
 	realizeButtons = realizeBtns;
 
 	TQToolTip::add( this, tip ); // FRAME
 	setBackgroundMode( NoBackground );
-        setCursor( tqarrowCursor );
+        setCursor( TQt::arrowCursor );
 	int size = clientHandler->roundButton()->height();
 	setFixedSize( size, size );
 
@@ -800,7 +800,7 @@ void KeramikButton::leaveEvent( TQEvent *e )
 void KeramikButton::mousePressEvent( TQMouseEvent *e )
 {
 	lastbutton = e->button();
-	TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() );
+	TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() );
 	TQButton::mousePressEvent( &me );
 }
 
@@ -808,7 +808,7 @@ void KeramikButton::mousePressEvent( TQMouseEvent *e )
 void KeramikButton::mouseReleaseEvent( TQMouseEvent *e )
 {
 	lastbutton = e->button();
-	TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() );
+	TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() );
 	TQButton::mouseReleaseEvent( &me );
 }
 
@@ -889,7 +889,7 @@ void KeramikButton::drawButton( TQPainter *p )
 			deco = NULL;
 	}
 
-	p->setPen( Qt::black ); // ### hardcoded color
+	p->setPen( TQt::black ); // ### hardcoded color
 	p->drawPixmap( (size-17)/2, (size-17)/2, *deco );
 }
 
@@ -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 );
@@ -1050,8 +1050,8 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			case 'M' :
 				if (!isModalSystemNotification()) {
 					if ( !button[MenuButton] ) {
-						button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton );
-						connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) );
+						button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), TQt::LeftButton|TQt::RightButton );
+						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;
@@ -1092,8 +1092,8 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 			// Maximize button
 			case 'A' :
 				if ( !button[MaxButton] && isMaximizable() ) {
-					button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton );
-					connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) );
+					button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton );
+					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;
@@ -1277,7 +1277,7 @@ void KeramikClient::updateCaptionBuffer()
 	TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
 				captionRect.height() - 4), captionBuffer.rect() );
 
-	//p.setPen( Qt::red ); // debug
+	//p.setPen( TQt::red ); // debug
 	//p.drawRect( tr );    // debug
 
 	// Application icon
@@ -1647,10 +1647,10 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 		int dy = 0;
 
 		if ( e->oldSize().width() != width() )
-			dx = 32 + QABS( e->oldSize().width() -  width() );
+			dx = 32 + TQABS( e->oldSize().width() -  width() );
 
 		if ( e->oldSize().height() != height() )
-			dy = 8 + QABS( e->oldSize().height() -  height() );
+			dy = 8 + TQABS( e->oldSize().height() -  height() );
 
 		if ( dy )
 			widget()->update( 0, height() - dy + 1, width(), dy );
@@ -1670,7 +1670,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 
 void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e )
 {
-	if ( e->button() == Qt::LeftButton
+	if ( e->button() == TQt::LeftButton
             && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
 		titlebarDblClickOperation();
 }
@@ -1796,29 +1796,29 @@ TQSize KeramikClient::minimumSize() const
 
 bool KeramikClient::eventFilter( TQObject* o, TQEvent* e )
 {
-	if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) )
+	if ( o != widget() )
 		return false;
 
 	switch ( e->type() )
 	{
 		case TQEvent::Resize:
-			resizeEvent( TQT_TQRESIZEEVENT( e ) );
+			resizeEvent( static_cast<TQResizeEvent*>( e ) );
 			return true;
 
 		case TQEvent::Paint:
-			paintEvent( TQT_TQPAINTEVENT( e ) );
+			paintEvent( static_cast<TQPaintEvent*>( e ) );
 			return true;
 
 		case TQEvent::MouseButtonDblClick:
-			mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) );
+			mouseDoubleClickEvent( static_cast<TQMouseEvent*>( e ) );
 			return true;
 
 		case TQEvent::MouseButtonPress:
-			processMousePressEvent( TQT_TQMOUSEEVENT( e ) );
+			processMousePressEvent( static_cast<TQMouseEvent*>( e ) );
 			return true;
 
 		case TQEvent::Wheel:
-			wheelEvent( TQT_TQWHEELEVENT( e ));
+			wheelEvent( static_cast<TQWheelEvent*>( e ));
 			return true;
 
 		default:
@@ -1842,7 +1842,3 @@ extern "C"
                 return Keramik::clientHandler;
 	}
 }
-
-
-
-// vim: set noet ts=4 sw=4:
diff --git a/twin/clients/keramik/keramik.desktop b/twin/clients/keramik/keramik.desktop
index fa51c6ea1..fde07b804 100644
--- a/twin/clients/keramik/keramik.desktop
+++ b/twin/clients/keramik/keramik.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Keramik
-X-TDE-Library=twin3_keramik
+X-TDE-Library=twin_keramik
diff --git a/twin/clients/keramik/keramik.h b/twin/clients/keramik/keramik.h
index 59f9960c5..7369b5346 100644
--- a/twin/clients/keramik/keramik.h
+++ b/twin/clients/keramik/keramik.h
@@ -92,7 +92,7 @@ namespace Keramik {
 			void addWidth  (int width,  TQPixmap *&pix, bool left, TQPixmap *bottomPix);
 			void addHeight (int height, TQPixmap *&pix);
 			void flip( TQPixmap *&, TQPixmap *& );
-			void pretile( TQPixmap *&, int, Qt::Orientation );
+			void pretile( TQPixmap *&, int, TQt::Orientation );
 			TQPixmap *composite( TQImage *, TQImage * );
 			TQImage  *loadImage( const TQString &, const TQColor & );
 			TQPixmap *loadPixmap( const TQString &, const TQColor & );
@@ -114,7 +114,7 @@ namespace Keramik {
 	class KeramikButton : public TQButton
 	{
 		public:
-			KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = Qt::LeftButton );
+			KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = TQt::LeftButton );
 			~KeramikButton();
 
 			ButtonState lastButton() const { return lastbutton; }
@@ -137,7 +137,7 @@ namespace Keramik {
 
 	class KeramikClient : public KDecoration
 	{
-		Q_OBJECT
+		TQ_OBJECT
 
 		public:
 
@@ -198,5 +198,3 @@ namespace Keramik {
 } // namespace Keramik
 
 #endif // ___KERAMIK_H
-
-// vim: set noet ts=4 sw=4:
diff --git a/twin/clients/kwmtheme/Makefile.am b/twin/clients/kwmtheme/Makefile.am
index e9d3c36b8..6a201bccf 100644
--- a/twin/clients/kwmtheme/Makefile.am
+++ b/twin/clients/kwmtheme/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS=cli_installer
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = twin3_kwmtheme.la
+kde_module_LTLIBRARIES = twin_kwmtheme.la
 
-twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
-twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_kwmtheme_la_LIBADD  = -ltdecorations
+twin_kwmtheme_la_SOURCES = kwmthemeclient.cpp
+twin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_kwmtheme_la_LIBADD  = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = kwmthemeclient.h
diff --git a/twin/clients/kwmtheme/kwmtheme.desktop b/twin/clients/kwmtheme/kwmtheme.desktop
index 69e066f63..b18ce962b 100644
--- a/twin/clients/kwmtheme/kwmtheme.desktop
+++ b/twin/clients/kwmtheme/kwmtheme.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=KWM Theme
-X-TDE-Library=twin3_kwmtheme
+X-TDE-Library=twin_kwmtheme
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 73c8feaca..defc8a3df 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -141,11 +141,11 @@ static void create_pixmaps()
     
     tmpStr = config->readEntry("TitleAlignment");
     if(tmpStr == "right")
-        titleAlign = Qt::AlignRight | Qt::AlignVCenter;
+        titleAlign = TQt::AlignRight | TQt::AlignVCenter;
     else if(tmpStr == "middle")
-        titleAlign = Qt::AlignCenter;
+        titleAlign = TQt::AlignCenter;
     else
-        titleAlign = Qt::AlignLeft | Qt::AlignVCenter;
+        titleAlign = TQt::AlignLeft | TQt::AlignVCenter;
     titleSunken = config->readBoolEntry("TitleFrameShaded", true);
     // titleSunken = true; // is this fixed?
     titleTransparent = config->readBoolEntry("PixmapUnderTitleText", true);
@@ -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);
         }
diff --git a/twin/clients/kwmtheme/kwmthemeclient.h b/twin/clients/kwmtheme/kwmthemeclient.h
index 58db3d14f..f611e89d2 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.h
+++ b/twin/clients/kwmtheme/kwmthemeclient.h
@@ -24,7 +24,7 @@ protected:
 
 class KWMThemeClient : public KDecoration
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KWMThemeClient( KDecorationBridge* b, KDecorationFactory* f );
     ~KWMThemeClient(){;}
diff --git a/twin/clients/laptop/CMakeLists.txt b/twin/clients/laptop/CMakeLists.txt
index 479de7a84..9fe25af3a 100644
--- a/twin/clients/laptop/CMakeLists.txt
+++ b/twin/clients/laptop/CMakeLists.txt
@@ -30,9 +30,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_laptop (module) #####################
+##### twin_laptop (module) #####################
 
-tde_add_kpart( twin3_laptop AUTOMOC
+tde_add_kpart( twin_laptop AUTOMOC
   SOURCES laptopclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/laptop/Makefile.am b/twin/clients/laptop/Makefile.am
index ccf1d359b..1788a8691 100644
--- a/twin/clients/laptop/Makefile.am
+++ b/twin/clients/laptop/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES = twin3_laptop.la
+kde_module_LTLIBRARIES = twin_laptop.la
 
-twin3_laptop_la_SOURCES = laptopclient.cpp
-twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
-twin3_laptop_la_LIBADD  = ../../lib/libtdecorations.la
+twin_laptop_la_SOURCES = laptopclient.cpp
+twin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 
+twin_laptop_la_LIBADD  = ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = laptopclient.h
diff --git a/twin/clients/laptop/laptop.desktop b/twin/clients/laptop/laptop.desktop
index 27f569634..060b0cce2 100644
--- a/twin/clients/laptop/laptop.desktop
+++ b/twin/clients/laptop/laptop.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Laptop
-X-TDE-Library=twin3_laptop
+X-TDE-Library=twin_laptop
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 34c79b2d6..30fb76b3a 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -121,11 +121,11 @@ static void create_pixmaps()
     int i, x, y;
     titlePix = new TQPixmap(33, 12);
     TQBitmap mask(33, 12);
-    mask.fill(Qt::color0);
+    mask.fill(TQt::color0);
 
     p.begin(titlePix);
     maskPainter.begin(&mask);
-    maskPainter.setPen(Qt::color1);
+    maskPainter.setPen(TQt::color1);
     for(i=0, y=2; i < 3; ++i, y+=4){
         for(x=1; x <= 33; x+=3){
             p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150));
@@ -221,9 +221,9 @@ static void create_pixmaps()
     drawButtonFrame(iBtnDownPix2, g, true);
 
     if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
-        btnForeground = Qt::black;
+        btnForeground = TQt::black;
     else
-        btnForeground = Qt::white;
+        btnForeground = TQt::white;
 }
 
 static void delete_pixmaps()
@@ -290,7 +290,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
         deco = TQBitmap(8, 8, bitmap, true);
     else {
         deco = TQBitmap(8,8);
-        deco.fill(Qt::color0);
+        deco.fill(TQt::color0);
     }
     deco.setMask(deco);
     repaint();
@@ -472,7 +472,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
     TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
 
     TQRect r(widget()->rect());
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
     p.drawRect(r);
 
     // fill mid frame...
@@ -757,5 +757,3 @@ void LaptopClientFactory::findPreferredHandleSize()
 }
 
 } // Laptop namespace
-
-// vim: sw=4
diff --git a/twin/clients/modernsystem/CMakeLists.txt b/twin/clients/modernsystem/CMakeLists.txt
index 5bb92031e..166e3aae5 100644
--- a/twin/clients/modernsystem/CMakeLists.txt
+++ b/twin/clients/modernsystem/CMakeLists.txt
@@ -31,9 +31,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_modernsys (module) ##################
+##### twin_modernsys (module) ##################
 
-tde_add_kpart( twin3_modernsys
+tde_add_kpart( twin_modernsys
   SOURCES modernsys.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/modernsystem/Makefile.am b/twin/clients/modernsystem/Makefile.am
index e4c21d7a3..902669685 100644
--- a/twin/clients/modernsystem/Makefile.am
+++ b/twin/clients/modernsystem/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = config
 
-kde_module_LTLIBRARIES = twin3_modernsys.la
+kde_module_LTLIBRARIES = twin_modernsys.la
 
-twin3_modernsys_la_SOURCES = modernsys.cpp
-twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
-twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_modernsys_la_SOURCES = modernsys.cpp
+twin_modernsys_la_LIBADD = ../../lib/libtdecorations.la
+twin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = modernsys.h
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 18d6870f7..187278d43 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -44,15 +44,15 @@ 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, Qt::Horizontal, sliderBox);
+	handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox);
 	TQWhatsThis::add(handleSizeSlider,
 			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);
diff --git a/twin/clients/modernsystem/config/config.h b/twin/clients/modernsystem/config/config.h
index 20ce5539e..004dd9855 100644
--- a/twin/clients/modernsystem/config/config.h
+++ b/twin/clients/modernsystem/config/config.h
@@ -10,7 +10,7 @@
 
 class ModernSysConfig : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ModernSysConfig(TDEConfig* conf, TQWidget* parent);
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index 68c8716c4..94615b190 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -185,9 +185,9 @@ static void create_pixmaps()
 
 
     if(tqGray(btnColor.background().rgb()) < 150)
-        buttonFg = new TQColor(Qt::white);
+        buttonFg = new TQColor(TQt::white);
     else
-        buttonFg = new TQColor(Qt::black);
+        buttonFg = new TQColor(TQt::black);
 
     delete lcDark1;
     delete lcDark2;
@@ -342,7 +342,7 @@ void ModernButton::setBitmap(const unsigned char *bitmap)
         deco = TQBitmap(8, 8, bitmap, true);
     else {
         deco = TQBitmap(8,8);
-        deco.fill(Qt::color0);
+        deco.fill(TQt::color0);
     }
     deco.setMask(deco);
 }
@@ -631,7 +631,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
         p.drawLine(width()-hw, height()-hs-1, width()-4, height()-hs-1);
         p.drawLine(width()-hs-1, height()-hw, width()-hs-1, height()-4);
 
-        p.setPen(Qt::black);
+        p.setPen(TQt::black);
         p.drawRect(0, 0, w, h);
 
         // handle outline
@@ -640,7 +640,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
         p.drawLine(width()-hs, height()-2, width()-2, height()-2);
         p.drawLine(width()-hs, height()-hw, width()-hs, height()-2);
     } else {
-        p.setPen(Qt::black);
+        p.setPen(TQt::black);
         p.drawRect(0, 0, w, h);
     }
 }
@@ -735,5 +735,3 @@ extern "C" KDE_EXPORT KDecorationFactory* create_factory()
 {
     return new ModernSystem::ModernSysFactory();
 }
-
-// vim:ts=4:sw=4
diff --git a/twin/clients/modernsystem/modernsystem.desktop b/twin/clients/modernsystem/modernsystem.desktop
index 85a301733..76601f9f2 100644
--- a/twin/clients/modernsystem/modernsystem.desktop
+++ b/twin/clients/modernsystem/modernsystem.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Modern System
-X-TDE-Library=twin3_modernsys
+X-TDE-Library=twin_modernsys
diff --git a/twin/clients/plastik/CMakeLists.txt b/twin/clients/plastik/CMakeLists.txt
index 695468994..8e920bdc2 100644
--- a/twin/clients/plastik/CMakeLists.txt
+++ b/twin/clients/plastik/CMakeLists.txt
@@ -34,9 +34,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_plastik (module) ####################
+##### twin_plastik (module) ####################
 
-tde_add_kpart( twin3_plastik AUTOMOC
+tde_add_kpart( twin_plastik AUTOMOC
   SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/plastik/Makefile.am b/twin/clients/plastik/Makefile.am
index c1757891d..0afee676a 100644
--- a/twin/clients/plastik/Makefile.am
+++ b/twin/clients/plastik/Makefile.am
@@ -9,11 +9,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 twindir = $(kde_datadir)/twin/
 twin_DATA = plastik.desktop
 
-kde_module_LTLIBRARIES = twin3_plastik.la
-twin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
-twin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
-twin3_plastik_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = twin_plastik.la
+twin_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
+twin_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin_plastik_la_METASOURCES = AUTO
 
-DISTCLEANFILES = $(twin3_plastik_la_METASOURCES)
+DISTCLEANFILES = $(twin_plastik_la_METASOURCES)
 
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index 04658796c..81192f699 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()
diff --git a/twin/clients/plastik/config/config.h b/twin/clients/plastik/config/config.h
index 73231c50f..d83ebf149 100644
--- a/twin/clients/plastik/config/config.h
+++ b/twin/clients/plastik/config/config.h
@@ -32,7 +32,7 @@ class ConfigDialog;
 
 class PlastikConfig : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PlastikConfig(TDEConfig* config, TQWidget* parent);
     ~PlastikConfig();
diff --git a/twin/clients/plastik/config/configdialog.ui b/twin/clients/plastik/config/configdialog.ui
index f751d8024..505d91b06 100644
--- a/twin/clients/plastik/config/configdialog.ui
+++ b/twin/clients/plastik/config/configdialog.ui
@@ -66,9 +66,6 @@
             <property name="text">
                 <string>Colored window border</string>
             </property>
-            <property name="accel">
-                <string></string>
-            </property>
             <property name="whatsThis" stdset="0">
                 <string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string>
             </property>
diff --git a/twin/clients/plastik/misc.cpp b/twin/clients/plastik/misc.cpp
index 1b259d383..053cf15ea 100644
--- a/twin/clients/plastik/misc.cpp
+++ b/twin/clients/plastik/misc.cpp
@@ -54,8 +54,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
 {
 
     // normal button...
-    QRgb rgb = bgColor.rgb();
-    QRgb rgb_b = fgColor.rgb();
+    TQRgb rgb = bgColor.rgb();
+    TQRgb rgb_b = fgColor.rgb();
     int alpha = a;
     if(alpha>255) alpha = 255;
     if(alpha<0) alpha = 0;
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index b5cdeb85b..b5a4808d7 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -185,9 +185,9 @@ void PlastikHandler::readConfig()
         m_titleHeightTool++;
 
     TQString value = config.readEntry("TitleAlignment", "AlignLeft");
-    if (value == "AlignLeft")         m_titleAlign = Qt::AlignLeft;
-    else if (value == "AlignHCenter") m_titleAlign = Qt::AlignHCenter;
-    else if (value == "AlignRight")   m_titleAlign = Qt::AlignRight;
+    if (value == "AlignLeft")         m_titleAlign = TQt::AlignLeft;
+    else if (value == "AlignHCenter") m_titleAlign = TQt::AlignHCenter;
+    else if (value == "AlignRight")   m_titleAlign = TQt::AlignRight;
 
     m_coloredBorder = config.readBoolEntry("ColoredBorder", true);
     m_animateButtons = config.readBoolEntry("AnimateButtons", true);
@@ -210,27 +210,27 @@ TQColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active)
             break;
         case ShadeTitleLight:
             return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active),
-                                    Qt::white, active?205:215);
+                                    TQt::white, active?205:215);
             break;
         case ShadeTitleDark:
             return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active),
-                                    Qt::black, active?205:215);
+                                    TQt::black, active?205:215);
             break;
         case Border:
             return KDecoration::options()->color(ColorFrame, active);
         case TitleFont:
             return KDecoration::options()->color(ColorFont, active);
         default:
-            return Qt::black;
+            return TQt::black;
     }
 }
 
-void PlastikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) const
+void PlastikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir ) const
 {
     TQPixmap *newpix;
     TQPainter p;
 
-    if ( dir == Qt::Horizontal )
+    if ( dir == TQt::Horizontal )
         newpix = new TQPixmap( size, pix->height() );
     else
         newpix = new TQPixmap( pix->width(), size );
@@ -300,7 +300,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
                 painter.end();
             }
 
-            pretile(pm, 64, Qt::Horizontal);
+            pretile(pm, 64, TQt::Horizontal);
 
             break;
         }
@@ -399,7 +399,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
 
             painter.end();
 
-            pretile(pm, 64, Qt::Vertical);
+            pretile(pm, 64, TQt::Vertical);
 
             break;
         }
@@ -433,7 +433,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
             }
             painter.end();
 
-            pretile(pm, 64, Qt::Vertical);
+            pretile(pm, 64, TQt::Vertical);
 
             break;
         }
@@ -523,7 +523,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
             painter.drawPoint(0, h-1);
             painter.end();
 
-            pretile(pm, 64, Qt::Horizontal);
+            pretile(pm, 64, TQt::Horizontal);
 
             break;
         }
diff --git a/twin/clients/plastik/plastik.desktop b/twin/clients/plastik/plastik.desktop
index cbe609785..564f33e5c 100644
--- a/twin/clients/plastik/plastik.desktop
+++ b/twin/clients/plastik/plastik.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Plastik
-X-TDE-Library=twin3_plastik
+X-TDE-Library=twin_plastik
diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h
index a4c1bc5b7..558ac848a 100644
--- a/twin/clients/plastik/plastik.h
+++ b/twin/clients/plastik/plastik.h
@@ -73,7 +73,7 @@ enum ButtonIcon {
 
 class PlastikHandler: public TQObject, public KDecorationFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PlastikHandler();
     ~PlastikHandler();
@@ -93,7 +93,7 @@ public:
     int  borderSize() { return m_borderSize; }
     bool animateButtons() { return m_animateButtons; }
     bool menuClose() { return m_menuClose; }
-    TQ_Alignment titleAlign() { return m_titleAlign; }
+    TQt::AlignmentFlags titleAlign() { return m_titleAlign; }
     bool reverseLayout() { return m_reverse; }
     TQColor getColor(KWinPlastik::ColorType type, const bool active = true);
 
@@ -101,7 +101,7 @@ public:
 private:
     void readConfig();
 
-    void pretile(TQPixmap *&pix, int size, Qt::Orientation dir) const;
+    void pretile(TQPixmap *&pix, int size, TQt::Orientation dir) const;
 
     bool m_coloredBorder;
     bool m_titleShadow;
@@ -113,7 +113,7 @@ private:
     int  m_titleHeightTool;
     TQFont m_titleFont;
     TQFont m_titleFontTool;
-    TQ_Alignment m_titleAlign;
+    TQt::AlignmentFlags m_titleAlign;
 
     // pixmap cache
     TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state...
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 3a097be15..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;
 }
 
@@ -170,17 +170,17 @@ void PlastikButton::drawButton(TQPainter *painter)
     if(type() == CloseButton) {
         highlightColor = TQColor(255,64,0);
     } else {
-        highlightColor = Qt::white;
+        highlightColor = TQt::white;
     }
 
     TQColor contourTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
-            Qt::black, 215);
+            TQt::black, 215);
     TQColor contourBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
-            Qt::black, 215);
+            TQt::black, 215);
     TQColor sourfaceTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active),
-            Qt::white, 210);
+            TQt::white, 210);
     TQColor sourfaceBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active),
-            Qt::white, 210);
+            TQt::white, 210);
 
     int highlightAlpha = static_cast<int>(255-((60/static_cast<double>(ANIMATIONSTEPS))*
                                           static_cast<double>(animProgress) ) );
@@ -190,10 +190,10 @@ void PlastikButton::drawButton(TQPainter *painter)
     sourfaceBottom = alphaBlendColors(sourfaceBottom, highlightColor, highlightAlpha);
 
     if (isDown() ) {
-        contourTop = alphaBlendColors(contourTop, Qt::black, 200);
-        contourBottom = alphaBlendColors(contourBottom, Qt::black, 200);
-        sourfaceTop = alphaBlendColors(sourfaceTop, Qt::black, 200);
-        sourfaceBottom = alphaBlendColors(sourfaceBottom, Qt::black, 200);
+        contourTop = alphaBlendColors(contourTop, TQt::black, 200);
+        contourBottom = alphaBlendColors(contourBottom, TQt::black, 200);
+        sourfaceTop = alphaBlendColors(sourfaceTop, TQt::black, 200);
+        sourfaceBottom = alphaBlendColors(sourfaceBottom, TQt::black, 200);
     }
 
     TQPixmap buffer;
@@ -291,10 +291,10 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size)
         --size;
 
     TQBitmap bitmap(size,size);
-    bitmap.fill(Qt::color0);
+    bitmap.fill(TQt::color0);
     TQPainter p(&bitmap);
 
-    p.setPen(Qt::color1);
+    p.setPen(TQt::color1);
 
     TQRect r = bitmap.rect();
 
diff --git a/twin/clients/plastik/plastikbutton.h b/twin/clients/plastik/plastikbutton.h
index dbebcf63f..6deaa56f6 100644
--- a/twin/clients/plastik/plastikbutton.h
+++ b/twin/clients/plastik/plastikbutton.h
@@ -37,7 +37,7 @@ class PlastikClient;
 
 class PlastikButton : public KCommonDecorationButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PlastikButton(ButtonType type, PlastikClient *parent, const char *name);
     ~PlastikButton();
@@ -65,7 +65,7 @@ private:
 /**
  * This class creates bitmaps which can be used as icons on buttons. The icons
  * are "hardcoded".
- * Over the previous "Gimp->xpm->QImage->recolor->SmoothScale->TQPixmap" solution
+ * Over the previous "Gimp->xpm->TQImage->recolor->SmoothScale->TQPixmap" solution
  * it has the important advantage that icons are more scalable and at the same
  * time sharp and not blurred.
  */
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index 31c9e2ad9..bb2c465a6 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -394,7 +394,7 @@ TQRect PlastikClient::captionRect() const
             buttonsLeftWidth() - buttonsRightWidth() -
             marginLeft - marginRight;
 
-    TQ_Alignment a = Handler()->titleAlign();
+    TQt::AlignmentFlags a = Handler()->titleAlign();
 
     int tX, tW; // position/width of the title buffer
     if (caption.width() >  titleWidth) {
@@ -402,10 +402,10 @@ TQRect PlastikClient::captionRect() const
     } else {
         tW = caption.width();
     }
-    if (a == Qt::AlignLeft || (caption.width() > titleWidth) ) {
+    if (a == TQt::AlignLeft || (caption.width() > titleWidth) ) {
         // Align left
         tX = titleLeft;
-    } else if (a == Qt::AlignHCenter) {
+    } else if (a == TQt::AlignHCenter) {
         // Align center
         tX = titleLeft+(titleWidth- caption.width() )/2;
     } else {
diff --git a/twin/clients/quartz/CMakeLists.txt b/twin/clients/quartz/CMakeLists.txt
index 49d56d419..70d9fb49a 100644
--- a/twin/clients/quartz/CMakeLists.txt
+++ b/twin/clients/quartz/CMakeLists.txt
@@ -32,9 +32,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_quartz (module) #####################
+##### twin_quartz (module) #####################
 
-tde_add_kpart( twin3_quartz AUTOMOC
+tde_add_kpart( twin_quartz AUTOMOC
   SOURCES quartz.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/quartz/Makefile.am b/twin/clients/quartz/Makefile.am
index 3a5709773..ae69a53a6 100644
--- a/twin/clients/quartz/Makefile.am
+++ b/twin/clients/quartz/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = twin3_quartz.la
+kde_module_LTLIBRARIES = twin_quartz.la
 
-twin3_quartz_la_SOURCES = quartz.cpp
-twin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_quartz_la_LIBADD  = $(LIB_TDEUI)  ../../lib/libtdecorations.la
+twin_quartz_la_SOURCES = quartz.cpp
+twin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_quartz_la_LIBADD  = $(LIB_TDEUI)  ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = quartz.h
diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index 3ce86239b..106ea28dc 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -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();
@@ -101,4 +101,3 @@ void QuartzConfig::defaults()
 }
 
 #include "config.moc"
-// vim: ts=4
diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h
index f68b9ef27..a468d8703 100644
--- a/twin/clients/quartz/config/config.h
+++ b/twin/clients/quartz/config/config.h
@@ -16,7 +16,7 @@
 
 class QuartzConfig: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		QuartzConfig( TDEConfig* conf, TQWidget* parent );
@@ -43,5 +43,3 @@ class QuartzConfig: public TQObject
 
 
 #endif
-
-// vim: ts=4
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 511fafa6f..dff79ff4b 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -463,7 +463,7 @@ void QuartzButton::drawButton(TQPainter *p)
 	{
 		int xOff = (width()-10)/2;
 		int yOff = (height()-10)/2;
-		p->setPen( Qt::black );
+		p->setPen( TQt::black );
 		p->drawPixmap(isDown() ? xOff+2: xOff+1, isDown() ? yOff+2 : yOff+1, *deco);
 		p->setPen( KDecoration::options()->color(KDecoration::ColorButtonBg, decoration()->isActive()).light(150) );
 		p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco);
@@ -723,7 +723,7 @@ void QuartzClient::paintEvent( TQPaintEvent* )
     // Draw the title bar.
     // ===================
     int r_x, r_y, r_x2, r_y2;
-    TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2);
+    widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
     const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
     const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
     const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
@@ -793,5 +793,3 @@ extern "C"
 
 
 #include "quartz.moc"
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/clients/quartz/quartz.desktop b/twin/clients/quartz/quartz.desktop
index 8083eec1f..ef69ddda3 100644
--- a/twin/clients/quartz/quartz.desktop
+++ b/twin/clients/quartz/quartz.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Quartz
-X-TDE-Library=twin3_quartz
+X-TDE-Library=twin_quartz
diff --git a/twin/clients/quartz/quartz.h b/twin/clients/quartz/quartz.h
index ddb68ced3..d0db8b103 100644
--- a/twin/clients/quartz/quartz.h
+++ b/twin/clients/quartz/quartz.h
@@ -30,7 +30,7 @@ class QuartzClient;
 
 class QuartzHandler: public TQObject, public KDecorationFactory
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		QuartzHandler();
 		~QuartzHandler();
@@ -91,5 +91,3 @@ class QuartzClient : public KCommonDecoration
 }
 
 #endif
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/clients/redmond/CMakeLists.txt b/twin/clients/redmond/CMakeLists.txt
index 7240233a0..17a13bac9 100644
--- a/twin/clients/redmond/CMakeLists.txt
+++ b/twin/clients/redmond/CMakeLists.txt
@@ -30,9 +30,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_redmond (module) ####################
+##### twin_redmond (module) ####################
 
-tde_add_kpart( twin3_redmond AUTOMOC
+tde_add_kpart( twin_redmond AUTOMOC
   SOURCES redmond.cpp
   LINK tdecorations-shared tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/redmond/Makefile.am b/twin/clients/redmond/Makefile.am
index 39985f347..c00af257e 100644
--- a/twin/clients/redmond/Makefile.am
+++ b/twin/clients/redmond/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES = twin3_redmond.la
+kde_module_LTLIBRARIES = twin_redmond.la
 
-twin3_redmond_la_SOURCES = redmond.cpp
-twin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
+twin_redmond_la_SOURCES = redmond.cpp
+twin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = redmond.h
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index f3689af52..6deddeaee 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -210,9 +210,9 @@ static void create_pixmaps ()
 
     // Make sure button pixmaps contrast with the current colour scheme.
     if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
-        btnForeground = new TQColor(Qt::black);
+        btnForeground = new TQColor(TQt::black);
     else
-        btnForeground = new TQColor(Qt::white);
+        btnForeground = new TQColor(TQt::white);
 }
 
 void delete_pixmaps()
@@ -283,7 +283,7 @@ void RedmondButton::setBitmap(const unsigned char *bitmap)
 		deco = TQBitmap(10, 10, bitmap, true);
 	else {
 		deco = TQBitmap(10,10);
-		deco.fill(Qt::color0);
+		deco.fill(TQt::color0);
 	}
 	deco.setMask(deco);
 }
@@ -556,7 +556,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* )
             TQImage image = KImageEffect::gradient(titleBuffer->size(), c1, c2,
                                     KImageEffect::HorizontalGradient);
 
-            titleBuffer->convertFromImage(image, Qt::OrderedDither);
+            titleBuffer->convertFromImage(image, TQt::OrderedDither);
         }
 
         TQPainter p2( titleBuffer, this );
@@ -695,5 +695,3 @@ extern "C" KDE_EXPORT KDecorationFactory *create_factory()
 
 
 #include "redmond.moc"
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/clients/redmond/redmond.desktop b/twin/clients/redmond/redmond.desktop
index d6bf0a9b0..68a360be0 100644
--- a/twin/clients/redmond/redmond.desktop
+++ b/twin/clients/redmond/redmond.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Redmond
-X-TDE-Library=twin3_redmond
+X-TDE-Library=twin_redmond
diff --git a/twin/clients/redmond/redmond.h b/twin/clients/redmond/redmond.h
index e5f15b8ba..3ef7337fb 100644
--- a/twin/clients/redmond/redmond.h
+++ b/twin/clients/redmond/redmond.h
@@ -29,7 +29,7 @@ class RedmondDeco;
 
 class RedmondButton : public KCommonDecorationButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	RedmondButton(ButtonType type, RedmondDeco *parent, const char *name);
 	void setBitmap(const unsigned char *bitmap);
@@ -72,7 +72,7 @@ private:
 
 class RedmondDecoFactory : public TQObject, public KDecorationFactory
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	RedmondDecoFactory();
 	virtual ~RedmondDecoFactory();
@@ -87,5 +87,3 @@ private:
 }
 
 #endif
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/clients/test/Makefile.am b/twin/clients/test/Makefile.am
index 07ac72c02..f25bc0b3e 100644
--- a/twin/clients/test/Makefile.am
+++ b/twin/clients/test/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES                  = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES    = twin3_test.la
+kde_module_LTLIBRARIES    = twin_test.la
 
-twin3_test_la_SOURCES   = test.cpp
-twin3_test_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_test_la_LIBADD    = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin_test_la_SOURCES   = test.cpp
+twin_test_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module
+twin_test_la_LIBADD    = $(LIB_TDEUI) ../../lib/libtdecorations.la
 #twin_keramik_la_LDFLAGS   = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
 
 METASOURCES               = AUTO
diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp
index e01d1d98e..0cf45a90b 100644
--- a/twin/clients/test/test.cpp
+++ b/twin/clients/test/test.cpp
@@ -22,9 +22,9 @@ void Decoration::init()
 	{
         button = new TQPushButton( widget());
         button->show();
-        button->setCursor( tqarrowCursor );
+        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" );
 	}
     }
@@ -100,13 +100,13 @@ TQSize Decoration::minimumSize() const
     
 bool Decoration::eventFilter( TQObject* o, TQEvent* e )
     {
-    if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(widget()))
+    if( o == widget())
         {
         switch( e->type())
             {
             case TQEvent::MouseButtonPress:
 	        { // FRAME
-                processMousePressEvent( TQT_TQMOUSEEVENT( e ));
+                processMousePressEvent( static_cast<TQMouseEvent*>( e ));
         	return true;
 	        }
             case TQEvent::Show:
diff --git a/twin/clients/test/test.desktop b/twin/clients/test/test.desktop
index 04e9ebaeb..17a13bad8 100644
--- a/twin/clients/test/test.desktop
+++ b/twin/clients/test/test.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=KWin test
-X-TDE-Library=twin3_test
+X-TDE-Library=twin_test
diff --git a/twin/clients/test/test.h b/twin/clients/test/test.h
index bfe36fa7c..f735df6c4 100644
--- a/twin/clients/test/test.h
+++ b/twin/clients/test/test.h
@@ -15,7 +15,7 @@ const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET
 class Decoration
     : public KDecoration
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	Decoration( KDecorationBridge* bridge, KDecorationFactory* factory );
         virtual void init();
diff --git a/twin/clients/web/CMakeLists.txt b/twin/clients/web/CMakeLists.txt
index 6045bcbb0..5547dabe7 100644
--- a/twin/clients/web/CMakeLists.txt
+++ b/twin/clients/web/CMakeLists.txt
@@ -29,9 +29,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_web (module) ########################
+##### twin_web (module) ########################
 
-tde_add_kpart( twin3_web AUTOMOC
+tde_add_kpart( twin_web AUTOMOC
   SOURCES Web.cpp WebButton.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/web/Makefile.am b/twin/clients/web/Makefile.am
index 4855602ca..ba3efcb59 100644
--- a/twin/clients/web/Makefile.am
+++ b/twin/clients/web/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES                  = -I$(top_srcdir) $(all_includes)
-kde_module_LTLIBRARIES    = twin3_web.la
+kde_module_LTLIBRARIES    = twin_web.la
 
-twin3_web_la_SOURCES      = Web.cpp WebButton.cpp
+twin_web_la_SOURCES      = Web.cpp WebButton.cpp
 
 noinst_HEADERS            = Web.h WebButton.h
 
-twin3_web_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_web_la_LIBADD       = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin_web_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module
+twin_web_la_LIBADD       = $(LIB_TDEUI) ../../lib/libtdecorations.la
 METASOURCES               = AUTO
 
 linkdir                   = $(kde_datadir)/twin/
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 496187d3b..5c2457e1c 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -216,7 +216,7 @@ WebClient::reset( unsigned long changed )
 WebClient::paintEvent(TQPaintEvent * pe)
 {
   int r_x, r_y, r_x2, r_y2;
-  TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2);
+  widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
   const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
   const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
   const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
@@ -230,7 +230,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
 
   TQPainter p(widget());
 
-  p.setPen(Qt::black);
+  p.setPen(TQt::black);
   p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
 
   p.setClipRegion(pe->region() - titleRect);
@@ -381,5 +381,3 @@ TQValueList< WebFactory::BorderSize > WebFactory::borderSizes() const
 }
 
 #include "Web.moc"
-// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/twin/clients/web/Web.h b/twin/clients/web/Web.h
index ec1b08dc5..175928c91 100644
--- a/twin/clients/web/Web.h
+++ b/twin/clients/web/Web.h
@@ -69,7 +69,7 @@ namespace Web
 
   class WebFactory : public TQObject, public KDecorationFactory
   {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
@@ -83,5 +83,3 @@ namespace Web
 }
 
 #endif
-// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp
index 785abe699..eb6d8d530 100644
--- a/twin/clients/web/WebButton.cpp
+++ b/twin/clients/web/WebButton.cpp
@@ -170,7 +170,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
 
         p->drawLine(0, 0, width(), 0);
         p->drawLine(0, 1, 0, height() - 1);
@@ -207,7 +207,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
         p->drawLine(0, 0, width(), 0);
         p->drawLine(width() - 1, 1, width() - 1, height() - 1);
         if (shape_)
@@ -244,7 +244,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
         p->drawLine(0, 0, width(), 0);
 
         // Draw highlight.
@@ -266,7 +266,7 @@ WebButton::drawButton(TQPainter *p)
   int bhby2(bitmap_.height() / 2);   // Bitmap Height BY 2
 
   p->setBrush(NoBrush);
-  p->setPen(Qt::black);
+  p->setPen(TQt::black);
 
   p->drawPixmap(center.x() - bwby2 + 1, center.y() - bhby2 + 1, bitmap_);
 }
@@ -282,6 +282,3 @@ WebButton::setBitmap(const unsigned char *bitmap)
 }
 
 }
-
-// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/twin/clients/web/WebButton.h b/twin/clients/web/WebButton.h
index a5eb8867e..1dbb2faac 100644
--- a/twin/clients/web/WebButton.h
+++ b/twin/clients/web/WebButton.h
@@ -65,6 +65,3 @@ namespace Web
 }
 
 #endif
-
-// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/twin/clients/web/web.desktop b/twin/clients/web/web.desktop
index 10a05ccf1..e850418a4 100644
--- a/twin/clients/web/web.desktop
+++ b/twin/clients/web/web.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Web
-X-TDE-Library=twin3_web
+X-TDE-Library=twin_web
diff --git a/twin/compton-tde/compton.c b/twin/compton-tde/compton.c
index 0c1b056ee..2e76cb6b3 100644
--- a/twin/compton-tde/compton.c
+++ b/twin/compton-tde/compton.c
@@ -161,7 +161,11 @@ void delete_pid_file()
         printf("compton-tde lost connection to X server, restarting...\n"); fflush(stdout);
         sleep(1);
         char me[2048];
+#ifdef Q_OS_SOLARIS
+        int chars = readlink("/proc/self/path/a.out", me, sizeof(me));
+#else /* default */
         int chars = readlink("/proc/self/exe", me, sizeof(me));
+#endif /* self exe */
         me[chars] = 0;
         me[2047] = 0;
 	execl(me, basename(me), (char*)NULL);
@@ -3250,7 +3254,7 @@ win_determine_greyscale_background(session_t *ps, win *w) {
   if (IsViewable != w->a.map_state)
     return;
 
-  bool greyscale_background_new = (determine_window_transparency_filter_greyscale(ps, &w->id) ||
+  bool greyscale_background_new = (determine_window_transparency_filter_greyscale(ps, w->id) ||
     (ps->o.greyscale_background && !win_match(ps, w, ps->o.greyscale_background_blacklist, &w->cache_bbblst)));
 
   win_set_greyscale_background(ps, w, greyscale_background_new);
diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt
index 840c5afcf..df0b79f88 100644
--- a/twin/data/CMakeLists.txt
+++ b/twin/data/CMakeLists.txt
@@ -22,13 +22,13 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd
+    twin.upd twinsticky.upd twiniconify.upd
     twin_focus1.upd twinupdatewindowsettings.upd
     twin_focus2.upd twin_fsp_workarounds_1.upd
   DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( PROGRAMS
-    pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
+    pluginlibFix.pl twin_focus1.sh twin_focus2.sh
   DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
 install( FILES
diff --git a/twin/data/Makefile.am b/twin/data/Makefile.am
index 0a2dab482..64ce6ab81 100644
--- a/twin/data/Makefile.am
+++ b/twin/data/Makefile.am
@@ -16,9 +16,9 @@ METASOURCES = AUTO
 sounddir= $(kde_sounddir)
 sound_DATA = pop.wav
 
-update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
+update_DATA = twin.upd twinsticky.upd twiniconify.upd twin_focus1.upd \
         twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd
-update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
+update_SCRIPTS = pluginlibFix.pl twin_focus1.sh twin_focus2.sh
 updatedir = $(kde_datadir)/tdeconf_update
 
 twin_default_rules_DATA = fsp_workarounds_1.twinrules
diff --git a/twin/data/twin3_plugin.pl b/twin/data/twin3_plugin.pl
deleted file mode 100644
index f5234bcce..000000000
--- a/twin/data/twin3_plugin.pl
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-foreach (<>) {
-    if(/^PluginLib=twin_(.*)$/) {
-        print "PluginLib=twin3_$1\n"; 
-        next;
-    }
-    print $_;
-}
diff --git a/twin/data/twin3_plugin.upd b/twin/data/twin3_plugin.upd
deleted file mode 100644
index 7194b5641..000000000
--- a/twin/data/twin3_plugin.upd
+++ /dev/null
@@ -1,4 +0,0 @@
-Id=trinity.2
-File=twinrc
-Options=overwrite
-Script=twin3_plugin.pl,perl
diff --git a/twin/events.cpp b/twin/events.cpp
index e9f8fd484..3d3ba999c 100644
--- a/twin/events.cpp
+++ b/twin/events.cpp
@@ -194,10 +194,10 @@ void RootInfo::changeShowingDesktop( bool showing )
  */
 bool Workspace::workspaceEvent( XEvent * e )
     {
-    if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease ) ) 
+    if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease ) )
         {
         mouse_emulation = FALSE;
-        XUngrabKeyboard( tqt_xdisplay(), GET_QT_X_TIME() );
+        XUngrabKeyboard( tqt_xdisplay(), get_tqt_x_time() );
         }
 
     if( e->type == PropertyNotify || e->type == ClientMessage )
@@ -211,7 +211,7 @@ bool Workspace::workspaceEvent( XEvent * e )
         }
 
     // events that should be handled before Clients can get them
-    switch (e->type) 
+    switch (e->type)
         {
         case ButtonPress:
         case ButtonRelease:
@@ -284,7 +284,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             return true;
         }
 
-    switch (e->type) 
+    switch (e->type)
         {
         case CreateNotify:
             if ( e->xcreatewindow.parent == root &&
@@ -292,18 +292,18 @@ bool Workspace::workspaceEvent( XEvent * e )
                  !e->xcreatewindow.override_redirect )
             {
         // see comments for allowClientActivation()
-            Time my_qtx_time = GET_QT_X_TIME();
+            Time my_qtx_time = get_tqt_x_time();
             XChangeProperty(tqt_xdisplay(), e->xcreatewindow.window,
                             atoms->kde_net_wm_user_creation_time, XA_CARDINAL,
                             32, PropModeReplace, (unsigned char *)&my_qtx_time, 1);
-            SET_QT_X_TIME(my_qtx_time);
+            set_tqt_x_time(my_qtx_time);
             }
         break;
 
     case UnmapNotify:
             {
         // check for system tray windows
-            if ( removeSystemTrayWin( e->xunmap.window, true ) ) 
+            if ( removeSystemTrayWin( e->xunmap.window, true ) )
                 {
 	    // If the system tray gets destroyed, the system tray
 	    // icons automatically get unmapped, reparented and mapped
@@ -317,7 +317,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                 if ( XCheckTypedWindowEvent (tqt_xdisplay(), w,
                                              ReparentNotify, &ev) )
                     {
-                    if ( ev.xreparent.parent != root ) 
+                    if ( ev.xreparent.parent != root )
                         {
                         XReparentWindow( tqt_xdisplay(), w, root, 0, 0 );
                         addSystemTrayWin( w );
@@ -351,7 +351,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             // e->xmaprequest.window is different from e->xany.window
             // TODO this shouldn't be necessary now
             Client* c = findClient( WindowMatchPredicate( e->xmaprequest.window ));
-            if ( !c ) 
+            if ( !c )
                 {
 // don't check for the parent being the root window, this breaks when some app unmaps
 // a window, changes something and immediately maps it back, without giving KWin
@@ -364,7 +364,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                 if ( addSystemTrayWin( e->xmaprequest.window ) )
                     return TRUE;
                 c = createClient( e->xmaprequest.window, false );
-                if ( c != NULL && root != tqt_xrootwin() ) 
+                if ( c != NULL && root != tqt_xrootwin() )
                     { // TODO what is this?
                     // TODO may use TQWidget::create
                     XReparentWindow( tqt_xdisplay(), c->frameId(), root, 0, 0 );
@@ -389,7 +389,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                 if ( w )
                     TQWhatsThis::leaveWhatsThisMode();
                 }
-            if( electricBorder(e))
+            if (activeBorderEvent(e))
                 return true;
             break;
             }
@@ -405,7 +405,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             }
         case ConfigureRequest:
             {
-            if ( e->xconfigurerequest.parent == root ) 
+            if ( e->xconfigurerequest.parent == root )
                 {
                 XWindowChanges wc;
                 wc.border_width = e->xconfigurerequest.border_width;
@@ -454,7 +454,7 @@ bool Workspace::workspaceEvent( XEvent * e )
         case FocusOut:
             return true; // always eat these, they would tell Qt that KWin is the active app
         case ClientMessage:
-            if( electricBorder( e ))
+            if (activeBorderEvent(e))
                 return true;
             break;
         default:
@@ -542,7 +542,7 @@ bool Client::windowEvent( XEvent* e )
         }
 
 // TODO move all focus handling stuff to separate file?
-    switch (e->type) 
+    switch (e->type)
         {
         case UnmapNotify:
             unmapNotifyEvent( &e->xunmap );
@@ -785,8 +785,13 @@ void Client::configureRequestEvent( XConfigureRequestEvent* e )
     {
     if( e->window != window())
         return; // ignore frame/wrapper
-    if ( isResize() || isMove())
+    if ( isResize() || isMove() || inhibitConfigureRequests)
+        {
+        // Send a synthetic configure notification to make sure the
+        // window contents get updated by the application
+        sendSyntheticConfigureNotify();
         return; // we have better things to do right now
+        }
 
     if( fullscreen_mode == FullScreenNormal ) // refuse resizing of fullscreen windows
         { // but allow resizing fullscreen hacks in order to let them cancel fullscreen mode
@@ -800,7 +805,7 @@ void Client::configureRequestEvent( XConfigureRequestEvent* e )
         return;
         }
 
-    if ( e->value_mask & CWBorderWidth ) 
+    if ( e->value_mask & CWBorderWidth )
         {
         // first, get rid of a window border
         XWindowChanges wc;
@@ -818,7 +823,7 @@ void Client::configureRequestEvent( XConfigureRequestEvent* e )
         restackWindow( e->above, e->detail, NET::FromApplication, userTime(), false );
 
     // TODO sending a synthetic configure notify always is fine, even in cases where
-    // the ICCCM doesn't require this - it can be though of as 'the WM decided to move
+    // the ICCCM doesn't require this - it can be thought of as 'the WM decided to move
     // the window later'. The client should not cause that many configure request,
     // so this should not have any significant impact. With user moving/resizing
     // the it should be optimized though (see also Client::setGeometry()/plainResize()/move()).
@@ -836,7 +841,7 @@ void Client::propertyNotifyEvent( XPropertyEvent* e )
     {
     if( e->window != window())
         return; // ignore frame/wrapper
-    switch ( e->atom ) 
+    switch ( e->atom )
         {
         case XA_WM_NORMAL_HINTS:
             getWmNormalHints();
@@ -874,14 +879,14 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
         return; // care only about entering the whole frame
     if( e->mode == NotifyNormal ||
          ( !options->focusPolicyIsReasonable() &&
-             e->mode == NotifyUngrab ) ) 
+             e->mode == NotifyUngrab ) )
         {
 
-        if (options->shadeHover && isShade()) 
+        if (options->shadeHover && isShade())
             {
             delete shadeHoverTimer;
             shadeHoverTimer = new TQTimer( this );
-            connect( shadeHoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( shadeHover() ));
+            connect( shadeHoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( shadeHover() ));
             shadeHoverTimer->start( options->shadeHoverInterval, TRUE );
             }
 
@@ -890,11 +895,11 @@ void Client::enterNotifyEvent( XCrossingEvent* e )
 
         if ( options->autoRaise && !isDesktop() &&
              !isDock() && !isTopMenu() && workspace()->focusChangeEnabled() &&
-             workspace()->topClientOnDesktop( workspace()->currentDesktop()) != this ) 
+             workspace()->topClientOnDesktop( workspace()->currentDesktop()) != this )
             {
             delete autoRaiseTimer;
             autoRaiseTimer = new TQTimer( this );
-            connect( autoRaiseTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoRaise() ) );
+            connect( autoRaiseTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoRaise() ) );
             autoRaiseTimer->start( options->autoRaiseInterval, TRUE  );
             }
 
@@ -919,12 +924,12 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
     {
     if( e->window != frameId())
         return; // care only about leaving the whole frame
-    if ( e->mode == NotifyNormal ) 
+    if ( e->mode == NotifyNormal )
         {
-        if ( !buttonDown ) 
+        if ( !buttonDown )
             {
             mode = PositionCenter;
-            setCursor( tqarrowCursor );
+            setCursor( TQt::arrowCursor );
             }
         bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) );
         // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations
@@ -934,7 +939,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
         // TODO this still sucks if a window appears above this one - it should lose the mouse
         // if this window is another client, but not if it's a popup ... maybe after KDE3.1 :(
         // (repeat after me 'AARGHL!')
-        if ( !lostMouse && e->detail != NotifyInferior ) 
+        if ( !lostMouse && e->detail != NotifyInferior )
             {
             int d1, d2, d3, d4;
             unsigned int d5;
@@ -943,7 +948,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
                 || child == None )
                 lostMouse = true; // really lost the mouse
             }
-        if ( lostMouse ) 
+        if ( lostMouse )
             {
             cancelAutoRaise();
             workspace()->cancelDelayFocus();
@@ -963,7 +968,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
 #define XScrL KKeyNative::modXScrollLock()
 void Client::grabButton( int modifier )
     {
-    unsigned int mods[ 8 ] = 
+    unsigned int mods[ 8 ] =
         {
         0, XCapL, XNumL, XNumL | XCapL,
         XScrL, XScrL | XCapL,
@@ -980,7 +985,7 @@ void Client::grabButton( int modifier )
 
 void Client::ungrabButton( int modifier )
     {
-    unsigned int mods[ 8 ] = 
+    unsigned int mods[ 8 ] =
         {
         0, XCapL, XNumL, XNumL | XCapL,
         XScrL, XScrL | XCapL,
@@ -1046,23 +1051,23 @@ void Client::updateMouseGrab()
 
 int qtToX11Button( TQt::ButtonState button )
     {
-    if( button == Qt::LeftButton )
+    if( button == TQt::LeftButton )
         return Button1;
-    else if( button == Qt::MidButton )
+    else if( button == TQt::MidButton )
         return Button2;
-    else if( button == Qt::RightButton )
+    else if( button == TQt::RightButton )
         return Button3;
     return AnyButton;
     }
-    
+
 int qtToX11State( TQt::ButtonState state )
     {
     int ret = 0;
-    if( state & Qt::LeftButton )
+    if( state & TQt::LeftButton )
         ret |= Button1Mask;
-    if( state & Qt::MidButton )
+    if( state & TQt::MidButton )
         ret |= Button2Mask;
-    if( state & Qt::RightButton )
+    if( state & TQt::RightButton )
         ret |= Button3Mask;
     if( state & TQt::ShiftButton )
         ret |= ShiftMask;
@@ -1079,7 +1084,7 @@ int qtToX11State( TQt::ButtonState state )
 // for the decoration window cannot be (easily) intercepted as X11 events
 bool Client::eventFilter( TQObject* o, TQEvent* e )
     {
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(shadowWidget))
+    if (o == shadowWidget)
         {
         if (e->type() == TQEvent::MouseButtonRelease)
             {
@@ -1092,11 +1097,11 @@ bool Client::eventFilter( TQObject* o, TQEvent* e )
             removeShadow();
             switch (qe->button())
                 {
-                case Qt::MidButton:
+                case TQt::MidButton:
                     buttonMask = Button2Mask;
                     buttonPressed = Button2;
                     break;
-                case Qt::RightButton:
+                case TQt::RightButton:
                     buttonMask = Button3Mask;
                     buttonPressed = Button3;
                     break;
@@ -1291,29 +1296,29 @@ bool Client::eventFilter( TQObject* o, TQEvent* e )
             }
         }
     if( decoration == NULL
-        || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(decoration->widget()))
+        || o != decoration->widget())
         return false;
     if( e->type() == TQEvent::MouseButtonPress )
         {
-        TQMouseEvent* ev = TQT_TQMOUSEEVENT( e );
+        TQMouseEvent* ev = static_cast<TQMouseEvent*>( e );
         return buttonPressEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()),
             ev->x(), ev->y(), ev->globalX(), ev->globalY() );
         }
     if( e->type() == TQEvent::MouseButtonRelease )
         {
-        TQMouseEvent* ev = TQT_TQMOUSEEVENT( e );
+        TQMouseEvent* ev = static_cast<TQMouseEvent*>( e );
         return buttonReleaseEvent( decorationId(), qtToX11Button( ev->button()), qtToX11State( ev->state()),
             ev->x(), ev->y(), ev->globalX(), ev->globalY() );
         }
     if( e->type() == TQEvent::MouseMove ) // FRAME i fake z enter/leave?
         {
-        TQMouseEvent* ev = TQT_TQMOUSEEVENT( e );
+        TQMouseEvent* ev = static_cast<TQMouseEvent*>( e );
         return motionNotifyEvent( decorationId(), qtToX11State( ev->state()),
             ev->x(), ev->y(), ev->globalX(), ev->globalY() );
         }
     if( e->type() == TQEvent::Wheel )
         {
-        TQWheelEvent* ev = TQT_TQWHEELEVENT( e );
+        TQWheelEvent* ev = static_cast<TQWheelEvent*>( e );
         bool r = buttonPressEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()),
             ev->x(), ev->y(), ev->globalX(), ev->globalY() );
         r = r || buttonReleaseEvent( decorationId(), ev->delta() > 0 ? Button4 : Button5, qtToX11State( ev->state()),
@@ -1322,7 +1327,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e )
         }
     if( e->type() == TQEvent::Resize )
         {
-        TQResizeEvent* ev = TQT_TQRESIZEEVENT( e );
+        TQResizeEvent* ev = static_cast<TQResizeEvent*>( e );
         // Filter out resize events that inform about size different than frame size.
         // This will ensure that decoration->width() etc. and decoration->widget()->width() will be in sync.
         // These events only seem to be delayed events from initial resizing before show() was called
@@ -1348,7 +1353,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
           // FRAME something out of this would be processed before it gets decorations
         updateUserTime();
         workspace()->setWasUserInteraction();
-        uint keyModX = (options->keyCmdAllModKey() == Qt::Key_Meta) ?
+        uint keyModX = (options->keyCmdAllModKey() == TQt::Key_Meta) ?
             KKeyNative::modX(KKey::WIN) :
             KKeyNative::modX(KKey::ALT);
         bool bModKeyHeld = keyModX != 0 && ( state & KKeyNative::accelModMaskX()) == keyModX;
@@ -1368,7 +1373,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
         if ( bModKeyHeld )
             {
             was_action = true;
-            switch (button) 
+            switch (button)
                 {
                 case Button1:
                     com = options->commandAll1();
@@ -1391,7 +1396,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in
                 {
                 was_action = true;
                 perform_handled = true;
-                switch (button) 
+                switch (button)
                     {
                     case Button1:
                         com = options->commandWindow1();
@@ -1481,13 +1486,13 @@ void Client::processMousePressEvent( TQMouseEvent* e )
     int button;
     switch( e->button())
         {
-        case Qt::LeftButton:
+        case TQt::LeftButton:
             button = Button1;
           break;
-        case Qt::MidButton:
+        case TQt::MidButton:
             button = Button2;
           break;
-        case Qt::RightButton:
+        case TQt::RightButton:
             button = Button3;
           break;
         default:
@@ -1513,7 +1518,7 @@ bool Client::buttonReleaseEvent( Window w, int /*button*/, int state, int x, int
     if ( (state & ( Button1Mask & Button2Mask & Button3Mask )) == 0 )
         {
         buttonDown = FALSE;
-        if ( moveResizeMode ) 
+        if ( moveResizeMode )
             {
             finishMoveResize( false );
             // mouse position is still relative to old Client position, adjust it
@@ -1550,7 +1555,7 @@ static bool waitingMotionEvent()
 // of processes events reaches the timestamp of the last suitable
 // MotionNotify event in the queue.
     if( next_motion_time != CurrentTime
-        && timestampCompare( GET_QT_X_TIME(), next_motion_time ) < 0 )
+        && timestampCompare( get_tqt_x_time(), next_motion_time ) < 0 )
         return true;
     was_motion = false;
     XSync( tqt_xdisplay(), False ); // this helps to discard more MotionNotify events
@@ -1564,7 +1569,7 @@ bool Client::motionNotifyEvent( Window w, int /*state*/, int x, int y, int x_roo
     {
     if( w != frameId() && w != decorationId() && w != moveResizeGrabWindow())
         return true; // care only about the whole frame
-    if ( !buttonDown ) 
+    if ( !buttonDown )
         {
         Position newmode = mousePosition( TQPoint( x, y ));
         if( newmode != mode )
@@ -1682,7 +1687,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
         buttonDown = FALSE;
         setCursor( mode );
     }
-    else if( direction >= NET::TopLeft && direction <= NET::Left ) 
+    else if( direction >= NET::TopLeft && direction <= NET::Left )
         {
         static const Position convert[] =
             {
@@ -1728,12 +1733,12 @@ void Client::keyPressEvent( uint key_code )
     updateUserTime();
     if ( !isMove() && !isResize() )
         return;
-    bool is_control = key_code & Qt::CTRL;
-    bool is_alt = key_code & Qt::ALT;
+    bool is_control = key_code & TQt::CTRL;
+    bool is_alt = key_code & TQt::ALT;
     key_code = key_code & 0xffff;
     int delta = is_control?1:is_alt?32:8;
     TQPoint pos = TQCursor::pos();
-    switch ( key_code ) 
+    switch ( key_code )
         {
         case Key_Left:
             pos.rx() -= delta;
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 5c71e7c1f..581c07ac1 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -40,7 +40,7 @@ namespace KWinInternal
   Resizes the workspace after an XRANDR screen size change
  */
 void Workspace::desktopResized()
-    {
+{
     //printf("Workspace::desktopResized()\n");
     TQRect geom = TDEApplication::desktop()->geometry();
     NETSize desktop_geometry;
@@ -49,24 +49,17 @@ void Workspace::desktopResized()
     rootInfo->setDesktopGeometry( -1, desktop_geometry );
 
     updateClientArea( true );
-    checkElectricBorders( true );
-    }
+    destroyActiveBorders();
+    updateActiveBorders();
+}
 
 /*!
   Resizes the workspace after kdesktop signals a desktop resize
  */
 void Workspace::kDestopResized()
-    {
-    //printf("Workspace::kDesktopResized()\n");
-    TQRect geom = TDEApplication::desktop()->geometry();
-    NETSize desktop_geometry;
-    desktop_geometry.width = geom.width();
-    desktop_geometry.height = geom.height();
-    rootInfo->setDesktopGeometry( -1, desktop_geometry );
-
-    updateClientArea( true );
-    checkElectricBorders( true );
-    }
+{
+	desktopResized();
+}
 
 /*!
   Updates the current client areas according to the current clients.
@@ -344,23 +337,23 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
         int snap = options->borderSnapZone; //snap trigger
         if (snap)
             {
-            if ((sOWO?(cx<xmin):true) && (QABS(xmin-cx)<snap))
+            if ((sOWO?(cx<xmin):true) && (TQABS(xmin-cx)<snap))
                 {
                 deltaX = xmin-cx;
                 nx = xmin;
                 }
-            if ((sOWO?(rx>xmax):true) && (QABS(rx-xmax)<snap) && (QABS(xmax-rx) < deltaX))
+            if ((sOWO?(rx>xmax):true) && (TQABS(rx-xmax)<snap) && (TQABS(xmax-rx) < deltaX))
                 {
                 deltaX = rx-xmax;
                 nx = xmax - cw;
                 }
 
-            if ((sOWO?(cy<ymin):true) && (QABS(ymin-cy)<snap))
+            if ((sOWO?(cy<ymin):true) && (TQABS(ymin-cy)<snap))
                 {
                 deltaY = ymin-cy;
                 ny = ymin;
                 }
-            if ((sOWO?(ry>ymax):true) && (QABS(ry-ymax)<snap) && (QABS(ymax-ry) < deltaY))
+            if ((sOWO?(ry>ymax):true) && (TQABS(ry-ymax)<snap) && (TQABS(ymax-ry) < deltaY))
                 {
                 deltaY =ry-ymax;
                 ny = ymax - ch;
@@ -387,14 +380,14 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
                          (( ry >= ly  ) && ( ry  <= lry ))  ||
                          (( cy <= ly  ) && ( ry >= lry  )) )
                         {
-                        if ((sOWO?(cx<lrx):true) && (QABS(lrx-cx)<snap) && ( QABS(lrx -cx) < deltaX) )
+                        if ((sOWO?(cx<lrx):true) && (TQABS(lrx-cx)<snap) && ( TQABS(lrx -cx) < deltaX) )
                             {
-                            deltaX = QABS( lrx - cx );
+                            deltaX = TQABS( lrx - cx );
                             nx = lrx;
                             }
-                        if ((sOWO?(rx>lx):true) && (QABS(rx-lx)<snap) && ( QABS( rx - lx )<deltaX) )
+                        if ((sOWO?(rx>lx):true) && (TQABS(rx-lx)<snap) && ( TQABS( rx - lx )<deltaX) )
                             {
-                            deltaX = QABS(rx - lx);
+                            deltaX = TQABS(rx - lx);
                             nx = lx - cw;
                             }
                         }
@@ -403,15 +396,15 @@ TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
                          (( rx >= lx  ) && ( rx  <= lrx ))  ||
                          (( cx <= lx  ) && ( rx >= lrx  )) )
                         {
-                        if ((sOWO?(cy<lry):true) && (QABS(lry-cy)<snap) && (QABS( lry -cy ) < deltaY))
+                        if ((sOWO?(cy<lry):true) && (TQABS(lry-cy)<snap) && (TQABS( lry -cy ) < deltaY))
                             {
-                            deltaY = QABS( lry - cy );
+                            deltaY = TQABS( lry - cy );
                             ny = lry;
                             }
-                  //if ( (QABS( ry-ly ) < snap) && (QABS( ry - ly ) < deltaY ))
-                        if ((sOWO?(ry>ly):true) && (QABS(ry-ly)<snap) && (QABS( ry - ly ) < deltaY ))
+                  //if ( (TQABS( ry-ly ) < snap) && (TQABS( ry - ly ) < deltaY ))
+                        if ((sOWO?(ry>ly):true) && (TQABS(ry-ly)<snap) && (TQABS( ry - ly ) < deltaY ))
                             {
-                            deltaY = QABS( ry - ly );
+                            deltaY = TQABS( ry - ly );
                             ny = ly - ch;
                             }
                         }
@@ -458,30 +451,30 @@ TQRect Workspace::adjustClientSize( Client* c, TQRect moveResizeGeom, int mode )
             deltaY = int(snap);
 
 #define SNAP_BORDER_TOP \
-            if ((sOWO?(newcy<ymin):true) && (QABS(ymin-newcy)<deltaY)) \
+            if ((sOWO?(newcy<ymin):true) && (TQABS(ymin-newcy)<deltaY)) \
               { \
-                deltaY = QABS(ymin-newcy); \
+                deltaY = TQABS(ymin-newcy); \
                 newcy = ymin; \
                }
 
 #define SNAP_BORDER_BOTTOM \
-            if ((sOWO?(newry>ymax):true) && (QABS(ymax-newry)<deltaY)) \
+            if ((sOWO?(newry>ymax):true) && (TQABS(ymax-newry)<deltaY)) \
               { \
-                deltaY = QABS(ymax-newcy); \
+                deltaY = TQABS(ymax-newcy); \
                 newry = ymax; \
                }
 
 #define SNAP_BORDER_LEFT \
-            if ((sOWO?(newcx<xmin):true) && (QABS(xmin-newcx)<deltaX)) \
+            if ((sOWO?(newcx<xmin):true) && (TQABS(xmin-newcx)<deltaX)) \
               { \
-                deltaX = QABS(xmin-newcx); \
+                deltaX = TQABS(xmin-newcx); \
                 newcx = xmin; \
                }
 
 #define SNAP_BORDER_RIGHT \
-            if ((sOWO?(newrx>xmax):true) && (QABS(xmax-newrx)<deltaX)) \
+            if ((sOWO?(newrx>xmax):true) && (TQABS(xmax-newrx)<deltaX)) \
               { \
-                deltaX = QABS(xmax-newrx); \
+                deltaX = TQABS(xmax-newrx); \
                 newrx = xmax; \
                }
                      switch ( mode )
@@ -550,30 +543,30 @@ TQRect Workspace::adjustClientSize( Client* c, TQRect moveResizeGeom, int mode )
 
 #define SNAP_WINDOW_TOP  if ( (sOWO?(newcy<lry):true) \
                   && WITHIN_WIDTH  \
-                  && (QABS( lry - newcy ) < deltaY) ) {  \
-                  deltaY = QABS( lry - newcy ); \
+                  && (TQABS( lry - newcy ) < deltaY) ) {  \
+                  deltaY = TQABS( lry - newcy ); \
                   newcy=lry; \
                   }
 
 #define SNAP_WINDOW_BOTTOM  if ( (sOWO?(newry>ly):true)  \
                      && WITHIN_WIDTH  \
-                     && (QABS( ly - newry ) < deltaY) ) {  \
-                     deltaY = QABS( ly - newry );  \
+                     && (TQABS( ly - newry ) < deltaY) ) {  \
+                     deltaY = TQABS( ly - newry );  \
                      newry=ly;  \
                      }
 
 #define SNAP_WINDOW_LEFT  if ( (sOWO?(newcx<lrx):true)  \
                    && WITHIN_HEIGHT  \
-                   && (QABS( lrx - newcx ) < deltaX)) {  \
-                   deltaX = QABS( lrx - newcx );  \
+                   && (TQABS( lrx - newcx ) < deltaX)) {  \
+                   deltaX = TQABS( lrx - newcx );  \
                    newcx=lrx;  \
                    }
 
 #define SNAP_WINDOW_RIGHT  if ( (sOWO?(newrx>lx):true)  \
                     && WITHIN_HEIGHT  \
-                    && (QABS( lx - newrx ) < deltaX))  \
+                    && (TQABS( lx - newrx ) < deltaX))  \
                     {  \
-                    deltaX = QABS( lx - newrx );  \
+                    deltaX = TQABS( lx - newrx );  \
                     newrx=lx;  \
                     }
 
@@ -686,7 +679,7 @@ void Workspace::updateTopMenuGeometry( Client* c )
         static Atom msg_type_atom = XInternAtom( tqt_xdisplay(), "_KDE_TOPMENU_MINSIZE", False );
         ev.xclient.message_type = msg_type_atom;
         ev.xclient.format = 32;
-        ev.xclient.data.l[0] = GET_QT_X_TIME();
+        ev.xclient.data.l[0] = get_tqt_x_time();
         ev.xclient.data.l[1] = topmenu_space->width();
         ev.xclient.data.l[2] = topmenu_space->height();
         ev.xclient.data.l[3] = 0;
@@ -1458,6 +1451,8 @@ const TQPoint Client::calculateGravitation( bool invert, int gravity ) const
 
 void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, int gravity, bool from_tool )
     {
+    inhibitConfigureRequests = true;
+    configureRequestTimer->start(100, true);
     if( gravity == 0 ) // default (nonsense) value for the argument
         gravity = xSizeHint.win_gravity;
     if( value_mask & ( CWX | CWY ))
@@ -1906,7 +1901,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
         if( horizontal )
             max_mode = MaximizeMode( max_mode ^ MaximizeHorizontal );
         }
-        
+
     max_mode = rules()->checkMaximize( max_mode );
     if( !adjust && max_mode == old_mode )
         return;
@@ -1955,9 +1950,9 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
 	    {
 	    max_mode = MaximizeHorizontal;
 	    maxmode_restore = MaximizeRestore;
-	    }	
+	    }
 	}
-    
+
     switch (max_mode)
         {
 
@@ -2223,8 +2218,8 @@ void Client::updateFullScreenHack( const TQRect& geom )
     workspace()->updateClientLayer( this ); // active fullscreens get different layer
     }
 
-static TQRect*       visible_bound  = 0;
-static GeometryTip* geometryTip    = 0;
+static TQRect*       visible_bound  = nullptr;
+static GeometryTip*  geometryTip    = nullptr;
 
 void Client::drawbound( const TQRect& geom )
     {
@@ -2247,7 +2242,7 @@ void Client::doDrawbound( const TQRect& geom, bool clear )
     if( decoration != NULL && decoration->drawbound( geom, clear ))
         return; // done by decoration
     TQPainter p ( workspace()->desktopWidget() );
-    p.setPen( TQPen( Qt::white, 5 ) );
+    p.setPen( TQPen( TQt::white, 5 ) );
     p.setRasterOp( TQt::XorROP );
     // the line is 5 pixel thick, so compensate for the extra two pixels
     // on outside (#88657)
@@ -2265,44 +2260,43 @@ void Client::doDrawbound( const TQRect& geom, bool clear )
     p.drawRect( g );
     }
 
-void Client::positionGeometryTip()
-    {
-    assert( isMove() || isResize());
+void Client::positionGeometryTip() {
+    assert(isMove() || isResize());
+
     // Position and Size display
-    if (options->showGeometryTip())
-        {
-        if( !geometryTip )
-            { // save under is not necessary with opaque, and seem to make things slower
+    if (options->showGeometryTip()) {
+        if (!geometryTip) {
+            // save under is not necessary with opaque, and seem to make things slower
             bool save_under = ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque )
-                        || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque );
+                           || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque );
             geometryTip = new GeometryTip( &xSizeHint, save_under );
-            }
-        TQRect wgeom( moveResizeGeom ); // position of the frame, size of the window itself
-        wgeom.setWidth( wgeom.width() - ( width() - clientSize().width()));
-        wgeom.setHeight( wgeom.height() - ( height() - clientSize().height()));
-        if( isShade())
-            wgeom.setHeight( 0 );
-        geometryTip->setGeometry( wgeom );
-        if( !geometryTip->isVisible())
-            {
+        }
+
+        // position of the frame, size of the window itself
+        TQRect wgeom(isActiveBorderMaximizing() ? activeBorderMaximizeGeometry() : moveResizeGeom);
+        wgeom.setWidth(wgeom.width() - (width() - clientSize().width()));
+        wgeom.setHeight(isShade() ? 0 : wgeom.height() - (height() - clientSize().height()));
+
+        geometryTip->setGeometry(wgeom);
+        if (!geometryTip->isVisible()) {
             geometryTip->show();
             geometryTip->raise();
-            }
         }
     }
+}
 
 class EatAllPaintEvents
-    : public QObject
+    : public TQObject
     {
     protected:
         virtual bool eventFilter( TQObject* o, TQEvent* e )
-            { return e->type() == TQEvent::Paint && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(geometryTip); }
+            { return e->type() == TQEvent::Paint && o != geometryTip; }
     };
 
 static EatAllPaintEvents* eater = 0;
 
 bool Client::startMoveResize()
-    {
+{
     assert( !moveResizeMode );
     assert( TQWidget::keyboardGrabber() == NULL );
     assert( TQWidget::mouseGrabber() == NULL );
@@ -2319,33 +2313,68 @@ bool Client::startMoveResize()
     XMapRaised( tqt_xdisplay(), move_resize_grab_window );
     if( XGrabPointer( tqt_xdisplay(), move_resize_grab_window, False,
         ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | LeaveWindowMask,
-        GrabModeAsync, GrabModeAsync, move_resize_grab_window, cursor.handle(), GET_QT_X_TIME() ) == Success )
+        GrabModeAsync, GrabModeAsync, move_resize_grab_window, cursor.handle(), get_tqt_x_time() ) == Success )
         has_grab = true;
-    if( XGrabKeyboard( tqt_xdisplay(), frameId(), False, GrabModeAsync, GrabModeAsync, GET_QT_X_TIME() ) == Success )
+    if( XGrabKeyboard( tqt_xdisplay(), frameId(), False, GrabModeAsync, GrabModeAsync, get_tqt_x_time() ) == Success )
         has_grab = true;
     if( !has_grab ) // at least one grab is necessary in order to be able to finish move/resize
-        {
+    {
         XDestroyWindow( tqt_xdisplay(), move_resize_grab_window );
         move_resize_grab_window = None;
         return false;
-        }
-    if ( maximizeMode() != MaximizeRestore )
-        resetMaximize();
+    }
+
     removeShadow();
     moveResizeMode = true;
+    initialMoveResizeGeom = geometry();
+
+    if (activeTiled)
+    {
+        // 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());
+
+            setGeometry(activeTiledOrigGeom);
+        }
+    }
+
+    if ( maximizeMode() != MaximizeRestore )
+    {
+        if (options->resetMaximizedWindowGeometry() && isMove()) {
+            maximize(MaximizeRestore);
+        }
+        else {
+            resetMaximize();
+        }
+        activeTiled = false;
+    }
+
+    moveResizeGeom = geometry();
     workspace()->setClientIsMoving(this);
-    initialMoveResizeGeom = moveResizeGeom = geometry();
     checkUnrestrictedMoveResize();
+
     // rule out non opaque windows from useless translucency settings, maybe resizes?
     if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove))
+    {
         setShadowSize(0);
-    if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque){
+    }
+
+    if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque)
+    {
         savedOpacity_ = opacity_;
         setOpacity(options->translucentMovingWindows, options->movingWindowOpacity);
     }
+
     if ( ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque )
       || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ) )
-        {
+    {
         grabXServer();
         kapp->sendPostedEvents();
         // we have server grab -> nothing should cause paint events
@@ -2353,27 +2382,59 @@ bool Client::startMoveResize()
         // 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;
+        // eater = new EatAllPaintEvents;
 // not needed anymore?        kapp->installEventFilter( eater );
-        }
+    }
     Notify::raise( isResize() ? Notify::ResizeStart : Notify::MoveStart );
-    return true;
+
+    if (options->activeBorders() == Options::ActiveSwitchOnMove ||
+        options->activeBorders() == Options::ActiveTileMaximize ||
+        options->activeBorders() == Options::ActiveTileOnly)
+
+    {
+        workspace()->reserveActiveBorderSwitching(true);
     }
 
+    return true;
+}
+
 void Client::finishMoveResize( bool cancel )
-    {
+{
     leaveMoveResize();
-    if( cancel )
-        setGeometry( initialMoveResizeGeom );
+
+    if (!isActiveBorderMaximizing()) {
+        setGeometry(cancel ? initialMoveResizeGeom : moveResizeGeom);
+    }
+
     else
-        setGeometry( moveResizeGeom );
+    {
+        kdDebug() <<"finishing moveresize in active mode, cancel is " << cancel << endl;
+        activeMaximizing = false;
+        activeTiled = true;
+        activeTiledOrigGeom = initialMoveResizeGeom;
+        switch (activeMode)
+        {
+            case ActiveMaximizeMode: {
+                if (!cancel) {
+                    bool full = (maximizeMode() == MaximizeFull);
+                    setMaximize(!full, !full);
+                }
+                break;
+            }
+            default:
+                setGeometry(cancel ? initialMoveResizeGeom
+                                   : activeBorderMaximizeGeometry());
+        }
+        activeTiledOrigGeom.moveTopLeft(rect().topLeft());
+    }
+
     checkMaximizeGeometry();
 // FRAME    update();
     Notify::raise( isResize() ? Notify::ResizeEnd : Notify::MoveEnd );
-    }
+}
 
 void Client::leaveMoveResize()
-    {
+{
     // rule out non opaque windows from useless translucency settings, maybe resizes?
     if (rules()->checkMoveResizeMode( options->moveMode ) == Options::Opaque)
         setOpacity(true, savedOpacity_);
@@ -2389,8 +2450,8 @@ void Client::leaveMoveResize()
     if ( ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque )
       || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ) )
         ungrabXServer();
-    XUngrabKeyboard( tqt_xdisplay(), GET_QT_X_TIME() );
-    XUngrabPointer( tqt_xdisplay(), GET_QT_X_TIME() );
+    XUngrabKeyboard( tqt_xdisplay(), get_tqt_x_time() );
+    XUngrabPointer( tqt_xdisplay(), get_tqt_x_time() );
     XDestroyWindow( tqt_xdisplay(), move_resize_grab_window );
     move_resize_grab_window = None;
     workspace()->setClientIsMoving(0);
@@ -2401,12 +2462,19 @@ void Client::leaveMoveResize()
     delete eater;
     eater = 0;
     if (options->shadowEnabled(isActive()))
-        {
+    {
         drawIntersectingShadows();
         updateOpacityCache();
-        }
     }
 
+    if (options->activeBorders() == Options::ActiveSwitchOnMove ||
+        options->activeBorders() == Options::ActiveTileMaximize ||
+        options->activeBorders() == Options::ActiveTileOnly)
+    {
+        workspace()->reserveActiveBorderSwitching(false);
+    }
+}
+
 // This function checks if it actually makes sense to perform a restricted move/resize.
 // If e.g. the titlebar is already outside of the workarea, there's no point in performing
 // a restricted move resize, because then e.g. resize would also move the window (#74555).
@@ -2417,7 +2485,7 @@ void Client::checkUnrestrictedMoveResize()
         return;
     TQRect desktopArea = workspace()->clientArea( WorkArea, moveResizeGeom.center(), desktop());
     int left_marge, right_marge, top_marge, bottom_marge, titlebar_marge;
-    // restricted move/resize - keep at least part of the titlebar always visible 
+    // restricted move/resize - keep at least part of the titlebar always visible
     // how much must remain visible when moved away in that direction
     left_marge = KMIN( 100 + border_right, moveResizeGeom.width());
     right_marge = KMIN( 100 + border_left, moveResizeGeom.width());
@@ -2452,27 +2520,22 @@ void Client::checkUnrestrictedMoveResize()
         }
     }
 
-void Client::handleMoveResize( int x, int y, int x_root, int y_root )
-    {
-    if(( mode == PositionCenter && !isMovable())
-        || ( mode != PositionCenter && ( isShade() || !isResizable())))
+void Client::handleMoveResize(int x, int y, int x_root, int y_root) {
+    if ( (mode == PositionCenter && !isMovable())
+        || (mode != PositionCenter && (isShade() || !isResizable())) )
         return;
 
-    if ( !moveResizeMode )
-        {
-        TQPoint p( TQPoint( x, y ) - moveOffset );
-        if (p.manhattanLength() >= 6)
-            {
-            if( !startMoveResize())
-                {
+    if (!moveResizeMode) {
+        TQPoint p(TQPoint( x, y ) - moveOffset);
+        if (p.manhattanLength() >= 6) {
+            if (!startMoveResize()) {
                 buttonDown = false;
                 setCursor( mode );
                 return;
-                }
             }
-        else
-            return;
         }
+        else return;
+    }
 
     // ShadeHover or ShadeActive, ShadeNormal was already avoided above
     if ( mode != PositionCenter && shade_mode != ShadeNone )
@@ -2493,8 +2556,8 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
     int left_marge, right_marge, top_marge, bottom_marge, titlebar_marge;
     if( unrestrictedMoveResize ) // unrestricted, just don't let it go out completely
         left_marge = right_marge = top_marge = bottom_marge = titlebar_marge = 5;
-    else // restricted move/resize - keep at least part of the titlebar always visible 
-        {        
+    else // restricted move/resize - keep at least part of the titlebar always visible
+    {
         // how much must remain visible when moved away in that direction
         left_marge = KMIN( 100 + border_right, moveResizeGeom.width());
         right_marge = KMIN( 100 + border_left, moveResizeGeom.width());
@@ -2502,16 +2565,16 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
         titlebar_marge = initialMoveResizeGeom.height();
         top_marge = border_bottom;
         bottom_marge = border_top;
-        }
+    }
 
     bool update = false;
-    if( isResize())
-        {
+    if (isResize())
+    {
         // first resize (without checking constraints), then snap, then check bounds, then check constraints
         TQRect orig = initialMoveResizeGeom;
         Sizemode sizemode = SizemodeAny;
         switch ( mode )
-            {
+        {
             case PositionTopLeft:
                 moveResizeGeom =  TQRect( topleft, orig.bottomRight() ) ;
                 break;
@@ -2544,7 +2607,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
             default:
                 assert( false );
                 break;
-            }
+        }
 
         // adjust new size to snap to other windows/borders
         moveResizeGeom = workspace()->adjustClientSize( this, moveResizeGeom, mode );
@@ -2567,7 +2630,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
         bottomright = TQPoint( moveResizeGeom.left() + size.width() - 1, moveResizeGeom.top() + size.height() - 1 );
         orig = moveResizeGeom;
         switch ( mode )
-            { // these 4 corners ones are copied from above
+        { // these 4 corners ones are copied from above
             case PositionTopLeft:
                 moveResizeGeom =  TQRect( topleft, orig.bottomRight() ) ;
                 break;
@@ -2599,12 +2662,12 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
             default:
                 assert( false );
                 break;
-            }
-        if( moveResizeGeom.size() != previousMoveResizeGeom.size())
-            update = true;
         }
-    else if( isMove())
-        {
+        if (moveResizeGeom.size() != previousMoveResizeGeom.size())
+            update = true;
+    }
+    else if (isMove())
+    {
         assert( mode == PositionCenter );
         // first move, then snap, then check bounds
         moveResizeGeom.moveTopLeft( topleft );
@@ -2621,29 +2684,160 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
             moveResizeGeom.moveLeft(desktopArea.right() - right_marge );
         if( moveResizeGeom.topLeft() != previousMoveResizeGeom.topLeft())
             update = true;
-        }
+    }
     else
-        assert( false );
+        assert(false);
 
-    if( update )
+    if (update)
+    {
+        bool active = isActiveBorderMaximizing();
+        auto mode = active ? options->tilingMode
+                  : isResize() ? options->resizeMode : options->moveMode;
+
+        if (rules()->checkMoveResizeMode(mode) == Options::Opaque)
         {
-        if( rules()->checkMoveResizeMode
-            ( isResize() ? options->resizeMode : options->moveMode ) == Options::Opaque )
-            {
-            setGeometry( moveResizeGeom );
+            setGeometry(active ? activeBorderMaximizeGeometry() : moveResizeGeom);
             positionGeometryTip();
-            }
-        else if( rules()->checkMoveResizeMode
-            ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent )
+        }
+        else if (rules()->checkMoveResizeMode(mode) == Options::Transparent)
+        {
+        /* It's necessary to move the geometry tip when there's no outline
+         * shown, otherwise it would cause repaint problems in case
+         * they overlap; the paint event will come after this,
+         * so the geometry tip will be painted above the outline
+         */
+            clearbound();
+            positionGeometryTip();
+            drawbound(active ? activeBorderMaximizeGeometry() : moveResizeGeom);
+        }
+    }
+    if (isMove()) {
+        workspace()->checkActiveBorder(globalPos, get_tqt_x_time());
+    }
+}
+
+void Client::setActiveBorderMode( ActiveMaximizingMode mode )
+{
+    activeMode = mode;
+}
+
+ActiveMaximizingMode Client::activeBorderMode() const
+{
+    return activeMode;
+}
+
+void Client::setActiveBorder(ActiveBorder border) {
+    currentActiveBorder = border;
+}
+
+ActiveBorder Client::activeBorder() const {
+    return currentActiveBorder;
+}
+
+bool Client::isActiveBorderMaximizing() const
+{
+    return activeMaximizing;
+}
+
+void Client::setActiveBorderMaximizing( bool maximizing )
+{
+    activeMaximizing = maximizing;
+    bool opaque = rules()->checkMoveResizeMode(options->tilingMode) == Options::Opaque;
+
+    if (maximizing || opaque) {
+        clearbound();
+    }
+
+    if (maximizing && !opaque) {
+        drawbound(activeBorderMaximizeGeometry());
+    }
+}
+
+void Client::cancelActiveBorderMaximizing() {
+    if (!activeMaximizing) return;
+    activeMaximizing = false;
+
+    // If we are in transparent mode, we need to clear out the bound we had drawn
+    if (rules()->checkMoveResizeMode(options->tilingMode) == Options::Transparent) {
+        clearbound();
+    }
+}
+
+TQRect Client::activeBorderMaximizeGeometry()
+{
+    TQRect ret;
+    TQRect max = workspace()->clientArea(MaximizeArea, TQCursor::pos(), workspace()->currentDesktop());
+    switch (activeBorderMode())
+    {
+        case ActiveMaximizeMode:
+        {
+            if (maximizeMode() == MaximizeFull)
+                ret = geometryRestore();
+            else
+                ret = max;
+            break;
+        }
+
+        case ActiveTilingMode:
+        {
+            switch (activeBorder())
             {
-            clearbound();  // it's necessary to move the geometry tip when there's no outline
-            positionGeometryTip(); // shown, otherwise it would cause repaint problems in case
-            drawbound( moveResizeGeom ); // they overlap; the paint event will come after this,
-            }                               // so the geometry tip will be painted above the outline
+                case ActiveLeft:
+                {
+                    ret = TQRect( max.x(), max.y(), max.width()/2, max.height() );
+                    break;
+                }
+                case ActiveRight:
+                {
+                    ret = TQRect( max.x() + max.width()/2, max.y(), max.width()/2, max.height() );
+                    break;
+                }
+                case ActiveTop:
+                {
+                    ret = TQRect( max.x(), max.y(), max.width(), max.height()/2 );
+                    break;
+                }
+                case ActiveBottom:
+                {
+                    ret = TQRect( max.x(), max.y() + max.height()/2, max.width(), max.height()/2 );
+                    break;
+                }
+                case ActiveTopLeft:
+                {
+                    ret = TQRect( max.x(), max.y(), max.width()/2, max.height()/2 );
+                    break;
+                }
+                case ActiveTopRight:
+                {
+                    ret = TQRect( max.x() + max.width()/2, max.y(), max.width()/2, max.height()/2 );
+                    break;
+                }
+                case ActiveBottomLeft:
+                {
+                    ret = TQRect( max.x(), max.y() + max.height()/2, max.width()/2, max.height()/2 );
+                    break;
+                }
+                case ActiveBottomRight:
+                {
+                    ret = TQRect( max.x() + max.width()/2, max.y() + max.height()/2, max.width()/2, max.height()/2);
+                    break;
+                }
+            }
         }
-    if ( isMove() )
-      workspace()->clientMoved(globalPos, GET_QT_X_TIME());
     }
+    return ret;
+}
 
+void Client::tileToBorder(ActiveBorder border) {
+    if (!isResizable()) return;
+    activeTiled = true;
+    setActiveBorderMode(ActiveTilingMode);
+    setActiveBorder(border);
+    TQRect geo = activeBorderMaximizeGeometry();
+    if (geo.isValid() && !geo.isEmpty()) {
+        setGeometry(geo);
+    }
+    workspace()->raiseClient(this);
+}
 
 } // namespace
diff --git a/twin/geometrytip.h b/twin/geometrytip.h
index a9c194250..40c2a63eb 100644
--- a/twin/geometrytip.h
+++ b/twin/geometrytip.h
@@ -19,7 +19,7 @@ namespace KWinInternal
 
 class GeometryTip: public TQLabel
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         GeometryTip( const XSizeHints* xSizeHints, bool save_under );
         ~GeometryTip();
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index f47e0f532..0a3c6331e 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -606,7 +606,7 @@ void ButtonDropSite::drawContents( TQPainter* p )
 
 	TQColor c1( 0x0A, 0x5F, 0x89 );		// KDE 2 titlebar default colour
 	p->fillRect( r, c1 );
-	p->setPen( Qt::white );
+	p->setPen( TQt::white );
 	p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) );
 	p->drawText( r, AlignLeft | AlignVCenter, i18n("TDE") );
 
@@ -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;
@@ -879,5 +879,3 @@ void ButtonPositionWidget::setButtonsRight(const TQString &buttons)
 }
 
 #include "buttons.moc"
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h
index e31c09d4a..c9f562208 100644
--- a/twin/kcmtwin/twindecoration/buttons.h
+++ b/twin/kcmtwin/twindecoration/buttons.h
@@ -111,7 +111,7 @@ class ButtonSourceItem : public TQListViewItem
  */
 class ButtonSource : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ButtonSource(TQWidget *parent = 0, const char* name = 0);
@@ -138,7 +138,7 @@ typedef TQValueList<ButtonDropSiteItem*> ButtonList;
  */
 class ButtonDropSite: public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ButtonDropSite( TQWidget* parent=0, const char* name=0 );
@@ -191,7 +191,7 @@ class ButtonDropSite: public TQFrame
 
 class ButtonPositionWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ButtonPositionWidget(TQWidget *parent = 0, const char* name = 0);
@@ -223,5 +223,3 @@ class ButtonPositionWidget : public TQWidget
 
 
 #endif
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/kcmtwin/twindecoration/pixmaps.h b/twin/kcmtwin/twindecoration/pixmaps.h
index 710e01425..38362af4c 100644
--- a/twin/kcmtwin/twindecoration/pixmaps.h
+++ b/twin/kcmtwin/twindecoration/pixmaps.h
@@ -106,5 +106,3 @@ static unsigned char shade_bits[] = {
 static unsigned char spacer_bits[] = {
    0x00, 0x00, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x54, 0x03,
    0xac, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x00, 0x00 };
-
-// vim: ts=4
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 954ff1774..a1c92c8cb 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -234,7 +234,7 @@ TQWidget* KDecorationPreviewBridge::initialParentWidget() const
     return preview;
     }
 
-Qt::WFlags KDecorationPreviewBridge::initialWFlags() const
+TQt::WFlags KDecorationPreviewBridge::initialWFlags() const
     {
     return 0;
     }
diff --git a/twin/kcmtwin/twindecoration/preview.h b/twin/kcmtwin/twindecoration/preview.h
index 56a342cfc..9d9f09402 100644
--- a/twin/kcmtwin/twindecoration/preview.h
+++ b/twin/kcmtwin/twindecoration/preview.h
@@ -32,7 +32,7 @@ class KDecorationPreviewOptions;
 class KDecorationPreview
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         // Note: Windows can't be added or removed without making changes to
         //       the code, since parts of it assume there's just an active
@@ -106,7 +106,7 @@ class KDecorationPreviewBridge
         virtual void setKeepBelow( bool );
         virtual int currentDesktop() const;
         virtual TQWidget* initialParentWidget() const;
-        virtual Qt::WFlags initialWFlags() const;
+        virtual TQt::WFlags initialWFlags() const;
         virtual void helperShowHide( bool show );
         virtual void grabXServer( bool grab );
     private:
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index c1a06b619..265fe2a1c 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -98,7 +98,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	pluginLayout->addWidget(decorationList);
 
 	TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage );
-	pluginSettingsGrp->setColumnLayout( 0, Qt::Vertical );
+	pluginSettingsGrp->setColumnLayout( 0, TQt::Vertical );
 	pluginSettingsGrp->setFlat( true );
 	pluginSettingsGrp->layout()->setMargin( 0 );
 	pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() );
@@ -184,77 +184,77 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 			i18n("Enabling this checkbox will allow you to choose a kind of "
 				 "drop shadow to draw under each window."));
 
-	activeShadowSettings = new TQGroupBox(1, Qt::Horizontal,
+	activeShadowSettings = new TQGroupBox(1, TQt::Horizontal,
 			i18n("Active Window Shadow"), shadowPage);
-	inactiveShadowSettings = new TQGroupBox(1, Qt::Horizontal,
+	inactiveShadowSettings = new TQGroupBox(1, TQt::Horizontal,
 			i18n("Inactive Window Shadows"), shadowPage);
-	whichShadowSettings = new TQGroupBox(3, Qt::Horizontal,
-			i18n("Draw Shadow Under Normal Windows And..."), shadowPage);
+	whichShadowSettings = new TQGroupBox(3, TQt::Horizontal,
+			i18n("Draw Shadow Under Normal Windows And…"), shadowPage);
 
 	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());
 	shadowOpacityLabel = new TQLabel(i18n("Maximum opacity:"), shadowOpacityHBox);
-	shadowOpacitySlider = new TQSlider(1, 100, 10, 50, Qt::Horizontal,
+	shadowOpacitySlider = new TQSlider(1, 100, 10, 50, TQt::Horizontal,
 			shadowOpacityHBox);
 	shadowOpacitySlider->setTickmarks(TQSlider::Below);
 	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());
 	inactiveShadowOpacityLabel = new TQLabel(i18n("Maximum opacity:"),
 			inactiveShadowOpacityHBox);
-	inactiveShadowOpacitySlider = new TQSlider(1, 100, 10, 50, Qt::Horizontal,
+	inactiveShadowOpacitySlider = new TQSlider(1, 100, 10, 50, TQt::Horizontal,
 			inactiveShadowOpacityHBox);
 	inactiveShadowOpacitySlider->setTickmarks(TQSlider::Below);
 	inactiveShadowOpacitySlider->setTickInterval(10);
 	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);
@@ -414,7 +414,7 @@ void KWinDecorationModule::findDecorations()
 					KDesktopFile desktopFile(filename);
 					TQString libName = desktopFile.readEntry("X-TDE-Library");
 
-					if (!libName.isEmpty() && libName.startsWith( "twin3_" ))
+					if (!libName.isEmpty() && libName.startsWith("twin_") || libName.startsWith("twin3_"))
 					{
 						DecorationInfo di;
 						di.name = desktopFile.readName();
@@ -614,7 +614,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
 void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& currentDecoName )
 {
 	// Config names are "twin_icewm_config"
-	// for "twin3_icewm" twin client
+	// for "twin_icewm" twin client
 
 	TQString oldName = styleToConfigLib( oldLibraryName );
 
@@ -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;
 		}
@@ -895,7 +895,7 @@ void KWinDecorationModule::defaults()
         border_size = BorderNormal;
         checkSupportedBorderSizes();
 
-	shadowColourButton->setColor(Qt::black);
+	shadowColourButton->setColor(TQt::black);
 	shadowOpacitySlider->setValue(70);
 	shadowXOffsetSpinBox->setValue(0);
 	shadowYOffsetSpinBox->setValue(10);
@@ -904,7 +904,7 @@ void KWinDecorationModule::defaults()
 	cbShadowOverrides->setChecked(false);
 	cbShadowTopMenus->setChecked(false);
 	cbInactiveShadow->setChecked(false);
-	inactiveShadowColourButton->setColor(Qt::black);
+	inactiveShadowColourButton->setColor(TQt::black);
 	inactiveShadowOpacitySlider->setValue(70);
 	inactiveShadowXOffsetSpinBox->setValue(0);
 	inactiveShadowYOffsetSpinBox->setValue(5);
@@ -938,10 +938,7 @@ void KWinDecorationModule::checkSupportedBorderSizes()
 
 TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib )
 {
-        if( styleLib.startsWith( "twin3_" ))
-            return "twin_" + styleLib.mid( 6 ) + "_config";
-        else
-            return styleLib + "_config";
+        return styleLib + "_config";
 }
 
 TQString KWinDecorationModule::quickHelp() const
@@ -951,7 +948,7 @@ TQString KWinDecorationModule::quickHelp() const
 		"as well as titlebar button positions and custom decoration options.</p>"
 		"To choose a theme for your window decoration click on its name and apply your choice by clicking the \"Apply\" button below."
 		" If you do not want to apply your choice you can click the \"Reset\" button to discard your changes."
-		"<p>You can configure each theme in the \"Configure [...]\" tab. There are different options specific for each theme.</p>"
+		"<p>You can configure each theme in the \"Configure […]\" tab. There are different options specific for each theme.</p>"
 		"<p>In \"General Options (if available)\" you can activate the \"Buttons\" tab by checking the \"Use custom titlebar button positions\" box."
 		" In the \"Buttons\" tab you can change the positions of the buttons to your liking.</p>" );
 }
@@ -980,6 +977,3 @@ void KWinDecorationModule::resetKWin()
 }
 
 #include "twindecoration.moc"
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
-
diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h
index 459823f08..b55455c12 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.h
+++ b/twin/kcmtwin/twindecoration/twindecoration.h
@@ -61,7 +61,7 @@ struct DecorationInfo
 
 class KWinDecorationModule : public TDECModule, virtual public KWinDecorationIface, public KDecorationDefines
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &);
@@ -157,5 +157,3 @@ class KWinDecorationModule : public TDECModule, virtual public KWinDecorationIfa
 
 
 #endif
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/kcmtwin/twinoptions/CMakeLists.txt b/twin/kcmtwin/twinoptions/CMakeLists.txt
index b991bac96..6686f99b1 100644
--- a/twin/kcmtwin/twinoptions/CMakeLists.txt
+++ b/twin/kcmtwin/twinoptions/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_create_translated_desktop(
 tde_create_translated_desktop(
   SOURCE
     twinactions.desktop twinadvanced.desktop twinfocus.desktop
-    twinmoving.desktop twintranslucency.desktop
+    twinmoving.desktop twintranslucency.desktop twinactiveborders.desktop
   DESTINATION ${APPS_INSTALL_DIR}/.hidden
   PO_DIR twin-desktops
 )
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 8ed52b067..2ce258c3c 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -59,6 +59,13 @@ extern "C"
 		return new KMovingConfig(true, c, parent, name);
 	}
 
+	KDE_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)
 	{
 		//CT there's need for decision: kwm or twin?
@@ -66,7 +73,7 @@ extern "C"
 		TDEConfig *c = new TDEConfig("twinrc", false, true);
 		return new KAdvancedConfig(true, c, parent, name);
 	}
-        
+
 	KDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name)
 	{
 		//CT there's need for decision: kwm or twin?
@@ -95,33 +102,38 @@ 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, 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"),
                   0, 0, TDEAboutData::License_GPL,
@@ -151,6 +163,7 @@ void KWinOptions::load()
   mTitleBarActions->load();
   mWindowActions->load();
   mMoving->load();
+  mABorders->load();
   mAdvanced->load();
   mTranslucency->load();
   emit TDECModule::changed( false );
@@ -163,6 +176,7 @@ void KWinOptions::save()
   mTitleBarActions->save();
   mWindowActions->save();
   mMoving->save();
+  mABorders->save();
   mAdvanced->save();
   mTranslucency->save();
 
@@ -181,6 +195,7 @@ void KWinOptions::defaults()
   mTitleBarActions->defaults();
   mWindowActions->defaults();
   mMoving->defaults();
+  mABorders->defaults();
   mAdvanced->defaults();
   mTranslucency->defaults();
 }
@@ -222,10 +237,14 @@ TQString KWinOptions::handbookSection() const
     }
     else if (index == 4)
     {
-        return "advanced";
+        return "active-borders";
     }
     else if (index == 5)
     {
+        return "advanced";
+    }
+    else if (index == 6)
+    {
         return "translucency";
     }
     else
@@ -247,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()
diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h
index 554b7b761..18464ac79 100644
--- a/twin/kcmtwin/twinoptions/main.h
+++ b/twin/kcmtwin/twinoptions/main.h
@@ -32,12 +32,13 @@ class TDEConfig;
 class KFocusConfig;
 class KTitleBarActionsConfig;
 class KWindowActionsConfig;
+class KActiveBorderConfig;
 class KAdvancedConfig;
 class KTranslucencyConfig;
 
 class KWinOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -64,6 +65,7 @@ private:
   KTitleBarActionsConfig *mTitleBarActions;
   KWindowActionsConfig *mWindowActions;
   KMovingConfig *mMoving;
+  KActiveBorderConfig *mABorders;
   KAdvancedConfig *mAdvanced;
   KTranslucencyConfig *mTranslucency;
 
@@ -72,7 +74,7 @@ private:
 
 class TDEActionsOptions : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 8778d915e..0e197071c 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <tqlabel.h>
-#include <tqcombobox.h>
+#include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
@@ -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."));
@@ -178,23 +178,28 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   hlayoutW->addWidget(label);
   txtButton4 = i18n("Handle mouse wheel events");
   TQWhatsThis::add( label, txtButton4);
-  
-  // Titlebar and frame mouse Wheel  
+
+  // Titlebar and frame mouse Wheel
   TQComboBox* comboW = new TQComboBox(this);
   comboW->insertItem(i18n("Raise/Lower"));
   comboW->insertItem(i18n("Shade/Unshade"));
   comboW->insertItem(i18n("Maximize/Restore"));
-  comboW->insertItem(i18n("Keep Above/Below"));  
-  comboW->insertItem(i18n("Move to Previous/Next Desktop"));  
-  comboW->insertItem(i18n("Change Opacity"));  
-  comboW->insertItem(i18n("Nothing"));  
+  comboW->insertItem(i18n("Keep Above/Below"));
+  comboW->insertItem(i18n("Move to Previous/Next Desktop"));
+  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);
-  coTiAct4 = comboW;
+  coTiW = comboW;
   TQWhatsThis::add(comboW, txtButton4);
   label->setBuddy(comboW);
-  
+
+  cbTiRevW = new TQCheckBox(i18n("Reverse wheel direction"), this);
+  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);
+
 /** Titlebar and frame  **************/
 
   box = new TQVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame");
@@ -204,7 +209,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the"
                              " titlebar or the frame of a window.") );
 
-  grid = new TQGrid(4, Qt::Vertical, box);
+  grid = new TQGrid(4, TQt::Vertical, box);
 
 
   new TQLabel(grid); // dummy
@@ -239,15 +244,12 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
   TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
                                " or the frame of an active window.") );
 
-  // Titlebar and frame, active, mouse button 1
-  combo = new TQComboBox(grid);
-  combo->insertItem(i18n("Raise"));
-  combo->insertItem(i18n("Lower"));
-  combo->insertItem(i18n("Operations Menu"));
-  combo->insertItem(i18n("Toggle Raise & Lower"));
-  combo->insertItem(i18n("Nothing"));
-  connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
-  coTiAct1 = combo;
+  items << i18n("Raise")
+        << i18n("Lower")
+        << i18n("Operations Menu")
+        << i18n("Toggle Raise & Lower")
+        << i18n("Nothing")
+        << i18n("Shade");
 
   txtButton1 = i18n("Behavior on <em>left</em> click into the titlebar or frame of an "
      "<em>active</em> window.");
@@ -256,29 +258,29 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co
      "<em>active</em> window.");
 
   // Be nice to left handed users
-  if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3);
+  if (leftHandedMouse)
+  {
+    tqSwap(txtButton1, txtButton3);
+  }
 
+  // Titlebar and frame, active, mouse button 1
+  combo = new TQComboBox(grid);
+  combo->insertStringList(items);
+  connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed()));
+  coTiAct1 = combo;
   TQWhatsThis::add(combo, txtButton1);
 
   // Titlebar and frame, active, mouse button 2
-
-  items << i18n("Raise")
-        << i18n("Lower")
-        << i18n("Operations Menu")
-        << i18n("Toggle Raise & Lower")
-        << i18n("Nothing")
-        << i18n("Shade");
-
   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 );
 
@@ -308,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);
 
@@ -360,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(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
 
   layout->addStretch();
 
@@ -491,8 +493,8 @@ void KTitleBarActionsConfig::setComboText( TQComboBox* combo, const char*txt )
         combo->setCurrentItem( tbl_txt_lookup( tbl_TiAc, txt ));
     else if( combo == coTiInAct1 || combo == coTiInAct2 || combo == coTiInAct3 )
         combo->setCurrentItem( tbl_txt_lookup( tbl_TiInAc, txt ));
-    else if( combo == coTiAct4 )
-        combo->setCurrentItem( tbl_txt_lookup( tbl_TiWAc, txt ));	
+    else if( combo == coTiW )
+        combo->setCurrentItem( tbl_txt_lookup( tbl_TiWAc, txt ));
     else if( combo == coMax[0] || combo == coMax[1] || combo == coMax[2] )
     {
         combo->setCurrentItem( tbl_txt_lookup( tbl_Max, txt ));
@@ -538,10 +540,11 @@ void KTitleBarActionsConfig::load()
   setComboText(coTiAct1,config->readEntry("CommandActiveTitlebar1","Raise").ascii());
   setComboText(coTiAct2,config->readEntry("CommandActiveTitlebar2","Lower").ascii());
   setComboText(coTiAct3,config->readEntry("CommandActiveTitlebar3","Operations menu").ascii());
-  setComboText(coTiAct4,config->readEntry("CommandTitlebarWheel","Nothing").ascii());  
   setComboText(coTiInAct1,config->readEntry("CommandInactiveTitlebar1","Activate and raise").ascii());
   setComboText(coTiInAct2,config->readEntry("CommandInactiveTitlebar2","Activate and lower").ascii());
   setComboText(coTiInAct3,config->readEntry("CommandInactiveTitlebar3","Operations menu").ascii());
+  setComboText(coTiW,config->readEntry("CommandTitlebarWheel","Nothing").ascii());
+  cbTiRevW->setChecked(config->readBoolEntry("CommandTitlebarReverseWheel", false));
 }
 
 void KTitleBarActionsConfig::save()
@@ -556,10 +559,11 @@ void KTitleBarActionsConfig::save()
   config->writeEntry("CommandActiveTitlebar2", functionTiAc(coTiAct2->currentItem()));
   config->writeEntry("CommandActiveTitlebar3", functionTiAc(coTiAct3->currentItem()));
   config->writeEntry("CommandInactiveTitlebar1", functionTiInAc(coTiInAct1->currentItem()));
-  config->writeEntry("CommandTitlebarWheel", functionTiWAc(coTiAct4->currentItem()));  
   config->writeEntry("CommandInactiveTitlebar2", functionTiInAc(coTiInAct2->currentItem()));
   config->writeEntry("CommandInactiveTitlebar3", functionTiInAc(coTiInAct3->currentItem()));
-  
+  config->writeEntry("CommandTitlebarWheel", functionTiWAc(coTiW->currentItem()));
+  config->writeEntry("CommandTitlebarReverseWheel", cbTiRevW->isChecked());
+
   if (standAlone)
   {
     config->sync();
@@ -575,10 +579,11 @@ void KTitleBarActionsConfig::defaults()
   setComboText(coTiAct1,"Raise");
   setComboText(coTiAct2,"Lower");
   setComboText(coTiAct3,"Operations menu");
-  setComboText(coTiAct4,"Nothing");    
   setComboText(coTiInAct1,"Activate and raise");
   setComboText(coTiInAct2,"Activate and lower");
   setComboText(coTiInAct3,"Operations menu");
+  setComboText(coTiW,"Nothing");
+  cbTiRevW->setChecked(false);
   for (int t = 0; t < 3; ++t)
     setComboText(coMax[t], tbl_Max[t]);
 }
@@ -606,7 +611,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive"
                              " inner window ('inner' means: not titlebar, not frame).") );
 
-  grid = new TQGrid(3, Qt::Vertical, box);
+  grid = new TQGrid(3, TQt::Vertical, box);
 
   strMouseButton1 = i18n("Left button:");
   txtButton1 = i18n("In this row you can customize left click behavior when clicking into"
@@ -650,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 );
 
@@ -676,7 +681,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   TQWhatsThis::add( box, i18n("Here you can customize TDE's behavior when clicking somewhere into"
                              " a window while pressing a modifier key."));
 
-  grid = new TQGrid(5, Qt::Vertical, box);
+  grid = new TQGrid(6, TQt::Vertical, box);
 
   // Labels
   label = new TQLabel(i18n("Modifier key:"), grid);
@@ -716,11 +721,13 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
       "  in a window while pressing the modifier key.");
   TQWhatsThis::add( label, strAllW);
 
+  label = new TQLabel("", grid); // Dummy label to keep grid in order
+
   // Combo's
   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 );
 
@@ -736,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 );
 
@@ -756,14 +763,18 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config
   combo->insertItem(i18n("Raise/Lower"));
   combo->insertItem(i18n("Shade/Unshade"));
   combo->insertItem(i18n("Maximize/Restore"));
-  combo->insertItem(i18n("Keep Above/Below"));  
-  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()));
+  combo->insertItem(i18n("Keep Above/Below"));
+  combo->insertItem(i18n("Move to Previous/Next Desktop"));
+  combo->insertItem(i18n("Change Opacity"));
+  combo->insertItem(i18n("Nothing"));
+  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, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()));
+  TQWhatsThis::add( cbAllRevW, i18n("Use this to reverse the action of the mouse wheel.") );
+
   layout->addStretch();
 
   load();
@@ -784,7 +795,7 @@ void KWindowActionsConfig::setComboText( TQComboBox* combo, const char*txt )
     else if( combo == coAll1 || combo == coAll2 || combo == coAll3 )
         combo->setCurrentItem( tbl_txt_lookup( tbl_All, txt ));
     else if( combo == coAllW )
-        combo->setCurrentItem( tbl_txt_lookup( tbl_AllW, txt ));	
+        combo->setCurrentItem( tbl_txt_lookup( tbl_AllW, txt ));
     else
         abort();
 }
@@ -820,6 +831,7 @@ void KWindowActionsConfig::load()
   setComboText(coAll2,config->readEntry("CommandAll2","Toggle raise and lower").ascii());
   setComboText(coAll3,config->readEntry("CommandAll3","Resize").ascii());
   setComboText(coAllW,config->readEntry("CommandAllWheel","Nothing").ascii());
+  cbAllRevW->setChecked(config->readBoolEntry("CommandAllReverseWheel", false));
 }
 
 void KWindowActionsConfig::save()
@@ -833,7 +845,8 @@ void KWindowActionsConfig::save()
   config->writeEntry("CommandAll2", functionAll(coAll2->currentItem()));
   config->writeEntry("CommandAll3", functionAll(coAll3->currentItem()));
   config->writeEntry("CommandAllWheel", functionAllW(coAllW->currentItem()));
-  
+  config->writeEntry("CommandAllReverseWheel", cbAllRevW->isChecked());
+
   if (standAlone)
   {
     config->sync();
@@ -853,4 +866,5 @@ void KWindowActionsConfig::defaults()
   setComboText(coAll2,"Toggle raise and lower");
   setComboText(coAll3,"Resize");
   setComboText(coAllW,"Nothing");
+  cbAllRevW->setChecked(false);
 }
diff --git a/twin/kcmtwin/twinoptions/mouse.h b/twin/kcmtwin/twinoptions/mouse.h
index 772bc5ac9..2a57fc534 100644
--- a/twin/kcmtwin/twinoptions/mouse.h
+++ b/twin/kcmtwin/twinoptions/mouse.h
@@ -22,6 +22,7 @@
 #ifndef __KKWMMOUSECONFIG_H__
 #define __KKWMMOUSECONFIG_H__
 
+class TQCheckBox;
 class TDEConfig;
 
 #include <tqwidget.h>
@@ -32,8 +33,8 @@ class TDEConfig;
 
 class ToolTipComboBox: public TQComboBox
 {
-  Q_OBJECT
-    
+  TQ_OBJECT
+
 public:
   ToolTipComboBox(TQWidget * owner, char const * const * toolTips_)
     : TQComboBox(owner)
@@ -50,7 +51,7 @@ protected:
 
 class KTitleBarActionsConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -62,18 +63,18 @@ public:
   void defaults();
 
 public slots:
-	void changed() { emit TDECModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
 
 private:
   TQComboBox* coTiDbl;
-
   TQComboBox* coTiAct1;
   TQComboBox* coTiAct2;
   TQComboBox* coTiAct3;
-  TQComboBox* coTiAct4;  
   TQComboBox* coTiInAct1;
   TQComboBox* coTiInAct2;
   TQComboBox* coTiInAct3;
+  TQComboBox* coTiW;
+  TQCheckBox* cbTiRevW;
 
   ToolTipComboBox * coMax[3];
 
@@ -82,7 +83,7 @@ private:
 
   const char* functionTiDbl(int);
   const char* functionTiAc(int);
-  const char* functionTiWAc(int);  
+  const char* functionTiWAc(int);
   const char* functionTiInAc(int);
   const char* functionMax(int);
 
@@ -96,7 +97,7 @@ private slots:
 
 class KWindowActionsConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -108,7 +109,7 @@ public:
   void defaults();
 
 public slots:
-	void changed() { emit TDECModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
 
 private:
   TQComboBox* coWin1;
@@ -120,6 +121,7 @@ private:
   TQComboBox* coAll2;
   TQComboBox* coAll3;
   TQComboBox* coAllW;
+  TQCheckBox* cbAllRevW;
 
   TDEConfig *config;
   bool standAlone;
diff --git a/twin/kcmtwin/twinoptions/twinactiveborders.desktop b/twin/kcmtwin/twinoptions/twinactiveborders.desktop
new file mode 100644
index 000000000..54e7d0731
--- /dev/null
+++ b/twin/kcmtwin/twinoptions/twinactiveborders.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Icon=kcmkwm
+Type=Application
+Exec=tdecmshell twinoptions
+X-DocPath=kcontrol/windowbehavior/index.html
+
+X-TDE-ModuleType=Library
+X-TDE-Library=twinoptions
+X-TDE-FactoryName=twinaborders
+
+Name=Active Borders
+
+Comment=Configure active borders/corners feature
+
+Keywords=window behavior;windows;frame;titlebar;borders;corners;active borders;aerosnap;
+
+Categories=Qt;TDE;X-TDE-settings-desktop;
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 66249d474..9d8e8d617 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -29,6 +29,7 @@
 #include <tqslider.h>
 #include <tqwhatsthis.h>
 #include <tqvbuttongroup.h>
+#include <tqvbox.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqlabel.h>
@@ -55,34 +56,39 @@
 
 
 // twin config keywords
-#define KWIN_FOCUS                 "FocusPolicy"
-#define KWIN_PLACEMENT             "Placement"
-#define KWIN_MOVE                  "MoveMode"
-#define KWIN_MINIMIZE_ANIM         "AnimateMinimize"
-#define KWIN_MINIMIZE_ANIM_SPEED   "AnimateMinimizeSpeed"
-#define KWIN_RESIZE_OPAQUE         "ResizeMode"
-#define KWIN_GEOMETRY              "GeometryTip"
-#define KWIN_AUTORAISE_INTERVAL    "AutoRaiseInterval"
-#define KWIN_AUTORAISE             "AutoRaise"
-#define KWIN_DELAYFOCUS_INTERVAL   "DelayFocusInterval"
-#define KWIN_DELAYFOCUS            "DelayFocus"
-#define KWIN_CLICKRAISE            "ClickRaise"
-#define KWIN_ANIMSHADE             "AnimateShade"
-#define KWIN_MOVE_RESIZE_MAXIMIZED "MoveResizeMaximizedWindows"
-#define KWIN_ALTTABMODE            "AltTabStyle"
-#define KWIN_TRAVERSE_ALL          "TraverseAll"
-#define KWIN_SHOW_POPUP            "ShowPopup"
-#define KWIN_ROLL_OVER_DESKTOPS    "RollOverDesktops"
-#define KWIN_SHADEHOVER            "ShadeHover"
-#define KWIN_SHADEHOVER_INTERVAL   "ShadeHoverInterval"
-#define KWIN_FOCUS_STEALING        "FocusStealingPreventionLevel"
-#define KWIN_HIDE_UTILITY          "HideUtilityWindowsForInactive"
-#define KWIN_SEPARATE_SCREEN_FOCUS "SeparateScreenFocus"
-#define KWIN_ACTIVE_MOUSE_SCREEN   "ActiveMouseScreen"
-
-// kwm config keywords
-#define KWM_ELECTRIC_BORDER                  "ElectricBorders"
-#define KWM_ELECTRIC_BORDER_DELAY            "ElectricBorderDelay"
+#define KWIN_FOCUS                  "FocusPolicy"
+#define KWIN_PLACEMENT              "Placement"
+#define KWIN_MOVE_MODE              "MoveMode"
+#define KWIN_RESIZE_MODE            "ResizeMode"
+#define KWIN_TILING_MODE            "TilingMode"
+#define KWIN_MINIMIZE_ANIM          "AnimateMinimize"
+#define KWIN_MINIMIZE_ANIM_SPEED    "AnimateMinimizeSpeed"
+#define KWIN_GEOMETRY               "GeometryTip"
+#define KWIN_AUTORAISE_INTERVAL     "AutoRaiseInterval"
+#define KWIN_AUTORAISE              "AutoRaise"
+#define KWIN_DELAYFOCUS_INTERVAL    "DelayFocusInterval"
+#define KWIN_DELAYFOCUS             "DelayFocus"
+#define KWIN_CLICKRAISE             "ClickRaise"
+#define KWIN_ANIMSHADE              "AnimateShade"
+#define KWIN_MOVE_RESIZE_MAXIMIZED  "MoveResizeMaximizedWindows"
+#define KWIN_RESET_MAX_WIN_GEOM     "ResetMaximizedWindowGeometry"
+#define KWIN_ALTTABMODE             "AltTabStyle"
+#define KWIN_TRAVERSE_ALL           "TraverseAll"
+#define KWIN_SHOW_POPUP             "ShowPopup"
+#define KWIN_ROLL_OVER_DESKTOPS     "RollOverDesktops"
+#define KWIN_SHADEHOVER             "ShadeHover"
+#define KWIN_SHADEHOVER_INTERVAL    "ShadeHoverInterval"
+#define KWIN_FOCUS_STEALING         "FocusStealingPreventionLevel"
+#define KWIN_HIDE_UTILITY           "HideUtilityWindowsForInactive"
+#define KWIN_SEPARATE_SCREEN_FOCUS  "SeparateScreenFocus"
+#define KWIN_ACTIVE_MOUSE_SCREEN    "ActiveMouseScreen"
+#define KWIN_ACTIVE_BORDERS         "ActiveBorders"
+#define KWIN_ACTIVE_BORDER_DELAY    "ActiveBorderDelay"
+#define KWIN_ACTIVE_BORDER_DISTANCE "ActiveBorderDistance"
+
+// legacy options
+#define KWIN_OLD_ACTIVE_BORDERS      "ElectricBorders"
+#define KWIN_OLD_ACTIVE_BORDER_DELAY "ElectricBorderDelay"
 
 //CT 15mar 98 - magics
 #define KWM_BRDR_SNAP_ZONE                   "BorderSnapZone"
@@ -124,7 +130,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
 
     // focus policy
     fcsBox = new TQButtonGroup(i18n("Focus"),this);
-    fcsBox->setColumnLayout( 0, Qt::Horizontal );
+    fcsBox->setColumnLayout( 0, TQt::Horizontal );
 
     TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(),
         KDialog::spacingHint());
@@ -137,7 +143,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     focusCombo->insertItem(i18n("Focus Follows Mouse"), FOCUS_FOLLOWS_MOUSE);
     focusCombo->insertItem(i18n("Focus Under Mouse"), FOCUS_UNDER_MOUSE);
     focusCombo->insertItem(i18n("Focus Strictly Under Mouse"), FOCUS_STRICTLY_UNDER_MOUSE);
-    cLay->addWidget(focusCombo,1 ,Qt::AlignLeft);
+    cLay->addWidget(focusCombo,1 ,TQt::AlignLeft);
     fLabel->setBuddy(focusCombo);
 
     // FIXME, when more policies have been added to TWin
@@ -163,35 +169,35 @@ 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:"), Qt::AlignVCenter|Qt::AlignLeft);
+    autoRaise->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
     autoRaise->setRange(0, 3000, 100, true);
     autoRaise->setSteps(100,100);
     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:"), Qt::AlignVCenter|Qt::AlignLeft);
+    delayFocus->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
     delayFocus->setRange(0, 3000, 100, true);
     delayFocus->setSteps(100,100);
     delayFocus->setSuffix(i18n(" msec"));
     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(),
@@ -206,7 +212,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "High" ));
     focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "Extreme" ));
     focusStealingLabel->setBuddy( focusStealing );
-    cLay->addWidget(focusStealing,2 ,Qt::AlignLeft);
+    cLay->addWidget(focusStealing,2 ,TQt::AlignLeft);
     wtstr = i18n( "<p>This option specifies how much TWin will try to prevent unwanted focus stealing "
                   "caused by unexpected activation of new windows. (Note: This feature does not "
                   "work with the Focus Under Mouse or Focus Strictly Under Mouse focus policies.)"
@@ -228,7 +234,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
                   "in the Notifications control module.</p>" );
     TQWhatsThis::add( focusStealing, wtstr );
     TQWhatsThis::add( focusStealingLabel, wtstr );
-    
+
     TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
                                        " come to the front when the mouse pointer has been over it for some time.") );
     wtstr = i18n("This is the delay after which the window that the mouse pointer is over will automatically"
@@ -257,10 +263,10 @@ 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 
+        TQApplication::desktop()->numScreens() == 1) // No Ximerama
     {
         separateScreenFocus->hide();
         activeMouseScreen->hide();
@@ -269,7 +275,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
     lay->addWidget(fcsBox);
 
     kbdBox = new TQButtonGroup(i18n("Navigation"), this);
-    kbdBox->setColumnLayout( 0, Qt::Horizontal );
+    kbdBox->setColumnLayout( 0, TQt::Horizontal );
     TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
 
     altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox );
@@ -285,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 );
@@ -313,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();
 }
@@ -493,7 +499,7 @@ void KFocusConfig::load( void )
     setClickRaise(key != "off");
     setAutoRaiseEnabled();      // this will disable/hide the auto raise delay widget if focus==click
     setDelayFocusEnabled();
-    
+
     setSeparateScreenFocus( config->readBoolEntry(KWIN_SEPARATE_SCREEN_FOCUS, false));
     // on by default for non click to focus policies
     setActiveMouseScreen( config->readBoolEntry(KWIN_ACTIVE_MOUSE_SCREEN, focusCombo->currentItem() != 0 ));
@@ -607,6 +613,220 @@ void KFocusConfig::defaults()
     emit TDECModule::changed(true);
 }
 
+KActiveBorderConfig::~KActiveBorderConfig() {
+    if (standAlone) delete config;
+}
+
+KActiveBorderConfig::KActiveBorderConfig(bool _standAlone, TDEConfig *_config, TQWidget *parent, const char*)
+    : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) {
+
+    TQBoxLayout *lay = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+
+    active_box = new TQButtonGroup(i18n("Active Desktop Borders"), this);
+    TQVBoxLayout *active_vbox = new TQVBoxLayout(active_box);
+    active_vbox->setSpacing(5);
+    active_vbox->setMargin(15);
+    TQWhatsThis::add( active_box, i18n("If this option is enabled, moving the mouse to a screen border"
+       " will perform an action. It will either change your desktop or tile the window that is currently"
+       " dragged.") );
+
+    TQLabel *active_func_label = new TQLabel(i18n("Function:"), active_box);
+
+    active_disable = new TQRadioButton(i18n("D&isabled"), active_box);
+
+    active_desktop = new TQRadioButton(i18n("Switch &desktop"), active_box);
+    active_desktop_conf = new TQWidget(active_box);
+    TQHBoxLayout *active_desktop_conf_hbox = new TQHBoxLayout(active_desktop_conf);
+    active_desktop_conf_hbox->addSpacing(20);
+    active_desktop_conf_hbox->setAutoAdd(true);
+    active_move = new TQCheckBox(i18n("Switch desktop only when &moving a window"), active_desktop_conf);
+
+    active_tile = new TQRadioButton(i18n("Tile &window"), active_box);
+    active_tile_conf = new TQWidget(active_box);
+    TQHBoxLayout *active_tile_conf_hbox = new TQHBoxLayout(active_tile_conf);
+    active_tile_conf_hbox->addSpacing(20);
+    TQVBox *active_tile_conf_vbox = new TQVBox(active_tile_conf);
+    active_tile_conf_hbox->addWidget(active_tile_conf_vbox);
+    active_maximize = new TQCheckBox(i18n("Maximize windows by dragging them to the &top of the screen"), active_tile_conf_vbox);
+    tilingOpaque = new TQCheckBox(i18n("Display content &while tiling windows"), active_tile_conf_vbox);
+    TQWhatsThis::add(tilingOpaque, i18n("Enable this option if you want a window's"
+                                       " content to be shown while tiling it,"
+                                       " instead of just showing a window"
+                                       " 'skeleton'. The result may not be "
+                                       " satisfying on slow machines."));
+
+    delays = new KIntNumInput(10, active_box);
+    delays->setRange(0, MAX_EDGE_RES, 50, 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"
+       " active borders feature. The selected action will be performed after the mouse "
+       " 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->setSuffix(i18n(" px"));
+    distance->setLabel(i18n("Border &activation distance:"));
+    TQWhatsThis::add( distance, i18n("The distance from which an active border can"
+       " be activated. A lower value requires you to push repeatedly into the edge."
+       " Setting this to a higher value (e.g. 30) activates the borders when the"
+       " mouse is close enough, making them easier to activate but also more prone"
+       " to false activations."));
+
+    active_vbox->addSpacing(10);
+    active_vbox->addWidget(active_func_label);
+    active_vbox->addWidget(active_disable);
+    active_vbox->addWidget(active_desktop);
+    active_vbox->addWidget(active_desktop_conf);
+    active_vbox->addWidget(active_tile);
+    active_vbox->addWidget(active_tile_conf);
+    active_vbox->addSpacing(15);
+    active_vbox->addWidget(delays);
+    active_vbox->addWidget(distance);
+    active_vbox->addSpacing(15);
+    active_vbox->addWidget(tilingOpaque);
+
+    connect(active_box, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateActiveBorders()));
+
+    // Any changes go to slotChanged()
+    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();
+    load();
+}
+
+void KActiveBorderConfig::load() {
+    config->setGroup("Windows");
+
+    // compatibility with old option names
+    int active_borders = config->readNumEntry(KWIN_ACTIVE_BORDERS, -1);
+    if (active_borders == -1) {
+        active_borders = config->readNumEntry(KWIN_OLD_ACTIVE_BORDERS, 0);
+    }
+
+    int active_borders_delay = config->readNumEntry(KWIN_ACTIVE_BORDER_DELAY, -1);
+    if (active_borders_delay == -1) {
+        active_borders_delay = config->readNumEntry(KWIN_OLD_ACTIVE_BORDER_DELAY, 150);
+    }
+
+    setActiveBorders(active_borders);
+    setActiveBorderDelay(active_borders_delay);
+    setActiveBorderDistance(config->readNumEntry(KWIN_ACTIVE_BORDER_DISTANCE, 10));
+
+    TQString tilingMode = config->readEntry(KWIN_TILING_MODE, "Opaque");
+    if (tilingMode == "Opaque")
+        setTilingMode(OPAQUE);
+    else if (tilingMode == "Transparent")
+        setTilingMode(TRANSPARENT);
+
+    emit TDECModule::changed(false);
+}
+
+void KActiveBorderConfig::save() {
+    config->setGroup("Windows");
+
+    config->writeEntry(KWIN_ACTIVE_BORDERS, getActiveBorders());
+    config->writeEntry(KWIN_ACTIVE_BORDER_DELAY, getActiveBorderDelay());
+    config->writeEntry(KWIN_ACTIVE_BORDER_DISTANCE, getActiveBorderDistance());
+
+    // remove replaced legacy entries
+    config->deleteEntry(KWIN_OLD_ACTIVE_BORDERS);
+    config->deleteEntry(KWIN_OLD_ACTIVE_BORDER_DELAY);
+
+    int tilingMode = getTilingMode();
+    if (tilingMode == OPAQUE)
+        config->writeEntry(KWIN_TILING_MODE, "Opaque");
+    else
+        config->writeEntry(KWIN_TILING_MODE, "Transparent");
+
+    if (standAlone)
+    {
+        config->sync();
+        if (!kapp->dcopClient()->isAttached())
+            kapp->dcopClient()->attach();
+        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+    }
+    emit TDECModule::changed(false);
+}
+
+void KActiveBorderConfig::defaults() {
+    setActiveBorders(0);
+    setActiveBorderDelay(150);
+    setActiveBorderDistance(10);
+    setTilingMode(TRANSPARENT);
+    emit TDECModule::changed(true);
+}
+
+int KActiveBorderConfig::getTilingMode() {
+    return tilingOpaque->isChecked() ? OPAQUE : TRANSPARENT;
+}
+
+void KActiveBorderConfig::setTilingMode(int opaque) {
+    tilingOpaque->setChecked(opaque == OPAQUE);
+}
+
+void KActiveBorderConfig::updateActiveBorders() {
+    active_desktop_conf->setEnabled(active_desktop->isChecked());
+    active_tile_conf->setEnabled(active_tile->isChecked());
+}
+
+int KActiveBorderConfig::getActiveBorders() {
+    if (active_desktop->isChecked())
+    {
+        return active_move->isChecked() ? 1 : 2;
+    }
+
+    if (active_tile->isChecked())
+    {
+        return active_maximize->isChecked() ? 4 : 3;
+    }
+
+    return 0;
+}
+
+int KActiveBorderConfig::getActiveBorderDelay() {
+    return delays->value();
+}
+
+int KActiveBorderConfig::getActiveBorderDistance() {
+    return distance->value();
+}
+
+void KActiveBorderConfig::setActiveBorders(int i) {
+    switch(i)
+    {
+      case 1:
+          active_move->setChecked(true);
+      case 2:
+          active_desktop->setChecked(true);
+          break;
+      case 4:
+          active_maximize->setChecked(true);
+      case 3:
+          active_tile->setChecked(true);
+          break;
+      default:
+          active_disable->setChecked(true);
+          break;
+    }
+    updateActiveBorders();
+}
+
+void KActiveBorderConfig::setActiveBorderDelay(int delay)
+{
+    delays->setValue(delay);
+}
+
+void KActiveBorderConfig::setActiveBorderDistance(int d) {
+    distance->setValue(d);
+}
+
 KAdvancedConfig::~KAdvancedConfig ()
 {
     if (standAlone)
@@ -640,10 +860,10 @@ 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:"), Qt::AlignVCenter|Qt::AlignLeft);
+    shadeHover->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft);
     shadeHover->setRange(0, 3000, 100, true);
     shadeHover->setSteps(100, 100);
     shadeHover->setSuffix(i18n(" msec"));
@@ -658,42 +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()));
-
-    electricBox = new TQVButtonGroup(i18n("Active Desktop Borders"), this);
-    electricBox->setMargin(15);
-
-    TQWhatsThis::add( electricBox, i18n("If this option is enabled, moving the mouse to a screen border"
-       " will change your desktop. This is e.g. useful if you want to drag windows from one desktop"
-       " to the other.") );
-    active_disable = new TQRadioButton(i18n("D&isabled"), electricBox);
-    active_move    = new TQRadioButton(i18n("Only &when moving windows"), electricBox);
-    active_always  = new TQRadioButton(i18n("A&lways enabled"), electricBox);
-
-    delays = new KIntNumInput(10, electricBox);
-    delays->setRange(0, MAX_EDGE_RES, 50, true);
-    delays->setSuffix(i18n(" msec"));
-    delays->setLabel(i18n("Desktop &switch delay:"));
-    TQWhatsThis::add( delays, i18n("Here you can set a delay for switching desktops using the active"
-       " borders feature. Desktops will be switched after the mouse has been pushed against a screen border"
-       " for the specified number of milliseconds.") );
-
-    connect( electricBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setEBorders()));
-
-    // Any changes goes to slotChanged()
-    connect(electricBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()));
-    connect(delays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
-
-    lay->addWidget(electricBox);
+    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"
+        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();
@@ -736,9 +930,6 @@ void KAdvancedConfig::load( void )
     setShadeHover(config->readBoolEntry(KWIN_SHADEHOVER, false));
     setShadeHoverInterval(config->readNumEntry(KWIN_SHADEHOVER_INTERVAL, 250));
 
-    setElectricBorders(config->readNumEntry(KWM_ELECTRIC_BORDER, 0));
-    setElectricBorderDelay(config->readNumEntry(KWM_ELECTRIC_BORDER_DELAY, 150));
-
     setHideUtilityWindowsForInactive( config->readBoolEntry( KWIN_HIDE_UTILITY, true ));
 
     emit TDECModule::changed(false);
@@ -758,10 +949,6 @@ void KAdvancedConfig::save( void )
     v = getShadeHoverInterval();
     if (v<0) v = 0;
     config->writeEntry(KWIN_SHADEHOVER_INTERVAL, v);
-
-    config->writeEntry(KWM_ELECTRIC_BORDER, getElectricBorders());
-    config->writeEntry(KWM_ELECTRIC_BORDER_DELAY,getElectricBorderDelay());
-
     config->writeEntry(KWIN_HIDE_UTILITY, hideUtilityWindowsForInactive->isChecked());
 
     if (standAlone)
@@ -779,47 +966,10 @@ void KAdvancedConfig::defaults()
     setAnimateShade(true);
     setShadeHover(false);
     setShadeHoverInterval(250);
-    setElectricBorders(0);
-    setElectricBorderDelay(150);
     setHideUtilityWindowsForInactive( true );
     emit TDECModule::changed(true);
 }
 
-void KAdvancedConfig::setEBorders()
-{
-    delays->setEnabled(!active_disable->isChecked());
-}
-
-int KAdvancedConfig::getElectricBorders()
-{
-    if (active_move->isChecked())
-       return 1;
-    if (active_always->isChecked())
-       return 2;
-    return 0;
-}
-
-int KAdvancedConfig::getElectricBorderDelay()
-{
-    return delays->value();
-}
-
-void KAdvancedConfig::setElectricBorders(int i){
-    switch(i)
-    {
-      case 1: active_move->setChecked(true); break;
-      case 2: active_always->setChecked(true); break;
-      default: active_disable->setChecked(true); break;
-    }
-    setEBorders();
-}
-
-void KAdvancedConfig::setElectricBorderDelay(int delay)
-{
-    delays->setValue(delay);
-}
-
-
 KMovingConfig::~KMovingConfig ()
 {
     if (standAlone)
@@ -833,24 +983,24 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
     TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint());
 
     windowsBox = new TQButtonGroup(i18n("Windows"), this);
-    windowsBox->setColumnLayout( 0, Qt::Horizontal );
+    windowsBox->setColumnLayout( 0, TQt::Horizontal );
 
     TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
 
     TQBoxLayout *bLay = new TQVBoxLayout;
     wLay->addLayout(bLay);
 
-    opaque = new TQCheckBox(i18n("Di&splay content in moving windows"), windowsBox);
-    bLay->addWidget(opaque);
-    TQWhatsThis::add( opaque, i18n("Enable this option if you want a window's content to be fully shown"
-                                  " while moving it, instead of just showing a window 'skeleton'. The result may not be satisfying"
-                                  " on slow machines without graphic acceleration.") );
+    moveOpaque = new TQCheckBox(i18n("Di&splay content in moving windows"), windowsBox);
+    bLay->addWidget(moveOpaque);
+    TQWhatsThis::add(moveOpaque, i18n("Enable this option if you want a window's content to be fully shown"
+                                     " while moving it, instead of just showing a window 'skeleton'. The result may not be satisfying"
+                                     " on slow machines without graphic acceleration."));
 
-    resizeOpaqueOn = new TQCheckBox(i18n("Display content in &resizing windows"), windowsBox);
-    bLay->addWidget(resizeOpaqueOn);
-    TQWhatsThis::add( resizeOpaqueOn, i18n("Enable this option if you want a window's content to be shown"
-                                          " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying"
-                                          " on slow machines.") );
+    resizeOpaque = new TQCheckBox(i18n("Display content in &resizing windows"), windowsBox);
+    bLay->addWidget(resizeOpaque);
+    TQWhatsThis::add(resizeOpaque, i18n("Enable this option if you want a window's content to be shown"
+                                       " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying"
+                                       " on slow machines."));
 
     geometryTipOn = new TQCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox);
     bLay->addWidget(geometryTipOn);
@@ -860,7 +1010,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
                                         " its size."));
 
     TQGridLayout *rLay = new TQGridLayout(2,3);
-    bLay->addLayout(TQT_TQLAYOUT(rLay));
+    bLay->addLayout(rLay);
     rLay->setColStretch(0,0);
     rLay->setColStretch(1,1);
 
@@ -870,22 +1020,22 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
                                           " windows are minimized or restored." ) );
     rLay->addWidget(minimizeAnimOn,0,0);
 
-    minimizeAnimSlider = new TQSlider(0,10,10,0,Qt::Horizontal, windowsBox);
+    minimizeAnimSlider = new TQSlider(0,10,10,0,TQt::Horizontal, windowsBox);
     minimizeAnimSlider->setSteps(1, 1);
     // TQSlider::Below clashes with a X11/X.h #define
     #undef Below
     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(Qt::AlignTop|Qt::AlignLeft);
+    minimizeAnimSlowLabel->setAlignment(TQt::AlignTop|TQt::AlignLeft);
     rLay->addWidget(minimizeAnimSlowLabel,1,1);
 
     minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox);
-    minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
+    minimizeAnimFastLabel->setAlignment(TQt::AlignTop|TQt::AlignRight);
     rLay->addWidget(minimizeAnimFastLabel,1,2);
 
     wtstr = i18n("Here you can set the speed of the animation shown when windows are"
@@ -900,6 +1050,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
                                               " and allows you to move or resize them,"
                                               " just like for normal windows"));
 
+    resetMaximizedWindowGeometry = new TQCheckBox( i18n("Restore size of maximized/tiled windows when moving"), windowsBox);
+    bLay->addWidget(resetMaximizedWindowGeometry);
+    TQWhatsThis::add(resetMaximizedWindowGeometry, i18n("If this feature is enabled, dragging a maximized or tiled window"
+                                                        " will restore the window to its original size."));
+
     TQBoxLayout *vLay = new TQHBoxLayout(bLay);
 
     TQLabel *plcLabel = new TQLabel(i18n("&Placement:"),windowsBox);
@@ -935,7 +1090,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
 
     plcLabel->setBuddy(placementCombo);
     vLay->addWidget(plcLabel, 0);
-    vLay->addWidget(placementCombo, 1, Qt::AlignLeft);
+    vLay->addWidget(placementCombo, 1, TQt::AlignLeft);
 
     bLay->addSpacing(10);
 
@@ -988,34 +1143,25 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa
     load();
 
     // Any changes goes to slotChanged()
-    connect( opaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
-    connect( resizeOpaqueOn, 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( 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());
     slotWndwSnapChanged(WndwSnap->value());
 }
 
-int KMovingConfig::getMove()
-{
-    return (opaque->isChecked())? OPAQUE : TRANSPARENT;
-}
-
-void KMovingConfig::setMove(int trans)
-{
-    opaque->setChecked(trans == OPAQUE);
-}
-
 void KMovingConfig::setGeometryTip(bool showGeometryTip)
 {
     geometryTipOn->setChecked(showGeometryTip);
@@ -1060,20 +1206,33 @@ void KMovingConfig::setMinimizeAnimSpeed(int speed)
     minimizeAnimSlider->setValue(speed);
 }
 
-int KMovingConfig::getResizeOpaque()
+int KMovingConfig::getMoveMode() {
+    return moveOpaque->isChecked() ? OPAQUE : TRANSPARENT;
+}
+
+void KMovingConfig::setMoveMode(int opaque)
+{
+    moveOpaque->setChecked(opaque == OPAQUE);
+}
+
+int KMovingConfig::getResizeMode()
 {
-    return (resizeOpaqueOn->isChecked())? RESIZE_OPAQUE : RESIZE_TRANSPARENT;
+    return resizeOpaque->isChecked() ? OPAQUE : TRANSPARENT;
 }
 
-void KMovingConfig::setResizeOpaque(int opaque)
+void KMovingConfig::setResizeMode(int opaque)
 {
-    resizeOpaqueOn->setChecked(opaque == RESIZE_OPAQUE);
+    resizeOpaque->setChecked(opaque == OPAQUE);
 }
 
 void KMovingConfig::setMoveResizeMaximized(bool a) {
     moveResizeMaximized->setChecked(a);
 }
 
+void KMovingConfig::setResetMaximizedWindowGeometry(bool a) {
+    resetMaximizedWindowGeometry->setChecked(a);
+}
+
 void KMovingConfig::slotBrdrSnapChanged(int value) {
     BrdrSnap->setSuffix(i18n(" pixel", " pixels", value));
 }
@@ -1088,11 +1247,18 @@ void KMovingConfig::load( void )
 
     config->setGroup( "Windows" );
 
-    key = config->readEntry(KWIN_MOVE, "Opaque");
-    if( key == "Transparent")
-        setMove(TRANSPARENT);
-    else if( key == "Opaque")
-        setMove(OPAQUE);
+    // DF: please keep the default consistent with twin (options.cpp)
+    key = config->readEntry(KWIN_MOVE_MODE, "Opaque");
+    if (key == "Opaque")
+        setMoveMode(OPAQUE);
+    else if (key == "Transparent")
+        setMoveMode(TRANSPARENT);
+
+    key = config->readEntry(KWIN_RESIZE_MODE, "Opaque");
+    if (key == "Opaque")
+        setResizeMode(OPAQUE);
+    else if (key == "Transparent")
+        setResizeMode(TRANSPARENT);
 
     //CT 17Jun1998 - variable animation speed from 0 (none!!) to 10 (max)
     bool anim = config->readBoolEntry(KWIN_MINIMIZE_ANIM, true );
@@ -1102,13 +1268,6 @@ void KMovingConfig::load( void )
     setMinimizeAnim( anim );
     setMinimizeAnimSpeed( animSpeed );
 
-    // DF: please keep the default consistent with twin (options.cpp line 145)
-    key = config->readEntry(KWIN_RESIZE_OPAQUE, "Opaque");
-    if( key == "Opaque")
-        setResizeOpaque(RESIZE_OPAQUE);
-    else if ( key == "Transparent")
-        setResizeOpaque(RESIZE_TRANSPARENT);
-
     //KS 10Jan2003 - Geometry Tip during window move/resize
     bool showGeomTip = config->readBoolEntry(KWIN_GEOMETRY, false);
     setGeometryTip( showGeomTip );
@@ -1149,6 +1308,7 @@ void KMovingConfig::load( void )
 //  }
 
     setMoveResizeMaximized(config->readBoolEntry(KWIN_MOVE_RESIZE_MAXIMIZED, false));
+    setResetMaximizedWindowGeometry(config->readBoolEntry(KWIN_RESET_MAX_WIN_GEOM, false));
 
     int v;
 
@@ -1172,16 +1332,22 @@ void KMovingConfig::save( void )
 
     config->setGroup( "Windows" );
 
-    v = getMove();
-    if (v == TRANSPARENT)
-        config->writeEntry(KWIN_MOVE,"Transparent");
+    v = getMoveMode();
+    if (v == OPAQUE)
+        config->writeEntry(KWIN_MOVE_MODE, "Opaque");
+    else
+        config->writeEntry(KWIN_MOVE_MODE, "Transparent");
+
+    v = getResizeMode();
+    if (v == OPAQUE)
+        config->writeEntry(KWIN_RESIZE_MODE, "Opaque");
     else
-        config->writeEntry(KWIN_MOVE,"Opaque");
+        config->writeEntry(KWIN_RESIZE_MODE, "Transparent");
 
     config->writeEntry(KWIN_GEOMETRY, getGeometryTip());
 
     // placement policy --- CT 31jan98 ---
-    v =getPlacement();
+    v = getPlacement();
     if (v == RANDOM_PLACEMENT)
         config->writeEntry(KWIN_PLACEMENT, "Random");
     else if (v == CASCADE_PLACEMENT)
@@ -1205,13 +1371,8 @@ void KMovingConfig::save( void )
     config->writeEntry(KWIN_MINIMIZE_ANIM, getMinimizeAnim());
     config->writeEntry(KWIN_MINIMIZE_ANIM_SPEED, getMinimizeAnimSpeed());
 
-    v = getResizeOpaque();
-    if (v == RESIZE_OPAQUE)
-        config->writeEntry(KWIN_RESIZE_OPAQUE, "Opaque");
-    else
-        config->writeEntry(KWIN_RESIZE_OPAQUE, "Transparent");
-
     config->writeEntry(KWIN_MOVE_RESIZE_MAXIMIZED, moveResizeMaximized->isChecked());
+    config->writeEntry(KWIN_RESET_MAX_WIN_GEOM, resetMaximizedWindowGeometry->isChecked());
 
 
     config->writeEntry(KWM_BRDR_SNAP_ZONE,getBorderSnapZone());
@@ -1230,11 +1391,12 @@ void KMovingConfig::save( void )
 
 void KMovingConfig::defaults()
 {
-    setMove(OPAQUE);
-    setResizeOpaque(RESIZE_TRANSPARENT);
+    setMoveMode(OPAQUE);
+    setResizeMode(TRANSPARENT);
     setGeometryTip(false);
     setPlacement(SMART_PLACEMENT);
     setMoveResizeMaximized(false);
+    setResetMaximizedWindowGeometry(false);
 
     //copied from kcontrol/konq/twindesktop, aleXXX
     setWindowSnapZone(KWM_WNDW_SNAP_ZONE_DEFAULT);
@@ -1297,12 +1459,12 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config,
   TQWidget *tGroup = new TQWidget(tabW);
   TQVBoxLayout *vLay = new TQVBoxLayout (tGroup,KDialog::marginHint(), KDialog::spacingHint());
   vLay->addSpacing(11); // to get the proper gb top offset
-  
+
   onlyDecoTranslucent = new TQCheckBox(i18n("Apply translucency only to decoration"),tGroup);
   vLay->addWidget(onlyDecoTranslucent);
-  
+
   vLay->addSpacing(11);
-  
+
   TQGridLayout *gLay = new TQGridLayout(vLay,4,2,KDialog::spacingHint());
   gLay->setColStretch(1,1);
 
@@ -1440,7 +1602,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config,
 
   TQLabel *label6 = new TQLabel(i18n("Shadow color:"),sGroup);
   gLay2->addWidget(label6,7,0);
-  shadowColor = new KColorButton(Qt::black,sGroup);
+  shadowColor = new KColorButton(TQt::black,sGroup);
   gLay2->addWidget(shadowColor,7,1);
   gLay2->setColStretch(1,1);
   vLay2->addSpacing(11);
@@ -1478,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()));
 
   }
 }
@@ -1642,7 +1804,7 @@ void KTranslucencyConfig::load( void )
   r = g = b = 256;
 
   if (sscanf(hex.latin1(), "0x%02x%02x%02x", &r, &g, &b)!=3 || r > 255 || g > 255 || b > 255)
-    shadowColor->setColor(Qt::black);
+    shadowColor->setColor(TQt::black);
   else
     shadowColor->setColor(TQColor(r,g,b));
 
@@ -1850,7 +2012,7 @@ void KTranslucencyConfig::defaults()
   useShadowsOnDockWindows->setChecked(FALSE);
   removeShadowsOnMove->setChecked(FALSE);
   removeShadowsOnResize->setChecked(FALSE);
-  shadowColor->setColor(Qt::black);
+  shadowColor->setColor(TQt::black);
   fadeInWindows->setChecked(FALSE);
   fadeInMenuWindows->setChecked(TRUE);
   fadeInToolTipWindows->setChecked(TRUE);
diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h
index d4d358e9a..80c9e76d7 100644
--- a/twin/kcmtwin/twinoptions/windows.h
+++ b/twin/kcmtwin/twinoptions/windows.h
@@ -50,9 +50,6 @@ class KIntNumInput;
 #define TITLEBAR_PLAIN  0
 #define TITLEBAR_SHADED 1
 
-#define RESIZE_TRANSPARENT  0
-#define RESIZE_OPAQUE       1
-
 #define SMART_PLACEMENT        0
 #define MAXIMIZING_PLACEMENT   1
 #define CASCADE_PLACEMENT      2
@@ -68,10 +65,11 @@ class KIntNumInput;
 #define  FOCUS_STRICTLY_UNDER_MOUSE   3
 
 class TQSpinBox;
+class TQHBox;
 
 class KFocusConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KFocusConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
   ~KFocusConfig();
@@ -88,7 +86,7 @@ private slots:
   void clickRaiseOnTog(bool);
   void updateAltTabMode();
   void updateActiveMouseScreen();
-	void changed() { emit TDECModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
 
 
 private:
@@ -134,7 +132,7 @@ private:
 
 class KMovingConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KMovingConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KMovingConfig();
@@ -146,32 +144,34 @@ public:
 private slots:
   void setMinimizeAnim( bool );
   void setMinimizeAnimSpeed( int );
-	void changed() { emit TDECModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
   void slotBrdrSnapChanged( int );
   void slotWndwSnapChanged( int );
 
 private:
-  int getMove( void );
+  int  getMoveMode( void );
+  int  getResizeMode ( void );
   bool getMinimizeAnim( void );
-  int getMinimizeAnimSpeed( void );
-  int getResizeOpaque ( void );
+  int  getMinimizeAnimSpeed( void );
   bool getGeometryTip( void ); //KS
-  int getPlacement( void ); //CT
+  int  getPlacement( void ); //CT
 
-  void setMove(int);
-  void setResizeOpaque(int);
+  void setMoveMode(int);
+  void setResizeMode(int);
   void setGeometryTip(bool); //KS
   void setPlacement(int); //CT
   void setMoveResizeMaximized(bool);
+  void setResetMaximizedWindowGeometry(bool);
 
   TQButtonGroup *windowsBox;
-  TQCheckBox *opaque;
-  TQCheckBox *resizeOpaqueOn;
+  TQCheckBox *moveOpaque;
+  TQCheckBox *resizeOpaque;
   TQCheckBox *geometryTipOn;
-  TQCheckBox* minimizeAnimOn;
+  TQCheckBox *minimizeAnimOn;
   TQSlider *minimizeAnimSlider;
   TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel;
   TQCheckBox *moveResizeMaximized;
+  TQCheckBox *resetMaximizedWindowGeometry;
 
   TQComboBox *placementCombo;
 
@@ -189,9 +189,54 @@ private:
 
 };
 
+class KActiveBorderConfig : public TDECModule
+{
+    TQ_OBJECT
+    public:
+        KActiveBorderConfig(bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char *name = 0);
+        ~KActiveBorderConfig();
+
+        void load();
+        void save();
+        void defaults();
+
+    private slots:
+        // copied from kcontrol/konq/twindesktop, aleXXX
+        // original name: setEBorders()
+        void updateActiveBorders();
+
+        void changed() { emit TDECModule::changed(true); }
+
+    private:
+        int getActiveBorders();
+        int getActiveBorderDelay();
+        int getActiveBorderDistance();
+        int getTilingMode();
+
+        void setActiveBorders(int);
+        void setActiveBorderDelay(int);
+        void setActiveBorderDistance(int);
+        void setTilingMode(int);
+
+        TQButtonGroup *active_box;
+        TQRadioButton *active_disable;
+        TQRadioButton *active_desktop;
+        TQCheckBox *active_move;
+        TQRadioButton *active_tile;
+        TQCheckBox *active_maximize;
+        KIntNumInput *delays;
+        KIntNumInput *distance;
+        TQWidget *active_desktop_conf;
+        TQWidget *active_tile_conf;
+        TQCheckBox *tilingOpaque;
+
+        TDEConfig *config;
+        bool standAlone;
+};
+
 class KAdvancedConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KAdvancedConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KAdvancedConfig();
@@ -203,9 +248,6 @@ public:
 private slots:
   void shadeHoverChanged(bool);
 
-  //copied from kcontrol/konq/twindesktop, aleXXX
-  void setEBorders();
-
   void changed() { emit TDECModule::changed(true); }
 
 private:
@@ -223,17 +265,6 @@ private:
   TDEConfig *config;
   bool     standAlone;
 
-  int getElectricBorders( void );
-  int getElectricBorderDelay();
-  void setElectricBorders( int );
-  void setElectricBorderDelay( int );
-
-  TQVButtonGroup *electricBox;
-  TQRadioButton *active_disable;
-  TQRadioButton *active_move;
-  TQRadioButton *active_always;
-  KIntNumInput *delays;
-  
   void setHideUtilityWindowsForInactive( bool );
 
   TQCheckBox* hideUtilityWindowsForInactive;
@@ -242,15 +273,15 @@ private:
 class TDEProcess;
 class KTranslucencyConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KTranslucencyConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KTranslucencyConfig();
-  
+
   void load();
   void save();
   void defaults();
-  
+
 private:
   TQCheckBox *useTranslucency;
   TQCheckBox *activeWindowTransparency;
diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp
index f450938bc..b01066403 100644
--- a/twin/kcmtwin/twinrules/detectwidget.cpp
+++ b/twin/kcmtwin/twinrules/detectwidget.cpp
@@ -164,19 +164,19 @@ void DetectDialog::selectWindow()
     grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM );
     grabber->move( -1000, -1000 );
     grabber->show();
-    grabber->grabMouse( tqcrossCursor );
+    grabber->grabMouse( TQt::crossCursor );
     grabber->installEventFilter( this );
     }
 
 bool DetectDialog::eventFilter( TQObject* o, TQEvent* e )
     {
-    if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) )
+    if( o != grabber )
         return false;
     if( e->type() != TQEvent::MouseButtonRelease )
         return false;
     delete grabber;
     grabber = NULL;
-    if( TQT_TQMOUSEEVENT( e )->button() != Qt::LeftButton )
+    if( static_cast<TQMouseEvent*>( e )->button() != TQt::LeftButton )
         {
         emit detectionDone( false );
         return true;
diff --git a/twin/kcmtwin/twinrules/detectwidget.h b/twin/kcmtwin/twinrules/detectwidget.h
index 75e725f5f..ecd608ea7 100644
--- a/twin/kcmtwin/twinrules/detectwidget.h
+++ b/twin/kcmtwin/twinrules/detectwidget.h
@@ -33,7 +33,7 @@ namespace KWinInternal
 class DetectWidget
     : public DetectWidgetBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         DetectWidget( TQWidget* parent = NULL, const char* name = NULL );
     };
@@ -41,7 +41,7 @@ class DetectWidget
 class DetectDialog
     : public KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         DetectDialog( TQWidget* parent = NULL, const char* name = NULL );
         void detect( WId window );
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..fb7451626 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -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" ));
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index 5e89a7773..54e044845 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -34,7 +34,7 @@ class KCMRulesList;
 class KCMRules
     : public TDECModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KCMRules( TQWidget *parent, const char *name );
         virtual void load();
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/ruleslist.h b/twin/kcmtwin/twinrules/ruleslist.h
index f7e7fb541..837ad6840 100644
--- a/twin/kcmtwin/twinrules/ruleslist.h
+++ b/twin/kcmtwin/twinrules/ruleslist.h
@@ -34,7 +34,7 @@ namespace KWinInternal
 class KCMRulesList
     : public KCMRulesListBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KCMRulesList( TQWidget* parent = NULL, const char* name = NULL );
         virtual ~KCMRulesList();
diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index f079dcda3..233290e38 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -29,7 +29,7 @@
                 <cstring>new_button</cstring>
             </property>
             <property name="text">
-                <string>&amp;New...</string>
+                <string>&amp;New…</string>
             </property>
         </widget>
         <widget class="KPushButton" row="1" column="1">
@@ -37,7 +37,7 @@
                 <cstring>modify_button</cstring>
             </property>
             <property name="text">
-                <string>&amp;Modify...</string>
+                <string>&amp;Modify…</string>
             </property>
         </widget>
         <widget class="KPushButton" row="2" column="1">
@@ -47,9 +47,6 @@
             <property name="text">
                 <string>Delete</string>
             </property>
-            <property name="accel">
-                <string></string>
-            </property>
         </widget>
         <widget class="KPushButton" row="3" column="1">
             <property name="name">
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/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h
index 4d22e1826..4c4ef4be0 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.h
+++ b/twin/kcmtwin/twinrules/ruleswidget.h
@@ -36,7 +36,7 @@ class DetectDialog;
 class RulesWidget
     : public RulesWidgetBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         RulesWidget( TQWidget* parent = NULL, const char* name = NULL );
         void setRules( Rules* r );
@@ -97,7 +97,7 @@ class RulesWidget
 class RulesDialog
     : public KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         RulesDialog( TQWidget* parent = NULL, const char* name = NULL );
         Rules* edit( Rules* r, WId window, bool show_hints );
@@ -113,7 +113,7 @@ class RulesDialog
 class EditShortcut
     : public EditShortcutBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         EditShortcut( TQWidget* parent = NULL, const char* name = NULL );
     protected:
@@ -124,7 +124,7 @@ class EditShortcut
 class EditShortcutDialog
     : public KDialogBase
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         EditShortcutDialog( TQWidget* parent = NULL, const char* name = NULL );
         void setShortcut( const TQString& cut );
@@ -137,7 +137,7 @@ class EditShortcutDialog
 class ShortcutDialog
     : public TDEShortcutDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         ShortcutDialog( const TDEShortcut& cut, TQWidget* parent = NULL, const char* name = NULL );
         virtual void accept();
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index 21486c4be..356a99676 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -216,9 +216,6 @@
                         <property name="text">
                             <string>Edit</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer row="4" column="3" rowspan="1" colspan="2">
                         <property name="name">
@@ -487,9 +484,6 @@
                         <property name="text">
                             <string>Edit</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer row="4" column="3">
                         <property name="name">
@@ -560,9 +554,6 @@
                         <property name="text">
                             <string>Edit</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer row="7" column="3">
                         <property name="name">
@@ -633,9 +624,6 @@
                         <property name="text">
                             <string>Edit</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <spacer row="10" column="3">
                         <property name="name">
@@ -1869,9 +1857,6 @@
                         <property name="text">
                             <string>Shortcut</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="KComboBox" row="9" column="1">
                         <item>
@@ -1916,7 +1901,7 @@
                             <cstring>shortcut_edit</cstring>
                         </property>
                         <property name="text">
-                            <string>Edit...</string>
+                            <string>Edit…</string>
                         </property>
                     </widget>
                     <widget class="KRestrictedLine" row="9" column="2" rowspan="1" colspan="3">
@@ -2292,9 +2277,6 @@
                         <property name="text">
                             <string>Strictly obey geometry</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="KComboBox" row="6" column="1">
                         <item>
@@ -2348,9 +2330,6 @@
                         <property name="text">
                             <string>Block global shortcuts</string>
                         </property>
-                        <property name="accel">
-                            <string></string>
-                        </property>
                     </widget>
                     <widget class="KComboBox" row="7" column="1">
                         <item>
@@ -2530,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>
@@ -2538,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>
@@ -2546,8 +2525,6 @@
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
     <include location="global" impldecl="in implementation">krestrictedline.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
 </includes>
-<includehints>
-    <includehint>tdelistbox.h</includehint>
-</includehints>
 </UI>
diff --git a/twin/layers.cpp b/twin/layers.cpp
index 143d826d5..adc9bd436 100644
--- a/twin/layers.cpp
+++ b/twin/layers.cpp
@@ -129,43 +129,50 @@ void Workspace::updateStackingOrder( bool propagate_new_clients )
 void Workspace::propagateClients( bool propagate_new_clients )
     {
     Window *cl; // MW we should not assume WId and Window to be compatible
-                                // when passig pointers around.
+                                // when passing pointers around.
 
     // restack the windows according to the stacking order
-#if 0
-    Window* new_stack = new Window[ stacking_order.count() + 2 ];
-    int pos = 0;
-#endif
     NET::WindowType t;
     Window shadow;
     Window *dock_shadow_stack, *window_stack;
     int i, numDocks, pos, topmenu_space_pos;
- 
+
+    // Dock Stack size magic number explanation:
+    // -> (count * 2) because we might need to also store the shadow window
+    //    for each dock window (Chakra shadow patch, introduced in 9cc1e2c1aa)
     dock_shadow_stack = new Window[ stacking_order.count() * 2 ];
-    window_stack = new Window[ stacking_order.count() * 2 + 2 ];
+
+    // Window Stack size magic number explanation:
+    // -> (count * 2) because we might need to store shadow windows (see above)
+    // -> + 1 for supportWindow
+    // -> + 1 for topmenu_space
+    // -> + 8 for active borders
+    window_stack = new Window[ stacking_order.count() * 2 + 1 + 1 + 8 ];
     i = 0;
     pos = 0;
     topmenu_space_pos = 1; // not 0, that's supportWindow !!!
 
-    // Stack all windows under the support window. The support window is
-    // not used for anything (besides the NETWM property), and it's not shown,
-    // but it was lowered after twin startup. Stacking all clients below
-    // it ensures that no client will be ever shown above override-redirect
-    // windows (e.g. popups).
-#if 0
-    new_stack[ pos++ ] = supportWindow->winId();
-    int topmenu_space_pos = 1; // not 0, that's supportWindow !!!
-#endif
+    // Stack active windows under the support window.
+    /* The support window is not used for anything (besides the NETWM property),
+     * and it's not shown, but it was lowered after TWin startup.
+     * Stacking all clients below it ensures that no client will be ever shown
+     * above override-redirect windows (e.g. popups).
+     */
+    for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
+    {
+        if (active_windows[i] != None)
+        {
+            window_stack[pos++] = active_windows[i];
+        }
+    }
+
+    // Stack all windows under the support and active borders windows.
     window_stack[pos++] = supportWindow->winId();
     for( ClientList::ConstIterator it = stacking_order.fromLast();
          it != stacking_order.end();
          --it )
         {
-#if 0
-        new_stack[ pos++ ] = (*it)->frameId();
-        if( (*it)->belongsToLayer() >= DockLayer )
-            topmenu_space_pos = pos;
-#endif
+
 	t = (*it)->windowType();
 	switch (t)
 		{
@@ -202,15 +209,14 @@ void Workspace::propagateClients( bool propagate_new_clients )
         new_stack[ topmenu_space_pos ] = topmenu_space->winId();
 #endif
             window_stack[ i ] = window_stack[ i - 1 ];
-	window_stack[ topmenu_space_pos ] = topmenu_space->winId();
-        ++pos;
+            window_stack[ topmenu_space_pos ] = topmenu_space->winId();
+            ++pos;
         }
 #if 0
     // TODO isn't it too inefficient to restart always all clients?
     // TODO don't restack not visible windows?
     assert( new_stack[ 0 ] = supportWindow->winId());
-#endif
-#if 0
+
     XRestackWindows(tqt_xdisplay(), new_stack, pos);
     delete [] new_stack;
 #endif
@@ -418,7 +424,7 @@ void Workspace::raiseClientWithinApplication( Client* c )
 
     StackingUpdatesBlocker blocker( this );
     // ignore mainwindows
-    
+
     // first try to put it above the top-most window of the application
     for( ClientList::Iterator it = unconstrained_stacking_order.fromLast();
          it != unconstrained_stacking_order.end();
@@ -590,10 +596,10 @@ ClientList Workspace::constrainedStackingOrder()
         minimum_layer[ (*it)->group() ] = l;
         layer[ l ].append( *it );
         }
-    ClientList stacking;    
+    ClientList stacking;
     for( Layer lay = FirstLayer;
          lay < NumLayers;
-         ++lay )    
+         ++lay )
         stacking += layer[ lay ];
 #if 0
     kdDebug() << "stacking2:" << endl;
@@ -751,7 +757,7 @@ void Client::restackWindow( Window /*above TODO */, int detail, NET::RequestSour
     if( send_event )
         sendSyntheticConfigureNotify();
     }
-    
+
 void Client::setKeepAbove( bool b )
     {
     b = rules()->checkKeepAbove( b );
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 54ee415e2..d8a22458b 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();
 }
@@ -203,7 +203,7 @@ void KCommonDecoration::updateLayout() const
             if (*it) {
                 if (!(*it)->isHidden() ) {
                     moveWidget(x,y, *it);
-                    x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast<KCommonDecorationButton*>(*it) );
+                    x += layoutMetric(LM_ButtonWidth, true, ::tqt_cast<KCommonDecorationButton*>(*it) );
                     elementLayouted = true;
                 }
             } else {
@@ -226,7 +226,7 @@ void KCommonDecoration::updateLayout() const
             if (*it) {
                 if (!(*it)->isHidden() ) {
                     moveWidget(x,y, *it);
-                    x += layoutMetric(LM_ButtonWidth, true, ::tqqt_cast<KCommonDecorationButton*>(*it) );;
+                    x += layoutMetric(LM_ButtonWidth, true, ::tqt_cast<KCommonDecorationButton*>(*it) );;
                     elementLayouted = true;
                 }
             } else {
@@ -349,9 +349,9 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                           btn = createButton(MenuButton);
                           if (!btn) break;
                           btn->setTipText(i18n("Menu") );
-                          btn->setRealizeButtons(Qt::LeftButton|Qt::RightButton);
-                          connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()));
-                          connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased()));
+                          btn->setRealizeButtons(TQt::LeftButton|TQt::RightButton);
+                          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;
                   }
@@ -396,12 +396,12 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
                   if ((!m_button[MaxButton]) && isMaximizable()){
                       btn = createButton(MaxButton);
                       if (!btn) break;
-                      btn->setRealizeButtons(Qt::LeftButton|Qt::MidButton|Qt::RightButton);
+                      btn->setRealizeButtons(TQt::LeftButton|TQt::MidButton|TQt::RightButton);
                       const bool max = maximizeMode()==MaximizeFull;
                       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;
                   }
@@ -710,7 +710,7 @@ void KCommonDecoration::resizeWidget(int w, int h, TQWidget *widget) const
 
 void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-    if( e->button() != Qt::LeftButton )
+    if( e->button() != TQt::LeftButton )
         return;
 
     int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom);
@@ -844,24 +844,24 @@ void KCommonDecoration::updateWindowShape()
 
 bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e )
 {
-    if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()))
+    if( o != widget())
         return false;
     switch( e->type())
     {
         case TQEvent::Resize:
-            resizeEvent(TQT_TQRESIZEEVENT(e) );
+            resizeEvent(static_cast<TQResizeEvent*>(e) );
             return true;
         case TQEvent::Paint:
-            paintEvent(TQT_TQPAINTEVENT( e ));
+            paintEvent(static_cast<TQPaintEvent*>( e ));
             return true;
         case TQEvent::MouseButtonDblClick:
-            mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e ));
+            mouseDoubleClickEvent(static_cast<TQMouseEvent*>( e ));
             return true;
         case TQEvent::MouseButtonPress:
-            processMousePressEvent(TQT_TQMOUSEEVENT( e ));
+            processMousePressEvent(static_cast<TQMouseEvent*>( e ));
             return true;
         case TQEvent::Wheel:
-            wheelEvent(TQT_TQWHEELEVENT( e ));
+            wheelEvent(static_cast<TQWheelEvent*>( e ));
             return true;
         default:
             return false;
@@ -881,7 +881,7 @@ bool KCommonDecoration::isToolWindow() const
 TQRect KCommonDecoration::titleRect() const
 {
     int r_x, r_y, r_x2, r_y2;
-    TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2);
+    widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
     const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
     const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
     const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
@@ -900,8 +900,8 @@ KCommonDecorationButton::KCommonDecorationButton(ButtonType type, KCommonDecorat
     : TQButton(parent->widget(), name),
         m_decoration(parent),
         m_type(type),
-        m_realizeButtons(Qt::LeftButton),
-        m_lastMouse(Qt::NoButton),
+        m_realizeButtons(TQt::LeftButton),
+        m_lastMouse(TQt::NoButton),
         m_isLeft(true)
 {
     setCursor(ArrowCursor);
@@ -975,7 +975,7 @@ void KCommonDecorationButton::mousePressEvent(TQMouseEvent* e)
     m_lastMouse = e->button();
     // pass on event after changing button to LeftButton
     TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
-                   (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state());
+                   (e->button()&m_realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state());
 
     TQButton::mousePressEvent(&me);
 }
@@ -985,7 +985,7 @@ void KCommonDecorationButton::mouseReleaseEvent(TQMouseEvent* e)
     m_lastMouse = e->button();
     // pass on event after changing button to LeftButton
     TQMouseEvent me(e->type(), e->pos(), e->globalPos(),
-                   (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state());
+                   (e->button()&m_realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state());
 
     TQButton::mouseReleaseEvent(&me);
 }
diff --git a/twin/lib/kcommondecoration.h b/twin/lib/kcommondecoration.h
index c914628e6..1ef9b1bba 100644
--- a/twin/lib/kcommondecoration.h
+++ b/twin/lib/kcommondecoration.h
@@ -58,7 +58,7 @@ class KCommonDecorationPrivate;
  */
 class KWIN_EXPORT KCommonDecoration : public KDecoration
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         KCommonDecoration(KDecorationBridge* bridge, KDecorationFactory* factory);
@@ -293,7 +293,7 @@ class KWIN_EXPORT KCommonDecorationButton : public TQButton
 {
     friend class KCommonDecoration;
 
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp
index b2332c514..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
@@ -393,9 +393,9 @@ const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active)
     int idx = type + (active ? 0 : NUM_COLORS);
     if(d->cg[idx])
         return(*d->cg[idx]);
-    d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150),
+    d->cg[idx] = new TQColorGroup(TQt::black, d->colors[idx], d->colors[idx].light(150),
                               d->colors[idx].dark(), d->colors[idx].dark(120),
-                              Qt::black, TQApplication::palette().active().
+                              TQt::black, TQApplication::palette().active().
                               base());
     return(*d->cg[idx]);
 }
@@ -436,8 +436,8 @@ bool KDecorationOptions::moveResizeMaximizedWindows() const
 
 KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( TQt::ButtonState button ) const
     {
-    return button == Qt::RightButton? d->OpMaxButtonRightClick : 
-           button == Qt::MidButton?   d->OpMaxButtonMiddleClick :
+    return button == TQt::RightButton? d->OpMaxButtonRightClick : 
+           button == TQt::MidButton?   d->OpMaxButtonMiddleClick :
                                       d->OpMaxButtonLeftClick;
     }
 
diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h
index 693007a03..03e1c863e 100644
--- a/twin/lib/kdecoration.h
+++ b/twin/lib/kdecoration.h
@@ -51,7 +51,7 @@ public:
      * These values represent positions inside an area
      */
     enum Position
-        { // without prefix, they'd conflict with Qt::TopLeft etc. :(
+        { // without prefix, they'd conflict with TQt::TopLeft etc. :(
         PositionCenter         = 0x00,
         PositionLeft           = 0x01,
         PositionRight          = 0x02,
@@ -313,7 +313,7 @@ protected:
 class KWIN_EXPORT KDecoration
     : public TQObject, public KDecorationDefines
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	/**
 	 * Constructs a KDecoration object. Both the arguments are passed from
diff --git a/twin/lib/kdecoration_p.h b/twin/lib/kdecoration_p.h
index 2634ea140..b396509b6 100644
--- a/twin/lib/kdecoration_p.h
+++ b/twin/lib/kdecoration_p.h
@@ -103,7 +103,7 @@ class KDecorationBridge : public KDecorationDefines
         // not part of public API
         virtual int currentDesktop() const = 0;
         virtual TQWidget* initialParentWidget() const = 0;
-        virtual Qt::WFlags initialWFlags() const = 0;
+        virtual TQt::WFlags initialWFlags() const = 0;
         virtual void helperShowHide( bool ) = 0;
         virtual void grabXServer( bool grab ) = 0;
     };
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index 0e2bc0d04..31de52e6d 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -42,7 +42,7 @@ KDecorationPlugins::KDecorationPlugins( TDEConfig* cfg )
         fact( NULL ),
         old_library( NULL ),
         old_fact( NULL ),
-        pluginStr( "twin3_undefined " ),
+        pluginStr( "twin_undefined " ),
         config( cfg )
     {
     }
@@ -98,9 +98,6 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
         TDEConfigGroupSaver saver( config, "Style" );
         nameStr = config->readEntry("PluginLib", defaultPlugin );
         }
-    // make sure people can switch between HEAD and twin_iii branch
-    if( nameStr.startsWith( "twin_" ))
-	nameStr = "twin3_" + nameStr.mid( 5 );
 
     KLibrary *oldLibrary = library;
     KDecorationFactory* oldFactory = fact;
diff --git a/twin/main.cpp b/twin/main.cpp
index 4fd81d245..61fb82847 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -84,10 +84,6 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
 Application::Application( )
 : TDEApplication( ), owner( screen_number )
     {
-#ifdef USE_QT4
-    // I'm special...
-    setQuitOnLastWindowClosed(false);
-#endif // USE_QT4
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     if (!config()->isImmutable() && args->isSet("lock"))
         {
@@ -150,7 +146,7 @@ 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();
@@ -198,7 +194,7 @@ Application::~Application()
     delete Workspace::self();
     if( owner.ownerWindow() != None ) // if there was no --replace (no new WM)
         {
-        XSetInputFocus( tqt_xdisplay(), PointerRoot, RevertToPointerRoot, GET_QT_X_TIME() );
+        XSetInputFocus( tqt_xdisplay(), PointerRoot, RevertToPointerRoot, get_tqt_x_time() );
         DCOPRef ref( "kded", "kded" );
         if( !ref.send( "loadModule", TQCString( "kdetrayproxy" )))
             kdWarning( 176 ) << "Loading of kdetrayproxy failed." << endl;
@@ -346,6 +342,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
     else
         appname.sprintf("twin-screen-%d", KWinInternal::screen_number);
 
+    TDEGlobal::locale()->insertCatalogue("twin_lib");
+
     DCOPClient* client = a.dcopClient();
     client->registerAs( appname.data(), false);
     client->setDefaultObject( "KWinInterface" );
diff --git a/twin/main.h b/twin/main.h
index d1fb59c6e..f8f27427a 100644
--- a/twin/main.h
+++ b/twin/main.h
@@ -21,7 +21,7 @@ namespace KWinInternal
 
 class Application : public  TDEApplication
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Application();
         ~Application();
diff --git a/twin/manage.cpp b/twin/manage.cpp
index ec6a5d675..8b96c070e 100644
--- a/twin/manage.cpp
+++ b/twin/manage.cpp
@@ -520,9 +520,9 @@ bool Client::manage( Window w, bool isMapped )
 
     if( user_time == CurrentTime || user_time == -1U ) // no known user time, set something old
         {
-        user_time = GET_QT_X_TIME() - 1000000;
+        user_time = get_tqt_x_time() - 1000000;
         if( user_time == CurrentTime || user_time == -1U ) // let's be paranoid
-            user_time = GET_QT_X_TIME() - 1000000 + 10;
+            user_time = get_tqt_x_time() - 1000000 + 10;
         }
 
     updateWorkareaDiffs();
@@ -577,9 +577,9 @@ void Client::embedClient( Window w, const XWindowAttributes &attr )
 		    attr.depth, InputOutput, attr.visual,
 		    CWColormap | CWBackPixmap | CWBorderPixel, &swa );
 
-    XDefineCursor( tqt_xdisplay(), frame, tqarrowCursor.handle());
+    XDefineCursor( tqt_xdisplay(), frame, TQt::arrowCursor.handle());
     // some apps are stupid and don't define their own cursor - set the arrow one for them
-    XDefineCursor( tqt_xdisplay(), wrapper, tqarrowCursor.handle());
+    XDefineCursor( tqt_xdisplay(), wrapper, TQt::arrowCursor.handle());
     XReparentWindow( tqt_xdisplay(), client, wrapper, 0, 0 );
     XSelectInput( tqt_xdisplay(), frame,
             KeyPressMask | KeyReleaseMask |
diff --git a/twin/options.cpp b/twin/options.cpp
index 0bb127e11..46c557b4a 100644
--- a/twin/options.cpp
+++ b/twin/options.cpp
@@ -31,8 +31,8 @@ namespace KWinInternal
 #ifndef KCMRULES
 
 Options::Options()
-    :   electric_borders( 0 ),
-        electric_border_delay(0)
+    :   active_borders( 0 ),
+        active_border_delay(0)
     {
     d = new KDecorationOptionsPrivate;
     d->defaultKWinSettings();
@@ -51,9 +51,11 @@ unsigned long Options::updateSettings()
     changed |= d->updateKWinSettings( config ); // read decoration settings
 
     config->setGroup( "Windows" );
-    moveMode = stringToMoveResizeMode( config->readEntry("MoveMode", "Opaque" ));
-    resizeMode = stringToMoveResizeMode( config->readEntry("ResizeMode", "Opaque" ));
+    moveMode   = stringToMoveResizeMode(config->readEntry("MoveMode",   "Opaque"));
+    resizeMode = stringToMoveResizeMode(config->readEntry("ResizeMode", "Opaque"));
+    tilingMode = stringToMoveResizeMode(config->readEntry("TilingMode", "Opaque"));
     show_geometry_tip = config->readBoolEntry("GeometryTip", false);
+    reset_maximized_window_geometry = config->readBoolEntry("ResetMaximizedWindowGeometry", false);
     tabboxOutline = config->readBoolEntry("TabboxOutline", true);
 
     TQString val;
@@ -71,12 +73,12 @@ unsigned long Options::updateSettings()
     altTabStyle = KDE; // what a default :-)
     if ( val == "CDE" )
         altTabStyle = CDE;
-        
+
     separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", false );
     activeMouseScreen = config->readBoolEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus );
 
     rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE);
-    
+
 //    focusStealingPreventionLevel = config->readNumEntry( "FocusStealingPreventionLevel", 2 );
     // TODO use low level for now
     focusStealingPreventionLevel = config->readNumEntry( "FocusStealingPreventionLevel", 1 );
@@ -101,14 +103,14 @@ unsigned long Options::updateSettings()
     animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE );
     animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 );
 
-    if( focusPolicy == ClickToFocus ) 
+    if( focusPolicy == ClickToFocus )
         {
         autoRaise = false;
         autoRaiseInterval = 0;
         delayFocus = false;
         delayFocusInterval = 0;
         }
-    else 
+    else
         {
         autoRaise = config->readBoolEntry("AutoRaise", FALSE );
         autoRaiseInterval = config->readNumEntry("AutoRaiseInterval", 0 );
@@ -125,8 +127,17 @@ unsigned long Options::updateSettings()
     borderSnapZone = config->readNumEntry("BorderSnapZone", 10);
     windowSnapZone = config->readNumEntry("WindowSnapZone", 10);
     snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",FALSE);
-    electric_borders = config->readNumEntry("ElectricBorders", 0);
-    electric_border_delay = config->readNumEntry("ElectricBorderDelay", 150);
+
+    // active borders: compatibility with old option names (Electric*)
+    active_borders = config->readNumEntry("ActiveBorders", -1);
+    if (active_borders == -1) {
+        active_borders = config->readNumEntry("ElectricBorders", 0);
+    }
+    active_border_delay = config->readNumEntry("ActiveBorderDelay", -1);
+    if (active_border_delay == -1) {
+        active_border_delay = config->readNumEntry("ElectricBorderDelay", 150);
+    }
+    active_border_distance = config->readNumEntry("ActiveBorderDistance", 10);
 
     OpTitlebarDblClick = windowOperation( config->readEntry("TitlebarDoubleClickCommand", "Shade"), true );
     d->OpMaxButtonLeftClick = windowOperation( config->readEntry("MaximizeButtonLeftClickCommand", "Maximize"), true );
@@ -159,14 +170,16 @@ unsigned long Options::updateSettings()
     CmdInactiveTitlebar2 = mouseCommand(config->readEntry("CommandInactiveTitlebar2","Activate and lower"), true );
     CmdInactiveTitlebar3 = mouseCommand(config->readEntry("CommandInactiveTitlebar3","Operations menu"), true );
     CmdTitlebarWheel = mouseWheelCommand(config->readEntry("CommandTitlebarWheel","Nothing"));
+    CmdTitlebarRevWheel = config->readBoolEntry("CommandTitlebarReverseWheel", false);
     CmdWindow1 = mouseCommand(config->readEntry("CommandWindow1","Activate, raise and pass click"), false );
     CmdWindow2 = mouseCommand(config->readEntry("CommandWindow2","Activate and pass click"), false );
     CmdWindow3 = mouseCommand(config->readEntry("CommandWindow3","Activate and pass click"), false );
-    CmdAllModKey = (config->readEntry("CommandAllKey","Alt") == "Meta") ? Qt::Key_Meta : Qt::Key_Alt;
+    CmdAllModKey = (config->readEntry("CommandAllKey","Alt") == "Meta") ? TQt::Key_Meta : TQt::Key_Alt;
     CmdAll1 = mouseCommand(config->readEntry("CommandAll1","Move"), false );
     CmdAll2 = mouseCommand(config->readEntry("CommandAll2","Toggle raise and lower"), false );
     CmdAll3 = mouseCommand(config->readEntry("CommandAll3","Resize"), false );
     CmdAllWheel = mouseWheelCommand(config->readEntry("CommandAllWheel","Nothing"));
+    CmdAllRevWheel = config->readBoolEntry("CommandAllReverseWheel", false);
 
     //translucency settings
     config->setGroup( "Notification Messages" );
@@ -193,7 +206,7 @@ unsigned long Options::updateSettings()
     resetKompmgr = config->readBoolEntry("ResetKompmgr", false);
     if (resetKompmgr)
         config->writeEntry("ResetKompmgr",FALSE);
-    
+
      // window drop shadows
     config->setGroup("Style");
     shadow_colour = config->readColorEntry("ShadowColour", &TQt::black);
@@ -213,7 +226,7 @@ unsigned long Options::updateSettings()
     shadow_x_offset = config->readNumEntry("ShadowXOffset", 0);
     shadow_y_offset = config->readNumEntry("ShadowYOffset", 10);
 
-    
+
     // Read button tooltip animation effect from kdeglobals
     // Since we want to allow users to enable window decoration tooltips
     // and not tdestyle tooltips and vise-versa, we don't read the
@@ -227,7 +240,7 @@ unsigned long Options::updateSettings()
     desktop_topmenu = kdesktopcfg.readBoolEntry( "ShowMenubar", false );
     if( desktop_topmenu )
         topmenus = true;
-        
+
     TQToolTip::setGloballyEnabled( d->show_tooltips );
 
     return changed;
@@ -306,6 +319,11 @@ bool Options::showGeometryTip()
     return show_geometry_tip;
     }
 
+bool Options::resetMaximizedWindowGeometry()
+    {
+    return reset_maximized_window_geometry;
+    }
+
 TQColor &Options::shadowColour(bool active)
     {
     return active ? shadow_colour : shadow_inactive_colour;
@@ -371,14 +389,19 @@ int Options::shadowYOffset(bool active)
     return active ? shadow_y_offset : shadow_inactive_y_offset;
     }
 
-int Options::electricBorders()
+int Options::activeBorders()
+    {
+    return active_borders;
+    }
+
+int Options::activeBorderDelay()
     {
-    return electric_borders;
+    return active_border_delay;
     }
 
-int Options::electricBorderDelay()
+int Options::borderActivationDistance()
     {
-    return electric_border_delay;
+    return active_border_distance;
     }
 
 bool Options::checkIgnoreFocusStealing( const Client* c )
@@ -386,8 +409,12 @@ bool Options::checkIgnoreFocusStealing( const Client* c )
     return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass()));
     }
 
-Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta )
+Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta, bool revDir )
     {
+    if (revDir)
+    {
+      delta = -delta;
+    }
     switch( com )
         {
         case MouseWheelRaiseLower:
diff --git a/twin/options.h b/twin/options.h
index 2c5341f81..41d1340a7 100644
--- a/twin/options.h
+++ b/twin/options.h
@@ -25,7 +25,7 @@ namespace KWinInternal
 
 class Client;
 
-class Options : public KDecorationOptions 
+class Options : public KDecorationOptions
     {
     public:
 
@@ -124,7 +124,7 @@ class Options : public KDecorationOptions
          */
         enum AltTabStyle { KDE, CDE };
         AltTabStyle altTabStyle;
-        
+
         // whether to see Xinerama screens separately for focus (in Alt+Tab, when activating next client)
         bool separateScreenFocus;
         // whether active Xinerama screen is the one with mouse (or with the active window)
@@ -138,7 +138,7 @@ class Options : public KDecorationOptions
         bool xineramaMovementEnabled;
         bool xineramaMaximizeEnabled;
         bool xineramaFullscreenEnabled;
-        
+
         // number, or -1 = active screen (Workspace::activeScreen())
         int xineramaPlacementScreen;
 
@@ -147,15 +147,16 @@ class Options : public KDecorationOptions
          */
         enum MoveResizeMode { Transparent, Opaque };
 
-        MoveResizeMode resizeMode;
         MoveResizeMode moveMode;
-        
+        MoveResizeMode resizeMode;
+        MoveResizeMode tilingMode;
+
         static MoveResizeMode stringToMoveResizeMode( const TQString& s );
         static const char* moveResizeModeToString( MoveResizeMode mode );
 
         Placement::Policy placement;
 
-        bool focusPolicyIsReasonable() 
+        bool focusPolicyIsReasonable()
             {
             return focusPolicy == ClickToFocus || focusPolicy == FocusFollowsMouse;
             }
@@ -190,7 +191,7 @@ class Options : public KDecorationOptions
          * Animation speed (0 .. 10 )
         */
         int animateMinimizeSpeed;
-        
+
         bool showDesktopIsMinimizeAll;
 
         /**
@@ -205,12 +206,12 @@ class Options : public KDecorationOptions
          * List of window classes to ignore PPosition size hint
          */
         TQStringList ignorePositionClasses;
-        
+
         bool checkIgnoreFocusStealing( const Client* c );
 
         WindowOperation operationTitlebarDblClick() { return OpTitlebarDblClick; }
 
-        enum MouseCommand 
+        enum MouseCommand
             {
             MouseRaise, MouseLower, MouseOperationsMenu, MouseToggleRaiseAndLower,
             MouseActivateAndRaise, MouseActivateAndLower, MouseActivate,
@@ -225,7 +226,7 @@ class Options : public KDecorationOptions
             MouseOpacityMore, MouseOpacityLess,
             MouseNothing
             };
-            
+
         enum MouseWheelCommand
             {
             MouseWheelRaiseLower, MouseWheelShadeUnshade, MouseWheelMaximizeRestore,
@@ -236,11 +237,11 @@ class Options : public KDecorationOptions
 
         MouseCommand operationTitlebarMouseWheel( int delta )
             {
-            return wheelToMouseCommand( CmdTitlebarWheel, delta );
+            return wheelToMouseCommand( CmdTitlebarWheel, delta, CmdTitlebarRevWheel );
             }
         MouseCommand operationWindowMouseWheel( int delta )
             {
-            return wheelToMouseCommand( CmdAllWheel, delta );
+            return wheelToMouseCommand( CmdAllWheel, delta, CmdAllRevWheel );
             }
 
         MouseCommand commandActiveTitlebar1() { return CmdActiveTitlebar1; }
@@ -269,6 +270,13 @@ class Options : public KDecorationOptions
         bool showGeometryTip();
 
         /**
+        * @returns true if a maximized or tiled window should be reset to its original
+        *          size when dragging it.
+        * @since R14.1.1
+        */
+        bool resetMaximizedWindowGeometry();
+
+        /**
         * @returns A TQColor representing the colour that window drop shadows should
         *          be.
         */
@@ -307,25 +315,31 @@ class Options : public KDecorationOptions
         */
         int shadowYOffset(bool active=true);
 
-        enum { ElectricDisabled = 0, ElectricMoveOnly = 1, ElectricAlways = 2 };
+        enum { ActiveDisabled = 0,
+               ActiveSwitchOnMove = 1,
+               ActiveSwitchAlways = 2,
+               ActiveTileOnly = 3,
+               ActiveTileMaximize = 4 };
         /**
-        * @returns true if electric borders are enabled. With electric borders
+        * @returns true if active borders are enabled. With active borders
         * you can change desktop by moving the mouse pointer towards the edge
         * of the screen
         */
-        int electricBorders();
+        int activeBorders();
+
+        int borderActivationDistance();
 
         /**
-        * @returns the activation delay for electric borders in milliseconds.
+        * @returns the activation delay for active borders in milliseconds.
         */
-        int electricBorderDelay();
-        
+        int activeBorderDelay();
+
         bool topMenuEnabled() const { return topmenus; }
         bool desktopTopMenu() const { return desktop_topmenu; }
-        
+
         // timeout before non-responding application will be killed after attempt to close
         int killPingTimeout;
-        
+
         // Whether to hide utility windows for inactive applications.
         bool hideUtilityWindowsForInactive;
 
@@ -362,6 +376,7 @@ class Options : public KDecorationOptions
         MouseCommand CmdInactiveTitlebar2;
         MouseCommand CmdInactiveTitlebar3;
         MouseWheelCommand CmdTitlebarWheel;
+        bool CmdTitlebarRevWheel;
         MouseCommand CmdWindow1;
         MouseCommand CmdWindow2;
         MouseCommand CmdWindow3;
@@ -369,11 +384,14 @@ class Options : public KDecorationOptions
         MouseCommand CmdAll2;
         MouseCommand CmdAll3;
         MouseWheelCommand CmdAllWheel;
+        bool CmdAllRevWheel;
         uint CmdAllModKey;
 
-        int electric_borders;
-        int electric_border_delay;
+        int active_borders;
+        int active_border_delay;
+        int active_border_distance;
         bool show_geometry_tip;
+        bool reset_maximized_window_geometry;
         bool topmenus;
         bool desktop_topmenu;
         TQColor shadow_colour;
@@ -395,7 +413,7 @@ class Options : public KDecorationOptions
         // List of window classes for which not to use focus stealing prevention
         TQStringList ignoreFocusStealingClasses;
 
-        MouseCommand wheelToMouseCommand( MouseWheelCommand com, int delta );
+        MouseCommand wheelToMouseCommand( MouseWheelCommand com, int delta, bool revDir );
     };
 
 extern Options* options;
diff --git a/twin/plugins.cpp b/twin/plugins.cpp
index 5f20b7018..6df451dc3 100644
--- a/twin/plugins.cpp
+++ b/twin/plugins.cpp
@@ -23,14 +23,14 @@ PluginMgr::PluginMgr()
     : KDecorationPlugins( TDEGlobal::config())
     {
     defaultPlugin = (TQPixmap::defaultDepth() > 8) ?
-            "twin3_plastik" : "twin3_quartz";
+            "twin_plastik" : "twin_quartz";
     loadPlugin( "" ); // load the plugin specified in cfg file
     }
 
 void PluginMgr::error( const TQString &error_msg )
     {
     tqWarning( "%s", (i18n("TWin: ") + error_msg +
-                    i18n("\nTWin will now exit...")).local8Bit().data() );
+                    i18n("\nTWin will now exit…")).local8Bit().data() );
     exit(1);
     }
 
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index 740de7cb6..d86037a84 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -39,7 +39,7 @@ 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 );
@@ -74,7 +74,7 @@ void PopupInfo::reset()
 void PopupInfo::paintEvent( TQPaintEvent* )
     {
     TQPainter p( this );
-    style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
+    style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ),
           colorGroup(), TQStyle::Style_Default );
     paintContents();
     }
@@ -92,9 +92,9 @@ void PopupInfo::paintContents()
     p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
 
     /*
-    p.setPen(Qt::white);
+    p.setPen(TQt::white);
     p.drawText( r, AlignCenter, m_infoString );
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
     r.moveBy( -1, -1 );
     p.drawText( r, AlignCenter, m_infoString );
     r.moveBy( -1, 0 );
diff --git a/twin/popupinfo.h b/twin/popupinfo.h
index 30ff76b30..40bdfe5c8 100644
--- a/twin/popupinfo.h
+++ b/twin/popupinfo.h
@@ -22,7 +22,7 @@ class Workspace;
 
 class PopupInfo : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         PopupInfo( Workspace* ws, const char *name=0 );
         ~PopupInfo();
diff --git a/twin/rules.cpp b/twin/rules.cpp
index 63fc0e37b..7bd2cd469 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -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..00cdb6a22 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -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/sm.h b/twin/sm.h
index 66cca9396..951db4e32 100644
--- a/twin/sm.h
+++ b/twin/sm.h
@@ -59,9 +59,9 @@ enum SMSavePhase
     };
     
 class SessionSaveDoneHelper
-    : public QObject
+    : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         SessionSaveDoneHelper();
         virtual ~SessionSaveDoneHelper();
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index d88146f22..feca2d77d 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -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;
@@ -474,7 +474,7 @@ void TabBox::drawContents( TQPainter * )
                     p.setPen(colorGroup().text());
 
                   p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight,
-                              Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s);
+                              TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, s);
 
                   y += lineHeight;
                   }
@@ -521,7 +521,7 @@ void TabBox::drawContents( TQPainter * )
             // draw desktop-number
             p.setFont(f);
             TQString num = TQString::number(iDesktop);
-            p.drawText(x+5, y+2, iconWidth, iconHeight, Qt::AlignCenter, num);
+            p.drawText(x+5, y+2, iconWidth, iconHeight, TQt::AlignCenter, num);
 
             p.restore();
 
@@ -532,7 +532,7 @@ void TabBox::drawContents( TQPainter * )
               p.setPen(colorGroup().text());
 
             p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight,
-                       Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine,
+                       TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
                        workspace()->desktopName(iDesktop));
 
             // show mini icons from that desktop aligned to each other
@@ -708,7 +708,7 @@ void TabBox::delayedShow()
 
 void TabBox::handleMouseEvent( XEvent* e )
     {
-    XAllowEvents( tqt_xdisplay(), AsyncPointer, GET_QT_X_TIME() );
+    XAllowEvents( tqt_xdisplay(), AsyncPointer, get_tqt_x_time() );
     if( e->type != ButtonPress )
         return;
     TQPoint pos( e->xbutton.x_root, e->xbutton.y_root );
@@ -866,7 +866,7 @@ void Workspace::slotWalkThroughWindows()
         return;
     if ( options->altTabStyle == Options::CDE || !options->focusPolicyIsReasonable())
         {
-        //XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME()); // need that because of accelerator raw mode
+        //XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time()); // need that because of accelerator raw mode
         // CDE style raise / lower
         CDEWalkThroughWindows( true );
         }
@@ -1180,7 +1180,7 @@ void Workspace::tabBoxKeyPress( const KKeyNative& keyX )
     if (control_grab || tab_grab)
         {
         uint keyQt = keyX.keyCodeQt();
-        if ( ((keyQt & 0xffff) == Qt::Key_Escape)
+        if ( ((keyQt & 0xffff) == TQt::Key_Escape)
             && !(forward || backward) )
             { // if Escape is part of the shortcut, don't cancel
             closeTabBox();
@@ -1360,7 +1360,7 @@ Client* Workspace::previousStaticClient( Client* c ) const
 bool Workspace::establishTabBoxGrab()
     {
     if( XGrabKeyboard( tqt_xdisplay(), root, FALSE,
-        GrabModeAsync, GrabModeAsync, GET_QT_X_TIME()) != GrabSuccess )
+        GrabModeAsync, GrabModeAsync, get_tqt_x_time()) != GrabSuccess )
         return false;
     // Don't try to establish a global mouse grab using XGrabPointer, as that would prevent
     // using Alt+Tab while DND (#44972). However force passive grabs on all windows
@@ -1376,7 +1376,7 @@ bool Workspace::establishTabBoxGrab()
 
 void Workspace::removeTabBoxGrab()
     {
-    XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME());
+    XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time());
     assert( forced_global_mouse_grab );
     forced_global_mouse_grab = false;
     if( active_client != NULL )
diff --git a/twin/tabbox.h b/twin/tabbox.h
index f9e3a8e0f..3fd419ad7 100644
--- a/twin/tabbox.h
+++ b/twin/tabbox.h
@@ -27,7 +27,7 @@ class Client;
 
 class TabBox : public TQFrame
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         TabBox( Workspace *ws, const char *name=0 );
         ~TabBox();
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index 32300016d..d4930ee84 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -39,7 +39,7 @@
 
 static TDECmdLineOptions options[] =
 {
-	{ "+decoration", "Decoration library to use, such as twin3_plastik.", 0 },
+	{ "+decoration", "Decoration library to use, such as twin_plastik.", 0 },
 	{ "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 },
 	{ "+repetitions", "Number of test repetitions.", 0 },
 	{ 0, 0, 0 }
@@ -130,9 +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"
-
-// kate: space-indent off; tab-width 4;
diff --git a/twin/tools/decobenchmark/main.h b/twin/tools/decobenchmark/main.h
index e556c1350..3745697f0 100644
--- a/twin/tools/decobenchmark/main.h
+++ b/twin/tools/decobenchmark/main.h
@@ -31,7 +31,7 @@ enum Tests {
 
 class DecoBenchApplication : public TDEApplication
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	DecoBenchApplication(const TQString &library, Tests tests, int count);
 	~DecoBenchApplication();
@@ -47,5 +47,3 @@ private:
 };
 
 #endif // BENCH_MAIN_H
-
-// kate: space-indent off; tab-width 4;
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index 6034a613e..c706eb5df 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -188,7 +188,7 @@ TQWidget* KDecorationPreviewBridge::initialParentWidget() const
     return preview;
     }
 
-Qt::WFlags KDecorationPreviewBridge::initialWFlags() const
+TQt::WFlags KDecorationPreviewBridge::initialWFlags() const
     {
     return 0;
     }
diff --git a/twin/tools/decobenchmark/preview.h b/twin/tools/decobenchmark/preview.h
index 2138c51b7..38cd08b19 100644
--- a/twin/tools/decobenchmark/preview.h
+++ b/twin/tools/decobenchmark/preview.h
@@ -30,7 +30,7 @@ class KDecorationPreviewBridge;
 class KDecorationPreviewOptions;
 
 class KDecorationPreview
-    : public QWidget
+    : public TQWidget
     {
     public:
         KDecorationPreview( KDecorationPlugins* plugin, TQWidget* parent = NULL, const char* name = NULL );
@@ -101,7 +101,7 @@ class KDecorationPreviewBridge
         virtual void setKeepBelow( bool );
         virtual int currentDesktop() const;
         virtual TQWidget* initialParentWidget() const;
-        virtual Qt::WFlags initialWFlags() const;
+        virtual TQt::WFlags initialWFlags() const;
         virtual void helperShowHide( bool show );
         virtual void grabXServer( bool grab );
     private:
diff --git a/twin/twinbindings.cpp b/twin/twinbindings.cpp
index 5e468d34b..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 )
@@ -18,29 +18,29 @@
 	keys->insert( "Program:twin", i18n("System") );
 
 	keys->insert( "Group:Navigation", i18n("Navigation") );
-	DEF( I18N_NOOP("Walk Through Windows"),                ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() );
-	DEF( I18N_NOOP("Walk Through Windows (Reverse)"),      ALT+SHIFT+Qt::Key_Tab, ALT+SHIFT+Qt::Key_Tab, slotWalkBackThroughWindows() );
-  DEF( I18N_NOOP("Walk Through Windows of Same Application"),                ALT+Qt::Key_QuoteLeft, ALT+Qt::Key_QuoteLeft, slotWalkThroughApps() );
-  DEF( I18N_NOOP("Walk Through Windows of Same Application (Reverse)"),      ALT+Qt::Key_AsciiTilde, ALT+Qt::Key_AsciiTilde, slotWalkBackThroughApps() );
-	DEF( I18N_NOOP("Walk Through Desktops"),               0, WIN+Qt::Key_Tab, slotWalkThroughDesktops() );
-	DEF( I18N_NOOP("Walk Through Desktops (Reverse)"),     0, WIN+SHIFT+Qt::Key_Tab, slotWalkBackThroughDesktops() );
+	DEF( I18N_NOOP("Walk Through Windows"),                ALT+TQt::Key_Tab, ALT+TQt::Key_Tab, slotWalkThroughWindows() );
+	DEF( I18N_NOOP("Walk Through Windows (Reverse)"),      ALT+SHIFT+TQt::Key_Tab, ALT+SHIFT+TQt::Key_Tab, slotWalkBackThroughWindows() );
+  DEF( I18N_NOOP("Walk Through Windows of Same Application"),                ALT+TQt::Key_QuoteLeft, ALT+TQt::Key_QuoteLeft, slotWalkThroughApps() );
+  DEF( I18N_NOOP("Walk Through Windows of Same Application (Reverse)"),      ALT+TQt::Key_AsciiTilde, ALT+TQt::Key_AsciiTilde, slotWalkBackThroughApps() );
+	DEF( I18N_NOOP("Walk Through Desktops"),               0, WIN+TQt::Key_Tab, slotWalkThroughDesktops() );
+	DEF( I18N_NOOP("Walk Through Desktops (Reverse)"),     0, WIN+SHIFT+TQt::Key_Tab, slotWalkBackThroughDesktops() );
 	DEF( I18N_NOOP("Walk Through Desktop List"),           0, 0, slotWalkThroughDesktopList() );
 	DEF( I18N_NOOP("Walk Through Desktop List (Reverse)"), 0, 0, slotWalkBackThroughDesktopList() );
 
 	keys->insert( "Group:Windows", i18n("Windows") );
-	DEF( I18N_NOOP("Window Operations Menu"),              ALT+Qt::Key_F3, ALT+Qt::Key_Menu, slotWindowOperations() );
+	DEF( I18N_NOOP("Window Operations Menu"),              ALT+TQt::Key_F3, ALT+TQt::Key_Menu, slotWindowOperations() );
 	DEF2( "Window Close", I18N_NOOP("Close Window"),
-            ALT+Qt::Key_F4, "Alt+Escape;Alt+F4", slotWindowClose() );
+            ALT+TQt::Key_F4, "Alt+Escape;Alt+F4", slotWindowClose() );
 	DEF2( "Window Maximize", I18N_NOOP("Maximize Window"),
-            0, WIN+Qt::Key_Plus, slotWindowMaximize() );
+            0, WIN+TQt::Key_Plus, slotWindowMaximize() );
 	DEF2( "Window Maximize Vertical", I18N_NOOP("Maximize Window Vertically"),
-            0, WIN+Qt::Key_Bar, slotWindowMaximizeVertical() );
+            0, WIN+TQt::Key_Bar, slotWindowMaximizeVertical() );
 	DEF2( "Window Maximize Horizontal", I18N_NOOP("Maximize Window Horizontally"),
-            0, WIN+Qt::Key_Equal, slotWindowMaximizeHorizontal() );
+            0, WIN+TQt::Key_Equal, slotWindowMaximizeHorizontal() );
 	DEF2( "Window Minimize", I18N_NOOP("Minimize Window"),
-            0, WIN+Qt::Key_Minus, slotWindowMinimize() );
+            0, WIN+TQt::Key_Minus, slotWindowMinimize() );
 	DEF2( "Window Shade", I18N_NOOP("Shade Window"),
-            0, WIN+Qt::Key_Underscore, slotWindowShade() );
+            0, WIN+TQt::Key_Underscore, slotWindowShade() );
 	DEF2( "Window Move", I18N_NOOP("Move Window"),
             0, 0, slotWindowMove() );
 	DEF2( "Window Resize", I18N_NOOP("Resize Window"),
@@ -58,7 +58,7 @@
             0, 0, slotWindowAbove() );
         DEF2( "Window Below Other Windows", I18N_NOOP("Keep Window Below Others"),
             0, 0, slotWindowBelow() );
-        DEF( I18N_NOOP("Activate Window Demanding Attention"), CTRL+ALT+Qt::Key_A, 0, slotActivateAttentionWindow());
+        DEF( I18N_NOOP("Activate Window Demanding Attention"), CTRL+ALT+TQt::Key_A, 0, slotActivateAttentionWindow());
         DEF( I18N_NOOP("Setup Window Shortcut"), 0, 0, slotSetupWindowShortcut());
         DEF2( "Window Pack Right", I18N_NOOP("Pack Window to the Right"),
             0, 0, slotWindowPackRight() );
@@ -80,16 +80,16 @@
 	keys->insert( "Group:Window Desktop", i18n("Window & Desktop") );
         DEF2( "Window On All Desktops", I18N_NOOP("Keep Window on All Desktops"),
             0, 0, slotWindowOnAllDesktops() );
-	DEF( I18N_NOOP("Window to Desktop 1"),                 0, WIN+ALT+Qt::Key_F1, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 2"),                 0, WIN+ALT+Qt::Key_F2, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 3"),                 0, WIN+ALT+Qt::Key_F3, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 4"),                 0, WIN+ALT+Qt::Key_F4, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 5"),                 0, WIN+ALT+Qt::Key_F5, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 6"),                 0, WIN+ALT+Qt::Key_F6, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 7"),                 0, WIN+ALT+Qt::Key_F7, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 8"),                 0, WIN+ALT+Qt::Key_F8, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 9"),                 0, WIN+ALT+Qt::Key_F9, slotWindowToDesktop(int) );
-	DEF( I18N_NOOP("Window to Desktop 10"),                0, WIN+ALT+Qt::Key_F10, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 1"),                 0, WIN+ALT+TQt::Key_F1, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 2"),                 0, WIN+ALT+TQt::Key_F2, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 3"),                 0, WIN+ALT+TQt::Key_F3, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 4"),                 0, WIN+ALT+TQt::Key_F4, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 5"),                 0, WIN+ALT+TQt::Key_F5, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 6"),                 0, WIN+ALT+TQt::Key_F6, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 7"),                 0, WIN+ALT+TQt::Key_F7, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 8"),                 0, WIN+ALT+TQt::Key_F8, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 9"),                 0, WIN+ALT+TQt::Key_F9, slotWindowToDesktop(int) );
+	DEF( I18N_NOOP("Window to Desktop 10"),                0, WIN+ALT+TQt::Key_F10, slotWindowToDesktop(int) );
 	DEF( I18N_NOOP("Window to Desktop 11"),                0, 0, slotWindowToDesktop(int) );
 	DEF( I18N_NOOP("Window to Desktop 12"),                0, 0, slotWindowToDesktop(int) );
 	DEF( I18N_NOOP("Window to Desktop 13"),                0, 0, slotWindowToDesktop(int) );
@@ -117,26 +117,26 @@
 	DEF( I18N_NOOP("Window to Next Screen"),               0, 0, slotWindowToNextScreen() );
 
 	keys->insert( "Group:Desktop Switching", i18n("Desktop Switching") );
-	DEF( I18N_NOOP("Switch to Desktop 1"),  CTRL+Qt::Key_F1, WIN+Qt::Key_F1, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 2"),  CTRL+Qt::Key_F2, WIN+Qt::Key_F2, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 3"),  CTRL+Qt::Key_F3, WIN+Qt::Key_F3, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 4"),  CTRL+Qt::Key_F4, WIN+Qt::Key_F4, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 5"),  CTRL+Qt::Key_F5, WIN+Qt::Key_F5, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 6"),  CTRL+Qt::Key_F6, WIN+Qt::Key_F6, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 7"),  CTRL+Qt::Key_F7, WIN+Qt::Key_F7, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 8"),  CTRL+Qt::Key_F8, WIN+Qt::Key_F8, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 9"),  CTRL+Qt::Key_F9, WIN+Qt::Key_F9, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 10"),  CTRL+Qt::Key_F10, WIN+Qt::Key_F10, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 11"),  CTRL+Qt::Key_F11, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 12"),  CTRL+Qt::Key_F12, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 13"),  CTRL+SHIFT+Qt::Key_F1, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 14"),  CTRL+SHIFT+Qt::Key_F2, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 15"),  CTRL+SHIFT+Qt::Key_F3, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 16"),  CTRL+SHIFT+Qt::Key_F4, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 17"),  CTRL+SHIFT+Qt::Key_F5, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 18"),  CTRL+SHIFT+Qt::Key_F6, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 19"),  CTRL+SHIFT+Qt::Key_F7, 0, slotSwitchToDesktop(int) );
-	DEF( I18N_NOOP("Switch to Desktop 20"),  CTRL+SHIFT+Qt::Key_F8, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 1"),  CTRL+TQt::Key_F1, WIN+TQt::Key_F1, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 2"),  CTRL+TQt::Key_F2, WIN+TQt::Key_F2, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 3"),  CTRL+TQt::Key_F3, WIN+TQt::Key_F3, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 4"),  CTRL+TQt::Key_F4, WIN+TQt::Key_F4, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 5"),  CTRL+TQt::Key_F5, WIN+TQt::Key_F5, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 6"),  CTRL+TQt::Key_F6, WIN+TQt::Key_F6, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 7"),  CTRL+TQt::Key_F7, WIN+TQt::Key_F7, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 8"),  CTRL+TQt::Key_F8, WIN+TQt::Key_F8, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 9"),  CTRL+TQt::Key_F9, WIN+TQt::Key_F9, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 10"),  CTRL+TQt::Key_F10, WIN+TQt::Key_F10, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 11"),  CTRL+TQt::Key_F11, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 12"),  CTRL+TQt::Key_F12, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 13"),  CTRL+SHIFT+TQt::Key_F1, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 14"),  CTRL+SHIFT+TQt::Key_F2, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 15"),  CTRL+SHIFT+TQt::Key_F3, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 16"),  CTRL+SHIFT+TQt::Key_F4, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 17"),  CTRL+SHIFT+TQt::Key_F5, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 18"),  CTRL+SHIFT+TQt::Key_F6, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 19"),  CTRL+SHIFT+TQt::Key_F7, 0, slotSwitchToDesktop(int) );
+	DEF( I18N_NOOP("Switch to Desktop 20"),  CTRL+SHIFT+TQt::Key_F8, 0, slotSwitchToDesktop(int) );
 	DEF( I18N_NOOP("Switch to Next Desktop"),              0, 0, slotSwitchDesktopNext() );
 	DEF( I18N_NOOP("Switch to Previous Desktop"),          0, 0, slotSwitchDesktopPrevious() );
 	DEF( I18N_NOOP("Switch One Desktop to the Right"),     0, 0, slotSwitchDesktopRight() );
@@ -154,10 +154,10 @@
 	DEF( I18N_NOOP("Switch to Next Screen"),               0, 0, slotSwitchToNextScreen() );
 
 	keys->insert( "Group:Miscellaneous", i18n("Miscellaneous") );
-	DEF( I18N_NOOP("Mouse Emulation"),                     ALT+Qt::Key_F12, 0, slotMouseEmulation() );
-	DEF( I18N_NOOP("Kill Window"),                         ALT+CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Delete, slotKillWindow() );
-	DEF( I18N_NOOP("Window Screenshot"),                   ALT+Qt::Key_Print, ALT+Qt::Key_Print, slotGrabWindow() );
-	DEF( I18N_NOOP("Desktop Screenshot"),                  CTRL+Qt::Key_Print, WIN+Qt::Key_Print, slotGrabDesktop() );
+	DEF( I18N_NOOP("Mouse Emulation"),                     ALT+TQt::Key_F12, 0, slotMouseEmulation() );
+	DEF( I18N_NOOP("Kill Window"),                         ALT+CTRL+TQt::Key_Escape, WIN+CTRL+TQt::Key_Delete, slotKillWindow() );
+	DEF( I18N_NOOP("Window Screenshot"),                   ALT+TQt::Key_Print, ALT+TQt::Key_Print, slotGrabWindow() );
+	DEF( I18N_NOOP("Desktop Screenshot"),                  CTRL+TQt::Key_Print, WIN+TQt::Key_Print, slotGrabDesktop() );
 #ifdef IN_KWIN
         {
         TDEGlobalAccel* keys = disable_shortcuts_keys;
@@ -169,28 +169,28 @@
 
 /*This belongs in taskbar rather than here, so it'll have to wait until after 2.2 is done.
   -- ellis
-DEF( I18N_NOOP("Switch to Window 1", WIN+Qt::Key_1"));
-DEF( I18N_NOOP("Switch to Window 2", WIN+Qt::Key_2"));
-DEF( I18N_NOOP("Switch to Window 3", WIN+Qt::Key_3"));
-DEF( I18N_NOOP("Switch to Window 4", WIN+Qt::Key_4"));
-DEF( I18N_NOOP("Switch to Window 5", WIN+Qt::Key_5"));
-DEF( I18N_NOOP("Switch to Window 6", WIN+Qt::Key_6"));
-DEF( I18N_NOOP("Switch to Window 7", WIN+Qt::Key_7"));
-DEF( I18N_NOOP("Switch to Window 8", WIN+Qt::Key_8"));
-DEF( I18N_NOOP("Switch to Window 9", WIN+Qt::Key_9"));
+DEF( I18N_NOOP("Switch to Window 1", WIN+TQt::Key_1"));
+DEF( I18N_NOOP("Switch to Window 2", WIN+TQt::Key_2"));
+DEF( I18N_NOOP("Switch to Window 3", WIN+TQt::Key_3"));
+DEF( I18N_NOOP("Switch to Window 4", WIN+TQt::Key_4"));
+DEF( I18N_NOOP("Switch to Window 5", WIN+TQt::Key_5"));
+DEF( I18N_NOOP("Switch to Window 6", WIN+TQt::Key_6"));
+DEF( I18N_NOOP("Switch to Window 7", WIN+TQt::Key_7"));
+DEF( I18N_NOOP("Switch to Window 8", WIN+TQt::Key_8"));
+DEF( I18N_NOOP("Switch to Window 9", WIN+TQt::Key_9"));
 
 #ifdef WITH_LABELS
 DEF( I18N_NOOP("Window & Taskbar"Group:Window Desktop", 0);
 #endif
-DEF( I18N_NOOP("Window to Taskbar Position 1", WIN+Qt::Key_Alt+1"));
-DEF( I18N_NOOP("Window to Taskbar Position 2", WIN+Qt::Key_Alt+2"));
-DEF( I18N_NOOP("Window to Taskbar Position 3", WIN+Qt::Key_Alt+3"));
-DEF( I18N_NOOP("Window to Taskbar Position 4", WIN+Qt::Key_Alt+4"));
-DEF( I18N_NOOP("Window to Taskbar Position 5", WIN+Qt::Key_Alt+5"));
-DEF( I18N_NOOP("Window to Taskbar Position 6", WIN+Qt::Key_Alt+6"));
-DEF( I18N_NOOP("Window to Taskbar Position 7", WIN+Qt::Key_Alt+7"));
-DEF( I18N_NOOP("Window to Taskbar Position 8", WIN+Qt::Key_Alt+8"));
-DEF( I18N_NOOP("Window to Taskbar Position 9", WIN+Qt::Key_Alt+9"));
+DEF( I18N_NOOP("Window to Taskbar Position 1", WIN+TQt::Key_Alt+1"));
+DEF( I18N_NOOP("Window to Taskbar Position 2", WIN+TQt::Key_Alt+2"));
+DEF( I18N_NOOP("Window to Taskbar Position 3", WIN+TQt::Key_Alt+3"));
+DEF( I18N_NOOP("Window to Taskbar Position 4", WIN+TQt::Key_Alt+4"));
+DEF( I18N_NOOP("Window to Taskbar Position 5", WIN+TQt::Key_Alt+5"));
+DEF( I18N_NOOP("Window to Taskbar Position 6", WIN+TQt::Key_Alt+6"));
+DEF( I18N_NOOP("Window to Taskbar Position 7", WIN+TQt::Key_Alt+7"));
+DEF( I18N_NOOP("Window to Taskbar Position 8", WIN+TQt::Key_Alt+8"));
+DEF( I18N_NOOP("Window to Taskbar Position 9", WIN+TQt::Key_Alt+9"));
 */
 
 #undef DEF
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 85e76e4cd..567255fa5 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -51,13 +51,13 @@ TQPopupMenu* Workspace::clientPopup()
         popup = new TQPopupMenu;
         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->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" ),
@@ -67,13 +67,13 @@ TQPopupMenu* Workspace::clientPopup()
         advanced_popup->insertItem( i18n("&No Border")+'\t'+keys->shortcut("Window No Border").seq(0).toString(), Options::NoBorderOp );
 	advanced_popup->insertItem( i18n("Shad&ow"), Options::ShadowOp );
         advanced_popup->insertItem( SmallIconSet("key_bindings"),
-            i18n("Window &Shortcut...")+'\t'+keys->shortcut("Setup Window Shortcut").seq(0).toString(), Options::SetupWindowShortcutOp );
+            i18n("Window &Shortcut…")+'\t'+keys->shortcut("Setup Window Shortcut").seq(0).toString(), Options::SetupWindowShortcutOp );
         advanced_popup->insertSeparator();
         advanced_popup->insertItem( SmallIconSet( "suspend" ), i18n("&Suspend Application"), Options::SuspendWindowOp );
         advanced_popup->insertItem( SmallIconSet( "application-x-executable" ), i18n("&Resume Application"), Options::ResumeWindowOp );
         advanced_popup->insertSeparator();
-        advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Window Settings..."), Options::WindowRulesOp );
-        advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Application Settings..."), Options::ApplicationRulesOp );
+        advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Window Settings…"), Options::WindowRulesOp );
+        advanced_popup->insertItem( SmallIconSet( "wizard" ), i18n("&Special Application Settings…"), Options::ApplicationRulesOp );
 
         popup->insertItem(i18n("Ad&vanced"), advanced_popup );
         desk_popup_index = popup->count();
@@ -83,13 +83,13 @@ TQPopupMenu* Workspace::clientPopup()
             TQVBox *transBox = new TQVBox(trans_popup);
             transButton = new TQPushButton(transBox, "transButton");
             TQToolTip::add(transButton, i18n("Reset opacity to default value"));
-            transSlider = new TQSlider(0, 100, 1, 100, Qt::Horizontal, transBox, "transSlider");
+            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 );
         }
@@ -105,7 +105,7 @@ TQPopupMenu* Workspace::clientPopup()
         if (!TDEGlobal::config()->isImmutable() && 
             !kapp->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();
             }
 
@@ -201,10 +201,10 @@ void Workspace::initDesktopPopup()
     desk_popup = new TQPopupMenu( popup );
     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 );
     }
@@ -299,7 +299,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 +336,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();
@@ -647,12 +647,70 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP
     return replay;
     }
 
-// KDE4 remove me
-void Workspace::showWindowMenuAt( unsigned long, int, int )
+void Workspace::showWindowMenuAt( unsigned long window, int x, int y )
     {
-    slotWindowOperations();
+    Client *client;
+    if ((client = findClient(WindowMatchPredicate((WId)window))))
+        showWindowMenu( x, y, client );
     }
 
+void Workspace::showWindowMenu( unsigned long window )
+    {
+    Client *client;
+    if ((client = findClient(WindowMatchPredicate((WId)window))))
+        {
+        TQPoint pos = client->pos() + client->clientPos();
+        showWindowMenu( pos, client );
+        }
+    }
+
+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 )
@@ -1070,17 +1128,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 e7e5c7d32..bc44eee56 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -37,10 +37,6 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "atoms.h"
 #include "notifications.h"
 
-#ifdef USE_QT4
-#include <Qt/qx11info_x11.h>
-#endif // USE_QT4
-
 #endif
 
 namespace KWinInternal
@@ -278,7 +274,7 @@ void updateXTime()
         XCheckIfEvent( tqt_xdisplay(), &dummy, update_x_time_predicate, NULL );
         }
     assert( next_x_time != CurrentTime );
-    SET_QT_X_TIME(next_x_time);
+    set_tqt_x_time(next_x_time);
     XEvent ev; // remove the PropertyNotify event from the events queue
     XWindowEvent( tqt_xdisplay(), w->winId(), PropertyChangeMask, &ev );
     }
diff --git a/twin/utils.h b/twin/utils.h
index e8bc09a46..da2f9c2e3 100644
--- a/twin/utils.h
+++ b/twin/utils.h
@@ -108,7 +108,28 @@ enum ShadeMode
     ShadeActivated // "shaded", but visible due to alt+tab to the window
     };
 
-class Shape 
+enum ActiveBorder
+    {
+    ActiveTop = 0,
+    ActiveTopRight,
+    ActiveRight,
+    ActiveBottomRight,
+    ActiveBottom,
+    ActiveBottomLeft,
+    ActiveLeft,
+    ActiveTopLeft,
+    ACTIVE_BORDER_COUNT,
+    ActiveNone
+    };
+
+enum ActiveMaximizingMode
+{
+    ActiveNoMode,
+    ActiveTilingMode,
+    ActiveMaximizeMode
+};
+
+class Shape
     {
     public:
         static bool available() { return twin_shape_version > 0; }
@@ -126,12 +147,12 @@ class Shape
 const int ShapeInput = 2;
 #endif
 
-class Motif 
+class Motif
     {
     public:
         static void readFlags( WId w, bool& noborder, bool& resize, bool& move,
             bool& minimize, bool& maximize, bool& close );
-        struct MwmHints 
+        struct MwmHints
             {
             ulong flags;
             ulong functions;
@@ -155,7 +176,7 @@ class Motif
 class KWinSelectionOwner
     : public TDESelectionOwner
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KWinSelectionOwner( int screen );
     protected:
@@ -227,7 +248,7 @@ KWIN_CHECK_PREDICATE( TruePredicate, cl == cl /*true, avoid warning about 'cl' *
 template< typename T >
 Client* findClientInList( const ClientList& list, T predicate )
     {
-    for ( ClientList::ConstIterator it = list.begin(); it != list.end(); ++it) 
+    for ( ClientList::ConstIterator it = list.begin(); it != list.end(); ++it)
         {
         if ( predicate( const_cast< const Client* >( *it)))
             return *it;
@@ -256,7 +277,7 @@ void checkNonExistentClients();
 class ShortcutDialog
     : public TDEShortcutDialog
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         ShortcutDialog( const TDEShortcut& cut );
         virtual void accept();
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 8cddbb72e..23661e6a0 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -167,13 +167,8 @@ Workspace::Workspace( bool restore )
     global_shortcuts_disabled_for_client( false ),
     root              (0),
     workspaceInit     (true),
-    startup(0), electric_have_borders(false),
-    electric_current_border(0),
-    electric_top_border(None),
-    electric_bottom_border(None),
-    electric_left_border(None),
-    electric_right_border(None),
-    layoutOrientation(Qt::Vertical),
+    startup(0),
+    layoutOrientation(TQt::Vertical),
     layoutX(-1),
     layoutY(2),
     workarea(NULL),
@@ -194,16 +189,22 @@ Workspace::Workspace( bool restore )
     installed_colormap = default_colormap;
     session.setAutoDelete( TRUE );
 
-    connect( &temporaryRulesMessages, TQT_SIGNAL( gotMessage( const TQString& )),
-        this, TQT_SLOT( gotTemporaryRulesMessage( const TQString& )));
-    connect( &rulesUpdatedTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( writeWindowRules()));
+    for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
+    {
+        active_reserved[i] = 0;
+        active_windows[i] = None;
+    }
+
+    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
 
-    delayFocusTimer = 0; 
-    
-    electric_time_first = GET_QT_X_TIME();
-    electric_time_last = GET_QT_X_TIME();
+    delayFocusTimer = 0;
+
+    active_time_first = get_tqt_x_time();
+    active_time_last = get_tqt_x_time();
 
     if ( restore )
       loadSessionInfo();
@@ -258,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( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
 #endif
 
     if (!supportsCompMgr()) {
@@ -273,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)
             {
@@ -304,13 +305,17 @@ Workspace::Workspace( bool restore )
 
 
 void Workspace::init()
+{
+    if (options->activeBorders() == Options::ActiveSwitchAlways)
     {
-    checkElectricBorders();
+        reserveActiveBorderSwitching(true);
+    }
+    updateActiveBorders();
 
 // not used yet
 //     topDock = 0L;
 //     maximizedWindowCounter = 0;
-    
+
     supportWindow = new TQWidget;
     XLowerWindow( tqt_xdisplay(), supportWindow->winId()); // see usage in layers.cpp
 
@@ -422,15 +427,15 @@ 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(kapp, TQ_SIGNAL(appearanceChanged()), this,
+            TQ_SLOT(slotReconfigure()));
+    connect(kapp, TQ_SIGNAL(settingsChanged(int)), this,
+            TQ_SLOT(slotSettingsChanged(int)));
+    connect(kapp, TQ_SIGNAL( kipcMessage( int, int )), this, TQ_SLOT( kipcMessage( int, int )));
 
     active_client = NULL;
     rootInfo->setActiveWindow( None );
@@ -456,7 +461,7 @@ void Workspace::init()
         unsigned int i, nwins;
         Window root_return, parent_return, *wins;
         XQueryTree(tqt_xdisplay(), root, &root_return, &parent_return, &wins, &nwins);
-        for (i = 0; i < nwins; i++) 
+        for (i = 0; i < nwins; i++)
             {
             XWindowAttributes attr;
             XGetWindowAttributes(tqt_xdisplay(), wins[i], &attr);
@@ -464,12 +469,12 @@ void Workspace::init()
                 continue;
             if( topmenu_space && topmenu_space->winId() == wins[ i ] )
                 continue;
-            if (attr.map_state != IsUnmapped) 
+            if (attr.map_state != IsUnmapped)
                 {
                 if ( addSystemTrayWin( wins[i] ) )
                     continue;
                 Client* c = createClient( wins[i], true );
-                if ( c != NULL && root != tqt_xrootwin() ) 
+                if ( c != NULL && root != tqt_xrootwin() )
                     { // TODO what is this?
                 // TODO may use TQWidget:.create
                     XReparentWindow( tqt_xdisplay(), c->frameId(), root, 0, 0 );
@@ -483,7 +488,6 @@ void Workspace::init()
         updateStackingOrder( true );
 
         updateClientArea();
-        raiseElectricBorders();
 
     // NETWM spec says we have to set it to (0,0) if we don't support it
         NETPoint* viewports = new NETPoint[ number_of_desktops ];
@@ -514,12 +518,27 @@ void Workspace::init()
         }
     if( new_active_client != NULL )
         activateClient( new_active_client );
+
+    // outline windows for active border maximize window mode
+    outline_left = XCreateWindow(tqt_xdisplay(), rootWin(), 0, 0, 1, 1, 0,
+                                 CopyFromParent, CopyFromParent, CopyFromParent,
+                                 CWOverrideRedirect, &attr);
+    outline_right = XCreateWindow(tqt_xdisplay(), rootWin(), 0, 0, 1, 1, 0,
+                                  CopyFromParent, CopyFromParent, CopyFromParent,
+                                  CWOverrideRedirect, &attr);
+    outline_top = XCreateWindow(tqt_xdisplay(), rootWin(), 0, 0, 1, 1, 0,
+                                CopyFromParent, CopyFromParent, CopyFromParent,
+                                CWOverrideRedirect, &attr);
+    outline_bottom = XCreateWindow(tqt_xdisplay(), rootWin(), 0, 0, 1, 1, 0,
+                                   CopyFromParent, CopyFromParent, CopyFromParent,
+                                   CWOverrideRedirect, &attr);
+
     // SELI TODO this won't work with unreasonable focus policies,
     // and maybe in rare cases also if the selected client doesn't
     // want focus
     workspaceInit = false;
 // TODO ungrabXServer()
-    }
+}
 
 Workspace::~Workspace()
     {
@@ -550,6 +569,12 @@ Workspace::~Workspace()
     writeWindowRules();
     TDEGlobal::config()->sync();
 
+    // destroy outline windows for active border maximize window mode
+    XDestroyWindow(tqt_xdisplay(), outline_left);
+    XDestroyWindow(tqt_xdisplay(), outline_right);
+    XDestroyWindow(tqt_xdisplay(), outline_top);
+    XDestroyWindow(tqt_xdisplay(), outline_bottom);
+
     delete rootInfo;
     delete supportWindow;
     delete mgr;
@@ -785,7 +810,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
 void Workspace::updateOverlappingShadows(unsigned long window)
     {
     Client *client;
-    
+
     if ((client = findClient(WindowMatchPredicate((WId)window))))
         // Redraw overlapping shadows without waiting for the specified window
         // to redraw its own shadow
@@ -795,7 +820,7 @@ void Workspace::updateOverlappingShadows(unsigned long window)
 void Workspace::setShadowed(unsigned long window, bool shadowed)
     {
     Client *client;
-    
+
     if ((client = findClient(WindowMatchPredicate((WId)window))))
         client->setShadowed(shadowed);
     }
@@ -891,7 +916,7 @@ void Workspace::updateCurrentTopMenu()
         }
 
     // ... then hide the other ones. Avoids flickers.
-    for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) 
+    for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it)
         {
         if( (*it)->isTopMenu() && (*it) != menubar )
             (*it)->hideClient( true );
@@ -1008,7 +1033,7 @@ void Workspace::updateColormap()
     Colormap cmap = default_colormap;
     if ( activeClient() && activeClient()->colormap() != None )
         cmap = activeClient()->colormap();
-    if ( cmap != installed_colormap ) 
+    if ( cmap != installed_colormap )
         {
         XInstallColormap(tqt_xdisplay(), cmap );
         installed_colormap = cmap;
@@ -1038,6 +1063,11 @@ void Workspace::slotReconfigure()
     kdDebug(1212) << "Workspace::slotReconfigure()" << endl;
     reconfigureTimer.stop();
 
+    if (options->activeBorders() == Options::ActiveSwitchAlways)
+    {
+        reserveActiveBorderSwitching(false);
+    }
+
     TDEGlobal::config()->reparseConfiguration();
     unsigned long changed = options->updateSettings();
     tab_box->reconfigure();
@@ -1068,7 +1098,10 @@ void Workspace::slotReconfigure()
         forEachClient( CheckBorderSizesProcedure());
         }
 
-    checkElectricBorders();
+    if (options->activeBorders() == Options::ActiveSwitchAlways)
+    {
+        reserveActiveBorderSwitching(true);
+    }
 
     if( options->topMenuEnabled() && !managingTopMenus())
         {
@@ -1155,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
@@ -1195,7 +1228,7 @@ void Workspace::loadDesktopSettings()
     desktop_focus_chain.resize( n );
     // make it +1, so that it can be accessed as [1..numberofdesktops]
     focus_chain.resize( n + 1 );
-    for(int i = 1; i <= n; i++) 
+    for(int i = 1; i <= n; i++)
         {
         TQString s = c->readEntry(TQString("Name_%1").arg(i),
                                 i18n("Desktop %1").arg(i));
@@ -1215,21 +1248,21 @@ void Workspace::saveDesktopSettings()
     TDEConfigGroupSaver saver(c,groupname);
 
     c->writeEntry("Number", number_of_desktops );
-    for(int i = 1; i <= number_of_desktops; i++) 
+    for(int i = 1; i <= number_of_desktops; i++)
         {
         TQString s = desktopName( i );
         TQString defaultvalue = i18n("Desktop %1").arg(i);
-        if ( s.isEmpty() ) 
+        if ( s.isEmpty() )
             {
             s = defaultvalue;
             rootInfo->setDesktopName( i, s.utf8().data() );
             }
 
-        if (s != defaultvalue) 
+        if (s != defaultvalue)
             {
             c->writeEntry( TQString("Name_%1").arg(i), s );
             }
-        else 
+        else
             {
             TQString currentvalue = c->readEntry(TQString("Name_%1").arg(i));
             if (currentvalue != defaultvalue)
@@ -1267,10 +1300,10 @@ void Workspace::doNotManage( TQString title )
  */
 bool Workspace::isNotManaged( const TQString& title )
     {
-    for ( TQStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it ) 
+    for ( TQStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it )
         {
         TQRegExp r( (*it) );
-        if (r.search(title) != -1) 
+        if (r.search(title) != -1)
             {
             doNotManageList.remove( it );
             return TRUE;
@@ -1282,7 +1315,7 @@ bool Workspace::isNotManaged( const TQString& title )
 /*!
   Refreshes all the client windows
  */
-void Workspace::refresh() 
+void Workspace::refresh()
     {
     TQWidget w;
     w.setGeometry( TQApplication::desktop()->geometry() );
@@ -1319,7 +1352,7 @@ void ObscuringWindows::create( Client* c )
     Window obs_win;
     XWindowChanges chngs;
     int mask = CWSibling | CWStackMode;
-    if( cached->count() > 0 ) 
+    if( cached->count() > 0 )
         {
         cached->remove( obs_win = cached->first());
         chngs.x = c->x();
@@ -1328,7 +1361,7 @@ void ObscuringWindows::create( Client* c )
         chngs.height = c->height();
         mask |= CWX | CWY | CWWidth | CWHeight;
         }
-    else 
+    else
         {
         XSetWindowAttributes a;
         a.background_pixmap = None;
@@ -1349,7 +1382,7 @@ ObscuringWindows::~ObscuringWindows()
     max_cache_size = TQMAX( max_cache_size, obscuring_windows.count() + 4 ) - 1;
     for( TQValueList<Window>::ConstIterator it = obscuring_windows.begin();
          it != obscuring_windows.end();
-         ++it ) 
+         ++it )
         {
         XUnmapWindow( tqt_xdisplay(), *it );
         if( cached->count() < max_cache_size )
@@ -1377,7 +1410,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
     StackingUpdatesBlocker blocker( this );
 
     int old_desktop = current_desktop;
-    if (new_desktop != current_desktop) 
+    if (new_desktop != current_desktop)
         {
         ++block_showing_desktop;
         /*
@@ -1416,7 +1449,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
         }
 
         if (desktopHasCompositing) {
-            // If composition is in use then we cannot hide the old windows before showing the new ones, 
+            // If composition is in use then we cannot hide the old windows before showing the new ones,
             // unless you happen to like the "flicker annoyingly to desktop" effect... :-P
             XSync( tqt_xdisplay(), false);	// Make absolutely certain all new windows are shown before hiding the old ones
             for ( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it) {
@@ -1439,7 +1472,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
     --block_focus;
     Client* c = 0;
 
-    if ( options->focusPolicyIsReasonable()) 
+    if ( options->focusPolicyIsReasonable())
         {
         // Search in focus chain
         if ( movingClient != NULL && active_client == movingClient
@@ -1448,7 +1481,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
             {
             c = active_client; // the requestFocus below will fail, as the client is already active
             }
-        if ( !c ) 
+        if ( !c )
             {
             for( ClientList::ConstIterator it = focus_chain[currentDesktop()].fromLast();
                  it != focus_chain[currentDesktop()].end();
@@ -1475,9 +1508,9 @@ bool Workspace::setCurrentDesktop( int new_desktop )
     if( c != active_client )
         setActiveClient( NULL, Allowed );
 
-    if ( c ) 
+    if ( c )
         requestFocus( c );
-    else 
+    else
         focusToNull();
 
     updateCurrentTopMenu();
@@ -1520,10 +1553,10 @@ int Workspace::desktopToRight( int desktop ) const
     int x,y;
     calcDesktopLayout(x,y);
     int dt = desktop-1;
-    if (layoutOrientation == Qt::Vertical)
+    if (layoutOrientation == TQt::Vertical)
         {
         dt += y;
-        if ( dt >= numberOfDesktops() ) 
+        if ( dt >= numberOfDesktops() )
             {
             if ( options->rollOverDesktops )
               dt -= numberOfDesktops();
@@ -1534,7 +1567,7 @@ int Workspace::desktopToRight( int desktop ) const
     else
         {
         int d = (dt % x) + 1;
-        if ( d >= x ) 
+        if ( d >= x )
             {
             if ( options->rollOverDesktops )
               d -= x;
@@ -1551,10 +1584,10 @@ int Workspace::desktopToLeft( int desktop ) const
     int x,y;
     calcDesktopLayout(x,y);
     int dt = desktop-1;
-    if (layoutOrientation == Qt::Vertical)
+    if (layoutOrientation == TQt::Vertical)
         {
         dt -= y;
-        if ( dt < 0 ) 
+        if ( dt < 0 )
             {
             if ( options->rollOverDesktops )
               dt += numberOfDesktops();
@@ -1565,7 +1598,7 @@ int Workspace::desktopToLeft( int desktop ) const
     else
         {
         int d = (dt % x) - 1;
-        if ( d < 0 ) 
+        if ( d < 0 )
             {
             if ( options->rollOverDesktops )
               d += x;
@@ -1582,10 +1615,10 @@ int Workspace::desktopUp( int desktop ) const
     int x,y;
     calcDesktopLayout(x,y);
     int dt = desktop-1;
-    if (layoutOrientation == Qt::Horizontal)
+    if (layoutOrientation == TQt::Horizontal)
         {
         dt -= x;
-        if ( dt < 0 ) 
+        if ( dt < 0 )
             {
             if ( options->rollOverDesktops )
               dt += numberOfDesktops();
@@ -1596,7 +1629,7 @@ int Workspace::desktopUp( int desktop ) const
     else
         {
         int d = (dt % y) - 1;
-        if ( d < 0 ) 
+        if ( d < 0 )
             {
             if ( options->rollOverDesktops )
               d += y;
@@ -1613,10 +1646,10 @@ int Workspace::desktopDown( int desktop ) const
     int x,y;
     calcDesktopLayout(x,y);
     int dt = desktop-1;
-    if (layoutOrientation == Qt::Horizontal)
+    if (layoutOrientation == TQt::Horizontal)
         {
         dt += x;
-        if ( dt >= numberOfDesktops() ) 
+        if ( dt >= numberOfDesktops() )
             {
             if ( options->rollOverDesktops )
               dt -= numberOfDesktops();
@@ -1627,7 +1660,7 @@ int Workspace::desktopDown( int desktop ) const
     else
         {
         int d = (dt % y) + 1;
-        if ( d >= y ) 
+        if ( d >= y )
             {
             if ( options->rollOverDesktops )
               d -= y;
@@ -1655,7 +1688,7 @@ void Workspace::setNumberOfDesktops( int n )
 
     // if increasing the number, do the resizing now,
     // otherwise after the moving of windows to still existing desktops
-    if( old_number_of_desktops < number_of_desktops ) 
+    if( old_number_of_desktops < number_of_desktops )
         {
         rootInfo->setNumberOfDesktops( number_of_desktops );
         NETPoint* viewports = new NETPoint[ number_of_desktops ];
@@ -1667,17 +1700,17 @@ void Workspace::setNumberOfDesktops( int n )
 
     // if the number of desktops decreased, move all
     // windows that would be hidden to the last visible desktop
-    if( old_number_of_desktops > number_of_desktops ) 
+    if( old_number_of_desktops > number_of_desktops )
         {
         for( ClientList::ConstIterator it = clients.begin();
               it != clients.end();
-              ++it) 
+              ++it)
             {
             if( !(*it)->isOnAllDesktops() && (*it)->desktop() > numberOfDesktops())
                 sendClientToDesktop( *it, numberOfDesktops(), true );
             }
         }
-    if( old_number_of_desktops > number_of_desktops ) 
+    if( old_number_of_desktops > number_of_desktops )
         {
         rootInfo->setNumberOfDesktops( number_of_desktops );
         NETPoint* viewports = new NETPoint[ number_of_desktops ];
@@ -1717,7 +1750,7 @@ void Workspace::sendClientToDesktop( Client* c, int desk, bool dont_activate )
         else
             restackClientUnderActive( c );
         }
-    else 
+    else
         {
         raiseClient( c );
         }
@@ -1813,7 +1846,7 @@ void Workspace::updateDesktopLayout()
     {
     // rootInfo->desktopLayoutCorner(); // I don't find this worth bothering, feel free to
     layoutOrientation = ( rootInfo->desktopLayoutOrientation() == NET::OrientationHorizontal
-        ? Qt::Horizontal : Qt::Vertical );
+        ? TQt::Horizontal : TQt::Vertical );
     layoutX = rootInfo->desktopLayoutColumnsRows().width();
     layoutY = rootInfo->desktopLayoutColumnsRows().height();
     if( layoutX == 0 && layoutY == 0 ) // not given, set default layout
@@ -1904,7 +1937,7 @@ void Workspace::propagateSystemTrayWins()
     Window *cl = new Window[ systemTrayWins.count()];
 
     int i = 0;
-    for ( SystemTrayWindowList::ConstIterator it = systemTrayWins.begin(); it != systemTrayWins.end(); ++it ) 
+    for ( SystemTrayWindowList::ConstIterator it = systemTrayWins.begin(); it != systemTrayWins.end(); ++it )
         {
         cl[i++] =  (*it).win;
         }
@@ -1920,7 +1953,7 @@ void Workspace::killWindowId( Window window_to_kill )
         return;
     Window window = window_to_kill;
     Client* client = NULL;
-    for(;;) 
+    for(;;)
         {
         client = findClient( FrameIdMatchPredicate( window ));
         if( client != NULL ) // found the client
@@ -2053,12 +2086,12 @@ void Workspace::sendTakeActivity( Client* c, Time timestamp, long flags )
 */
 void Workspace::slotGrabWindow()
     {
-    if ( active_client ) 
+    if ( active_client )
         {
         TQPixmap snapshot = TQPixmap::grabWindow( active_client->frameId() );
 
 	//No XShape - no work.
-        if( Shape::available()) 
+        if( Shape::available())
             {
 	    //As the first step, get the mask from XShape.
             int count, order;
@@ -2068,7 +2101,7 @@ void Workspace::slotGrabWindow()
 	    //ShapeBounding - ShapeClipping is defined to be the border.
 	    //Since the border area is part of the window, we use bounding
 	    // to limit our work region
-            if (rects) 
+            if (rects)
                 {
 		//Create a TQRegion from the rectangles describing the bounding mask.
                 TQRegion contents;
@@ -2087,9 +2120,9 @@ void Workspace::slotGrabWindow()
 		//Construct a bitmap mask from the rectangles
                 TQBitmap mask( snapshot.width(), snapshot.height());
                 TQPainter p(&mask);
-                p.fillRect(0, 0, mask.width(), mask.height(), Qt::color1);
+                p.fillRect(0, 0, mask.width(), mask.height(), TQt::color1);
                 for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
-                    p.fillRect(maskedAwayRects[pos], Qt::color0);
+                    p.fillRect(maskedAwayRects[pos], TQt::color0);
                 p.end();
                 snapshot.setMask(mask);
                 }
@@ -2119,9 +2152,9 @@ void Workspace::slotGrabDesktop()
 void Workspace::slotMouseEmulation()
     {
 
-    if ( mouse_emulation ) 
+    if ( mouse_emulation )
         {
-        XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME());
+        XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time());
         mouse_emulation = FALSE;
         return;
         }
@@ -2129,7 +2162,7 @@ void Workspace::slotMouseEmulation()
     if ( XGrabKeyboard(tqt_xdisplay(),
                        root, FALSE,
                        GrabModeAsync, GrabModeAsync,
-                       GET_QT_X_TIME()) == GrabSuccess ) 
+                       get_tqt_x_time()) == GrabSuccess )
         {
         mouse_emulation = TRUE;
         mouse_emulation_state = 0;
@@ -2151,7 +2184,7 @@ WId Workspace::getMouseEmulationWindow()
     uint state;
     Window w;
     Client * c = 0;
-    do 
+    do
         {
         w = child;
         if (!c)
@@ -2173,19 +2206,19 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
     if ( !w )
         return state;
     TQWidget* widget = TQWidget::find( w );
-    if ( (!widget ||  widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) ) && !findClient( WindowMatchPredicate( w )) ) 
+    if ( (!widget ||  widget->inherits("TQToolButton") ) && !findClient( WindowMatchPredicate( w )) )
         {
         int x, y;
         Window xw;
         XTranslateCoordinates( tqt_xdisplay(), tqt_xrootwin(), w, pos.x(), pos.y(), &x, &y, &xw );
-        if ( type == EmuMove ) 
+        if ( type == EmuMove )
             { // motion notify events
             XEvent e;
             e.type = MotionNotify;
             e.xmotion.window = w;
             e.xmotion.root = tqt_xrootwin();
             e.xmotion.subwindow = w;
-            e.xmotion.time = GET_QT_X_TIME();
+            e.xmotion.time = get_tqt_x_time();
             e.xmotion.x = x;
             e.xmotion.y = y;
             e.xmotion.x_root = pos.x();
@@ -2194,14 +2227,14 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
             e.xmotion.is_hint = NotifyNormal;
             XSendEvent( tqt_xdisplay(), w, TRUE, ButtonMotionMask, &e );
             }
-        else 
+        else
             {
             XEvent e;
             e.type = type == EmuRelease ? ButtonRelease : ButtonPress;
             e.xbutton.window = w;
             e.xbutton.root = tqt_xrootwin();
             e.xbutton.subwindow = w;
-            e.xbutton.time = GET_QT_X_TIME();
+            e.xbutton.time = get_tqt_x_time();
             e.xbutton.x = x;
             e.xbutton.y = y;
             e.xbutton.x_root = pos.x();
@@ -2210,9 +2243,9 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
             e.xbutton.button = button;
             XSendEvent( tqt_xdisplay(), w, TRUE, ButtonPressMask, &e );
 
-            if ( type == EmuPress ) 
+            if ( type == EmuPress )
                 {
-                switch ( button ) 
+                switch ( button )
                     {
                     case 2:
                         state |= Button2Mask;
@@ -2225,9 +2258,9 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
                         break;
                     }
                 }
-            else 
+            else
                 {
-                switch ( button ) 
+                switch ( button )
                     {
                     case 2:
                         state &= ~Button2Mask;
@@ -2261,7 +2294,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
     int delta = is_control?1:is_alt?32:8;
     TQPoint pos = TQCursor::pos();
 
-    switch ( kc ) 
+    switch ( kc )
         {
         case XK_Left:
         case XK_KP_Left:
@@ -2306,16 +2339,16 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
         case XK_Return:
         case XK_space:
         case XK_KP_Enter:
-        case XK_KP_Space: 
+        case XK_KP_Space:
             {
-            if ( !mouse_emulation_state ) 
+            if ( !mouse_emulation_state )
                 {
             // nothing was pressed, fake a LMB click
                 mouse_emulation_window = getMouseEmulationWindow();
                 mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuPress, Button1, mouse_emulation_state );
                 mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuRelease, Button1, mouse_emulation_state );
                 }
-            else 
+            else
                 { // release all
                 if ( mouse_emulation_state & Button1Mask )
                     mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuRelease, Button1, mouse_emulation_state );
@@ -2327,7 +2360,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev )
             }
     // fall through
         case XK_Escape:
-            XUngrabKeyboard(tqt_xdisplay(), GET_QT_X_TIME());
+            XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time());
             mouse_emulation = FALSE;
             return TRUE;
         default:
@@ -2357,292 +2390,393 @@ void Workspace::delayFocus()
     requestFocus( delayfocus_client );
     cancelDelayFocus();
     }
-    
+
 void Workspace::requestDelayFocus( Client* c )
     {
     delayfocus_client = c;
     delete delayFocusTimer;
     delayFocusTimer = new TQTimer( this );
-    connect( delayFocusTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( delayFocus() ) );
+    connect( delayFocusTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( delayFocus() ) );
     delayFocusTimer->start( options->delayFocusInterval, TRUE  );
     }
-    
+
 void Workspace::cancelDelayFocus()
     {
     delete delayFocusTimer;
     delayFocusTimer = 0;
     }
 
-// Electric Borders
-//========================================================================//
-// Electric Border Window management. Electric borders allow a user
-// to change the virtual desktop by moving the mouse pointer to the
-// borders. Technically this is done with input only windows. Since
-// electric borders can be switched on and off, we have these two
-// functions to create and destroy them.
-void Workspace::checkElectricBorders( bool force )
+/* Active (Electric) Borders
+ * ========================================================================
+ * Active Border Window management. Active borders allow a user to switch
+ * to another virtual desktop or activate other features by moving
+ * the mouse pointer to the borders or corners of the workspace.
+ * Technically this is done with input only windows.
+ */
+void Workspace::updateActiveBorders()
     {
-    if( force )
-        destroyBorderWindows();
-    
-    electric_current_border = 0;
-
+    active_time_first = get_tqt_x_time();
+    active_time_last = get_tqt_x_time();
+    active_time_last_trigger = get_tqt_x_time();
+    active_current_border = ActiveNone;
     TQRect r = TQApplication::desktop()->geometry();
-    electricTop = r.top();
-    electricBottom = r.bottom();
-    electricLeft = r.left();
-    electricRight = r.right();
+    activeTop = r.top();
+    activeBottom = r.bottom();
+    activeLeft = r.left();
+    activeRight = r.right();
 
-    if (options->electricBorders() == Options::ElectricAlways)
-       createBorderWindows();
-    else
-       destroyBorderWindows();
+    for (int pos = 0; pos < ACTIVE_BORDER_COUNT; ++pos)
+    {
+        if (active_reserved[pos] == 0)
+        {
+            if (active_windows[pos] != None)
+            {
+                XDestroyWindow( tqt_xdisplay(), active_windows[pos] );
+            }
+            active_windows[pos] = None;
+            continue;
+        }
+
+        if (active_windows[pos] != None)
+        {
+            continue;
+        }
+
+        XSetWindowAttributes attributes;
+        attributes.override_redirect = True;
+        attributes.event_mask = EnterWindowMask;
+        unsigned long valuemask = CWOverrideRedirect | CWEventMask;
+        int xywh[ ACTIVE_BORDER_COUNT ][ 4 ] =
+            {
+                { r.left() + 1, r.top(), r.width() - 2, 1 }, // top
+                { r.right(), r.top(), 1, 1 }, // topright
+                { r.right(), r.top() + 1, 1, r.height() - 2 }, // etc.
+                { r.right(), r.bottom(), 1, 1 },
+                { r.left() + 1, r.bottom(), r.width() - 2, 1 },
+                { r.left(), r.bottom(), 1, 1 },
+                { r.left(), r.top() + 1, 1, r.height() - 2 },
+                { r.left(), r.top(), 1, 1 }
+            };
+        active_windows[pos] = XCreateWindow(tqt_xdisplay(), tqt_xrootwin(),
+                                              xywh[pos][0], xywh[pos][1],
+                                              xywh[pos][2], xywh[pos][3],
+                                              0, CopyFromParent, InputOnly,
+                                              CopyFromParent, valuemask,
+                                              &attributes);
+        XMapWindow(tqt_xdisplay(), active_windows[pos]);
+
+        // Set XdndAware on the windows, so that DND enter events are received (#86998)
+        Atom version = 4; // XDND version
+        XChangeProperty(tqt_xdisplay(), active_windows[pos],
+                        atoms->xdnd_aware, XA_ATOM, 32, PropModeReplace,
+                        (unsigned char*)&version, 1);
     }
+}
 
-void Workspace::createBorderWindows()
+void Workspace::destroyActiveBorders()
+{
+    for (int pos = 0; pos < ACTIVE_BORDER_COUNT; ++pos)
+    {
+        if (active_windows[ pos ] != None)
+        {
+            XDestroyWindow( tqt_xdisplay(), active_windows[ pos ] );
+        }
+        active_windows[ pos ] = None;
+    }
+}
+
+void Workspace::reserveActiveBorderSwitching( bool reserve )
+{
+    for (int pos = 0; pos < ACTIVE_BORDER_COUNT; ++pos)
     {
-    if ( electric_have_borders )
+        if (reserve)
+        {
+            reserveActiveBorder(static_cast<ActiveBorder>(pos));
+        }
+        else
+        {
+            unreserveActiveBorder(static_cast<ActiveBorder>(pos));
+        }
+    }
+}
+
+void Workspace::reserveActiveBorder( ActiveBorder border )
+{
+    if (border == ActiveNone)
         return;
 
-    electric_have_borders = true;
+    if (active_reserved[border]++ == 0)
+        TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders()));
+}
 
-    TQRect r = TQApplication::desktop()->geometry();
-    XSetWindowAttributes attributes;
-    unsigned long valuemask;
-    attributes.override_redirect = True;
-    attributes.event_mask =  ( EnterWindowMask | LeaveWindowMask );
-    valuemask=  (CWOverrideRedirect | CWEventMask | CWCursor );
-    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
-                                          XC_sb_up_arrow);
-    electric_top_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
-                                0,0,
-                                r.width(),1,
-                                0,
-                                CopyFromParent, InputOnly,
-                                CopyFromParent,
-                                valuemask, &attributes);
-    XMapWindow(tqt_xdisplay(), electric_top_border);
-
-    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
-                                          XC_sb_down_arrow);
-    electric_bottom_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
-                                   0,r.height()-1,
-                                   r.width(),1,
-                                   0,
-                                   CopyFromParent, InputOnly,
-                                   CopyFromParent,
-                                   valuemask, &attributes);
-    XMapWindow(tqt_xdisplay(), electric_bottom_border);
-
-    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
-                                          XC_sb_left_arrow);
-    electric_left_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
-                                 0,0,
-                                 1,r.height(),
-                                 0,
-                                 CopyFromParent, InputOnly,
-                                 CopyFromParent,
-                                 valuemask, &attributes);
-    XMapWindow(tqt_xdisplay(), electric_left_border);
-
-    attributes.cursor = XCreateFontCursor(tqt_xdisplay(),
-                                          XC_sb_right_arrow);
-    electric_right_border = XCreateWindow (tqt_xdisplay(), tqt_xrootwin(),
-                                  r.width()-1,0,
-                                  1,r.height(),
-                                  0,
-                                  CopyFromParent, InputOnly,
-                                  CopyFromParent,
-                                  valuemask, &attributes);
-    XMapWindow(tqt_xdisplay(),  electric_right_border);
-    // Set XdndAware on the windows, so that DND enter events are received (#86998)
-    Atom version = 4; // XDND version
-    XChangeProperty( tqt_xdisplay(), electric_top_border, atoms->xdnd_aware, XA_ATOM,
-        32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( tqt_xdisplay(), electric_bottom_border, atoms->xdnd_aware, XA_ATOM,
-        32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( tqt_xdisplay(), electric_left_border, atoms->xdnd_aware, XA_ATOM,
-        32, PropModeReplace, ( unsigned char* )&version, 1 );
-    XChangeProperty( tqt_xdisplay(), electric_right_border, atoms->xdnd_aware, XA_ATOM,
-        32, PropModeReplace, ( unsigned char* )&version, 1 );
-    }
-
-
-// Electric Border Window management. Electric borders allow a user
-// to change the virtual desktop by moving the mouse pointer to the
-// borders. Technically this is done with input only windows. Since
-// electric borders can be switched on and off, we have these two
-// functions to create and destroy them.
-void Workspace::destroyBorderWindows()
-    {
-    if( !electric_have_borders)
-      return;
+void Workspace::unreserveActiveBorder( ActiveBorder border )
+{
+    if (border == ActiveNone)
+        return;
 
-    electric_have_borders = false;
+    assert(active_reserved[ border ] > 0);
+    if (--active_reserved[ border ] == 0)
+        TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders()));
+}
 
-    if(electric_top_border)
-      XDestroyWindow(tqt_xdisplay(),electric_top_border);
-    if(electric_bottom_border)
-      XDestroyWindow(tqt_xdisplay(),electric_bottom_border);
-    if(electric_left_border)
-      XDestroyWindow(tqt_xdisplay(),electric_left_border);
-    if(electric_right_border)
-      XDestroyWindow(tqt_xdisplay(),electric_right_border);
+void Workspace::checkActiveBorder(const TQPoint &pos, Time now)
+{
+    Time treshold_set = options->activeBorderDelay(); // set timeout
+    Time treshold_trigger = 250; // Minimum time between triggers
+    Time treshold_reset = 250; // reset timeout
+    int activation_distance = options->borderActivationDistance();
 
-    electric_top_border    = None;
-    electric_bottom_border = None;
-    electric_left_border   = None;
-    electric_right_border  = None;
+    bool have_borders = false;
+    for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
+    {
+        if (active_windows[ i ] != None)
+        {
+            have_borders = true;
+        }
     }
+    if (!have_borders) {
+        return;
+    }
+
+    // Mouse should not move more than this many pixels
+    int distance_reset = activation_distance + 10;
 
-void Workspace::clientMoved(const TQPoint &pos, Time now)
+    // 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 (options->electricBorders() == Options::ElectricDisabled)
-       return;
+        if (movingClient &&
+           (options->activeBorders() == Options::ActiveTileMaximize ||
+            options->activeBorders() == Options::ActiveTileOnly))
+        {
+            movingClient->cancelActiveBorderMaximizing();
+            return;
+        }
+    }
+
+    // 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;
+    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 ((pos.x() != electricLeft) &&
-        (pos.x() != electricRight) &&
-        (pos.y() != electricTop) &&
-        (pos.y() != electricBottom))
+    if (!active_left && !active_right && !active_top && !active_bottom)
        return;
 
-    Time treshold_set = options->electricBorderDelay(); // set timeout
-    Time treshold_reset = 250; // reset timeout
-    int distance_reset = 30; // Mouse should not move more than this many pixels
+    // 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.
+    // These options make sense only for the tiling mode.
+    int active_width_quart  = (activeRight - activeLeft) / 4;
+    int active_height_quart = (activeBottom - activeTop) / 4;
 
-    int border = 0;
-    if (pos.x() == electricLeft)
-       border = 1;
-    else if (pos.x() == electricRight)
-       border = 2;
-    else if (pos.y() == electricTop)
-       border = 3;
-    else if (pos.y() == electricBottom)
-       border = 4;
+    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;
+    }
 
-    if ((electric_current_border == border) &&
-        (timestampDiff(electric_time_last, now) < treshold_reset) &&
-        ((pos-electric_push_point).manhattanLength() < distance_reset))
-        {
-        electric_time_last = now;
+    ActiveBorder border = ActiveNone;
+    if ((active_left && active_qtop) || (active_top && active_qleft))
+    {
+      border = ActiveTopLeft;
+    }
+    else if ((active_right && active_qtop) || (active_top && active_qright))
+    {
+      border = ActiveTopRight;
+    }
+    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 (timestampDiff(electric_time_first, now) > treshold_set)
-            {
-            electric_current_border = 0;
+    if( active_windows[border] == None )
+    {
+      return;
+    }
 
-            TQRect r = TQApplication::desktop()->geometry();
-            int offset;
+    if ((active_current_border == border) &&
+        (timestampDiff(active_time_last, now) < treshold_reset) &&
+        (timestampDiff(active_time_last_trigger, now) > treshold_trigger) &&
+        ((pos-active_push_point).manhattanLength() < distance_reset))
+    {
+        active_time_last = now;
+        if (timestampDiff(active_time_first, now) > treshold_set)
+        {
+            active_time_last_trigger = now;
+            active_current_border = ActiveNone;
+            bool isSide = (border == ActiveTop || border == ActiveRight ||
+                           border == ActiveBottom || border == ActiveLeft);
 
-            int desk_before = currentDesktop();
-            switch(border)
+            if (movingClient)
+            {
+                // Desktop switching
+                if (options->activeBorders() == Options::ActiveSwitchAlways ||
+                    options->activeBorders() == Options::ActiveSwitchOnMove)
                 {
-                case 1:
-                 slotSwitchDesktopLeft();
-                 if (currentDesktop() != desk_before) 
-                    {
-                    offset = r.width() / 5;
-                    TQCursor::setPos(r.width() - offset, pos.y());
-                    }
-                break;
+                    activeBorderSwitchDesktop(border, pos);
+                    return; // Don't reset cursor position
+                }
 
-               case 2:
-                slotSwitchDesktopRight();
-                if (currentDesktop() != desk_before) 
-                    {
-                    offset = r.width() / 5;
-                    TQCursor::setPos(offset, pos.y());
-                    }
-                break;
+                // Tiling maximize
+                else if (options->activeBorders() == Options::ActiveTileMaximize &&
+                         border == ActiveTop && movingClient->isMaximizable())
+                {
+                    if (!movingClient->isResizable()) return;
+                    movingClient->setActiveBorderMode(ActiveMaximizeMode);
+                    movingClient->setActiveBorder(ActiveNone);
+                    movingClient->setActiveBorderMaximizing(true);
+                }
 
-               case 3:
-                slotSwitchDesktopUp();
-                if (currentDesktop() != desk_before) 
-                    {
-                    offset = r.height() / 5;
-                    TQCursor::setPos(pos.x(), r.height() - offset);
-                    }
-                break;
+                // Tiling
+                else if ((options->activeBorders() == Options::ActiveTileMaximize ||
+                          options->activeBorders() == Options::ActiveTileOnly))
+                {
+                    if (!movingClient->isResizable()) return;
+                    movingClient->setActiveBorderMode(ActiveTilingMode);
+                    movingClient->setActiveBorder(border);
+                    movingClient->setActiveBorderMaximizing(true);
+                }
 
-               case 4:
-                slotSwitchDesktopDown();
-                if (currentDesktop() != desk_before) 
-                    {
-                    offset = r.height() / 5;
-                    TQCursor::setPos(pos.x(), offset);
-                    }
-                break;
+                else
+                {
+                    return; // Don't reset cursor position
+                }
+            }
+            else
+            {
+                // Desktop switching
+                if (options->activeBorders() == Options::ActiveSwitchAlways && isSide)
+                {
+                    activeBorderSwitchDesktop(border, pos);
+                    return; // Don't reset cursor position
                 }
-            return;
             }
         }
-    else 
-        {
-        electric_current_border = border;
-        electric_time_first = now;
-        electric_time_last = now;
-        electric_push_point = pos;
-        }
+    }
+    else
+    {
+        active_current_border = border;
+        active_time_first = now;
+        active_time_last = now;
+        active_push_point = pos;
+    }
 
-    int mouse_warp = 1;
+    if ((options->activeBorders() == Options::ActiveSwitchAlways && !movingClient) ||
+        activation_distance < 2)
+    {
+        // 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 ] = { 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]);
+    }
+}
 
-  // reset the pointer to find out wether the user is really pushing
-    switch( border)
-        {
-        case 1: TQCursor::setPos(pos.x()+mouse_warp, pos.y()); break;
-        case 2: TQCursor::setPos(pos.x()-mouse_warp, pos.y()); break;
-        case 3: TQCursor::setPos(pos.x(), pos.y()+mouse_warp); break;
-        case 4: TQCursor::setPos(pos.x(), pos.y()-mouse_warp); break;
-        }
+void Workspace::activeBorderSwitchDesktop(ActiveBorder border, const TQPoint& _pos)
+{
+    TQPoint pos = _pos;
+    TQRect r = TQApplication::desktop()->geometry();
+    const int offset = 5;
+
+    int desk_before = currentDesktop();
+    if (border == ActiveLeft || border == ActiveTopLeft || border == ActiveBottomLeft)
+    {
+            slotSwitchDesktopLeft();
+            pos.setX(r.width() - offset);
+    }
+    if (border == ActiveRight || border == ActiveTopRight || border == ActiveBottomRight)
+    {
+            slotSwitchDesktopRight();
+            pos.setX(offset);
     }
 
-// this function is called when the user entered an electric border
+    if (border == ActiveTop || border == ActiveTopLeft || border == ActiveTopRight)
+    {
+            slotSwitchDesktopUp();
+            pos.setY(r.height() - offset);
+    }
+    if (border == ActiveBottom || border == ActiveBottomLeft || border == ActiveBottomRight)
+    {
+            slotSwitchDesktopDown();
+            pos.setY(offset);
+    }
+
+    if (currentDesktop() != desk_before)
+    {
+        TQCursor::setPos(pos);
+    }
+}
+
+// this function is called when the user entered an active border
 // with the mouse. It may switch to another virtual desktop
-bool Workspace::electricBorder(XEvent *e)
+bool Workspace::activeBorderEvent(XEvent *e)
+{
+    if (e->type == EnterNotify)
     {
-    if( !electric_have_borders )
-        return false;
-    if( e->type == EnterNotify )
-        {
-        if( e->xcrossing.window == electric_top_border ||
-            e->xcrossing.window == electric_left_border ||
-            e->xcrossing.window == electric_bottom_border ||
-            e->xcrossing.window == electric_right_border)
-            // the user entered an electric border
-            {
-            clientMoved( TQPoint( e->xcrossing.x_root, e->xcrossing.y_root ), e->xcrossing.time );
-            return true;
-            }
-        }
-    if( e->type == ClientMessage )
+        for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
         {
-        if( e->xclient.message_type == atoms->xdnd_position
-            && ( e->xclient.window == electric_top_border
-                 || e->xclient.window == electric_bottom_border
-                 || e->xclient.window == electric_left_border
-                 || e->xclient.window == electric_right_border ))
-            {
-            updateXTime();
-            clientMoved( TQPoint( e->xclient.data.l[2]>>16, e->xclient.data.l[2]&0xffff), GET_QT_X_TIME() );
-            return true;
+            if (active_windows[i] != None && e->xcrossing.window == active_windows[i])
+            { // the user entered an active border
+                checkActiveBorder(TQPoint(e->xcrossing.x_root, e->xcrossing.y_root), e->xcrossing.time);
+                return true;
             }
         }
-    return false;
     }
-
-// electric borders (input only windows) have to be always on the
-// top. For that reason kwm calls this function always after some
-// windows have been raised.
-void Workspace::raiseElectricBorders()
+    if (e->type == ClientMessage)
     {
-
-    if(electric_have_borders)
+        if (e->xclient.message_type == atoms->xdnd_position)
         {
-        XRaiseWindow(tqt_xdisplay(), electric_top_border);
-        XRaiseWindow(tqt_xdisplay(), electric_left_border);
-        XRaiseWindow(tqt_xdisplay(), electric_bottom_border);
-        XRaiseWindow(tqt_xdisplay(), electric_right_border);
+            for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i)
+            {
+                if (active_windows[i] != None && e->xclient.window == active_windows[i])
+                {
+                    updateXTime();
+                    checkActiveBorder(TQPoint(e->xclient.data.l[2]>>16, e->xclient.data.l[2]&0xffff), get_tqt_x_time());
+                    return true;
+                }
+            }
         }
     }
+    return false;
+}
 
 void Workspace::addTopMenu( Client* c )
     {
@@ -2678,12 +2812,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;
@@ -2712,8 +2846,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 ];
@@ -2758,7 +2892,7 @@ bool Workspace::checkStartupNotification( Window w, TDEStartupInfoId& id, TDESta
  */
 void Workspace::focusToNull()
     {
-    XSetInputFocus(tqt_xdisplay(), null_focus_window, RevertToPointerRoot, GET_QT_X_TIME() );
+    XSetInputFocus(tqt_xdisplay(), null_focus_window, RevertToPointerRoot, get_tqt_x_time() );
     }
 
 void Workspace::helperDialog( const TQString& message, const Client* c )
@@ -2824,7 +2958,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();
@@ -2852,12 +2986,12 @@ 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*)));
+        connect(kompmgr, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(restartKompmgr(TDEProcess*)));
         options->useTranslucency = TRUE;
         //allowKompmgrRestart = FALSE;
-        //TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
+        //TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) );
         TQByteArray ba;
         TQDataStream arg(ba, IO_WriteOnly);
         arg << "";
@@ -2873,7 +3007,7 @@ void Workspace::stopKompmgr()
     }
     delete kompmgr_selection;
     kompmgr_selection = NULL;
-    kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(TDEProcess*)));
+    kompmgr->disconnect(this, TQ_SLOT(restartKompmgr(TDEProcess*)));
     options->useTranslucency = FALSE;
     if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
     kompmgr->kill(SIGKILL);
@@ -2902,7 +3036,7 @@ void Workspace::unblockKompmgrRestart()
 }
 
 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
@@ -2951,7 +3085,7 @@ void Workspace::restartKompmgr( TDEProcess *proc )
         else
         {
             allowKompmgrRestart = FALSE;
-            TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) );
+            TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) );
         }
     }
 }
@@ -2978,7 +3112,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;
@@ -2988,8 +3122,7 @@ void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen)
         proc.start(TDEProcess::DontCare);
         }
 }
-    
-        
+
 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 e88e68c85..9c5e55203 100644
--- a/twin/workspace.h
+++ b/twin/workspace.h
@@ -72,7 +72,7 @@ typedef TQValueList<SystemTrayWindow> SystemTrayWindowList;
 
 class Workspace : public TQObject, public KWinInterface, public KDecorationDefines
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Workspace( bool restore = FALSE );
         virtual ~Workspace();
@@ -156,7 +156,10 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void clientHidden( Client*  );
         void clientAttentionChanged( Client* c, bool set );
 
-        void clientMoved(const TQPoint &pos, Time time);
+        void checkActiveBorder(const TQPoint &pos, Time time);
+        void reserveActiveBorder(ActiveBorder border);
+        void unreserveActiveBorder(ActiveBorder border);
+        void reserveActiveBorderSwitching(bool reserve);
 
         /**
          * Returns the current virtual desktop of this workspace
@@ -167,7 +170,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
          */
         int numberOfDesktops() const;
         void setNumberOfDesktops( int n );
-        
+
         int activeScreen() const;
         int numScreens() const;
         void checkActiveScreen( const Client* c );
@@ -201,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();
 
         /**
@@ -254,7 +262,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
 
         void sendPingToWindow( Window w, Time timestamp ); // called from Client::pingWindow()
         void sendTakeActivity( Client* c, Time timestamp, long flags ); // called from Client::takeActivity()
-        
+
         bool kompmgrIsRunning();
         void setOpacity(unsigned long winId, unsigned int opacityPercent);
         void setShadowSize(unsigned long winId, unsigned int shadowSizePercent);
@@ -273,7 +281,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void focusToNull(); // SELI public?
         enum FocusChainChange { FocusChainMakeFirst, FocusChainMakeLast, FocusChainUpdate };
         void updateFocusChains( Client* c, FocusChainChange change );
-        
+
         bool forcedGlobalMouseGrab() const;
         void clientShortcutUpdated( Client* c );
         bool shortcutAvailable( const TDEShortcut& cut, Client* ignore = NULL ) const;
@@ -302,7 +310,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void requestDelayFocus( Client* );
         void updateFocusMousePosition( const TQPoint& pos );
         TQPoint focusMousePosition() const;
-        
+
         void toggleTopDockShadows(bool on);
 
     public slots:
@@ -387,7 +395,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void setupWindowShortcutDone( bool );
 
         void updateClientArea();
-        
+
         // kompmgr, also dcop
         void startKompmgr();
 
@@ -406,6 +414,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void cleanupTemporaryRules();
         void writeWindowRules();
         void kipcMessage( int id, int data );
+        void updateActiveBorders();
         // kompmgr
         void setPopupClientOpacity(int v);
         void resetClientOpacity();
@@ -486,15 +495,13 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         void tabBoxKeyPress( const KKeyNative& keyX );
         void tabBoxKeyRelease( const XKeyEvent& ev );
 
-    // electric borders
-        void checkElectricBorders( bool force = false );
-        void createBorderWindows();
-        void destroyBorderWindows();
-        bool electricBorder(XEvent * e);
-        void raiseElectricBorders();
+    // active borders
+        void destroyActiveBorders();
+        bool activeBorderEvent(XEvent *e);
+        void activeBorderSwitchDesktop(ActiveBorder border, const TQPoint& pos);
 
     // ------------------
-    
+
         void helperDialog( const TQString& message, const Client* c );
 
         void calcDesktopLayout(int &x, int &y) const;
@@ -550,7 +557,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         ClientList global_focus_chain; // this one is only for things like tabbox's MRU
         ClientList should_get_focus; // last is most recent
         ClientList attention_chain;
-        
+
         bool showing_desktop;
         ClientList showing_desktop_clients;
         int block_showing_desktop;
@@ -617,21 +624,19 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
 
         TDEStartupInfo* startup;
 
-        bool electric_have_borders;
-        int electric_current_border;
-        WId electric_top_border;
-        WId electric_bottom_border;
-        WId electric_left_border;
-        WId electric_right_border;
-        int electricLeft;
-        int electricRight;
-        int electricTop;
-        int electricBottom;
-        Time electric_time_first;
-        Time electric_time_last;
-        TQPoint electric_push_point;
-
-        Qt::Orientation layoutOrientation;
+        ActiveBorder active_current_border;
+        Window active_windows[ ACTIVE_BORDER_COUNT ];
+        int activeLeft;
+        int activeRight;
+        int activeTop;
+        int activeBottom;
+        Time active_time_first;
+        Time active_time_last;
+        Time active_time_last_trigger;
+        TQPoint active_push_point;
+        int active_reserved[ ACTIVE_BORDER_COUNT ]; // corners/edges used by something
+
+        TQt::Orientation layoutOrientation;
         int layoutX;
         int layoutY;
 
@@ -654,7 +659,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         bool forced_global_mouse_grab;
         friend class StackingUpdatesBlocker;
         friend class Client;
-        
+
         //kompmgr
         TQSlider *transSlider;
         TQPushButton *transButton;
@@ -663,7 +668,11 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin
         int maximizedWindowCounter;
         int topDockShadowSize;*/
         //end
-        
+
+        Window outline_left;
+        Window outline_right;
+        Window outline_top;
+        Window outline_bottom;
      signals:
         void kompmgrStarted();
         void kompmgrStopped();